Enable support of IOAPIC hotplug on x86 platforms

When IOAPIC is disabled, acpi_gsi_to_irq() should return gsi directly instead of calling mp_map_gsi_to_irq() to translate gsi to IRQ by IOAPIC. It fixes https://bugzilla.kernel.org/show_bug.cgi?id=84381.

Reported-by Thomas Richter <[email protected]>

Signed-off-by Jiang Liu <[email protected]>

Cc [email protected]

Cc <[email protected]> # 3.17

---
 arch/x86/kernel/acpi/boot.c |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

arch/x86/kernel/acpi/boot.c +0 -0

index b436fc735aa4..eceba9d9e116 100644

When IOAPIC is disabled, acpi_gsi_to_irq() should return gsi directly instead of calling mp_map_gsi_to_irq() to translate gsi to IRQ by IOAPIC.

It fixes https://bugzilla.kernel.org/show_bug.cgi?id=84381.

Reported-by Thomas Richter <[email protected]>

Signed-off-by Jiang Liu <[email protected]>

Cc [email protected]

Cc <[email protected]> # 3.17

---
 arch/x86/kernel/acpi/boot.c |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

arch/x86/kernel/acpi/boot.c +9 -5

index b436fc735aa4..eceba9d9e116 100644
@@ -604,14 +604,19 @@ void __init acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger)
 
 int acpi_gsi_to_irq(u32 gsi, unsigned int *irqp)
 {
-       int irq = mp_map_gsi_to_irq(gsi, IOAPIC_MAP_ALLOC | IOAPIC_MAP_CHECK);
+       int irq;
 
-       if (irq >= 0) {
+       if (acpi_irq_model == ACPI_IRQ_MODEL_PIC) {
+               *irqp = gsi;
+       } else {
+               irq = mp_map_gsi_to_irq(gsi,
+                                       IOAPIC_MAP_ALLOC | IOAPIC_MAP_CHECK);
+               if (irq < 0)
+                       return -1;
                *irqp = irq;
-               return 0;
        }
 
-       return -1;
+       return 0;
 }
 EXPORT_SYMBOL_GPL(acpi_gsi_to_irq);
 
--

1.7.10.4

The subject should describe the change you're making. "Fix regression caused by xxx" doesn't say anything about what the patch does.

Quoted 2 lines · Jiang Liu

When IOAPIC is disabled, acpi_gsi_to_irq() should return gsi directly instead of calling mp_map_gsi_to_irq() to translate gsi to IRQ by IOAPIC.

I don't know what the convention is or if there even is one, but "GSI" is even more of an acronym than "IRQ", so I'd capitalize it.

Quoted 1 line

It fixes https://bugzilla.kernel.org/show_bug.cgi?id=84381.

A line like the following may be useful to those who have to backport this.

Fixes 6b9fb7082409 ("x86, ACPI, irq: Consolidate algorithm of mapping

(ioapic, pin) to IRQ number")

Commit-ID:  e22ce93870deae0e9a54e1539f0088538f187780
Gitweb:     http://git.kernel.org/tip/e22ce93870deae0e9a54e1539f0088538f187780
Author:     Jiang Liu <[email protected]>
AuthorDate: Mon, 27 Oct 2014 13:21:34 +0800
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Mon, 3 Nov 2014 11:56:07 +0100

x86, PCI, ACPI: Kill private function resource_to_addr() in arch/x86/pci/acpi.c

Private function resource_to_addr() is used to parse ACPI resources for PCI host bridge. There are public interfaces available for that purpose, so replace resource_to_addr() with public interfaces.

Signed-off-by Jiang Liu <[email protected]>

Reviewed-by Bjorn Helgaas <[email protected]>

Cc Konrad Rzeszutek Wilk <[email protected]>

Cc Tony Luck <[email protected]>

Cc Joerg Roedel <[email protected]>

Cc Greg Kroah-Hartman <[email protected]>

Cc Benjamin Herrenschmidt <[email protected]>

Cc Rafael J. Wysocki <[email protected]>

Cc Randy Dunlap <[email protected]>

Cc Yinghai Lu <[email protected]>

Cc Borislav Petkov <[email protected]>

Link http://lkml.kernel.org/r/[email protected] open here

Signed-off-by Thomas Gleixner <[email protected]>

---

static acpi_status setup_resource(struct acpi_resource *acpi_res, void *data) {

arch/x86/pci/acpi.c +25 -30

 	struct pci_root_info *info = data;
-	struct resource *res;
-	struct acpi_resource_address64 addr;
-	acpi_status status;
-	unsigned long flags;
-	u64 start, orig_end, end;
+	u64 translation_offset = 0;
+	struct resource r = {
+		.flags = 0
+	};
+
+	if (acpi_dev_resource_memory(acpi_res, &r)) {
+		r.flags &= IORESOURCE_MEM | IORESOURCE_IO;
+	} else if (acpi_dev_resource_address_space(acpi_res, &r)) {
+		u64 orig_end;
+		struct acpi_resource_address64 addr;
+
+		r.flags &= IORESOURCE_MEM | IORESOURCE_IO;
+		if (r.flags == 0)
+			return AE_OK;
 
-	status = resource_to_addr(acpi_res, &addr);
-	if (!ACPI_SUCCESS(status))
-		return AE_OK;
+		if (ACPI_FAILURE(acpi_resource_to_address64(acpi_res, &addr)))
+			return AE_OK;
 
-	if (addr.resource_type == ACPI_MEMORY_RANGE) {
-		flags = IORESOURCE_MEM;
-		if (addr.info.mem.caching == ACPI_PREFETCHABLE_MEMORY)
-			flags |= IORESOURCE_PREFETCH;
-	} else if (addr.resource_type == ACPI_IO_RANGE) {
-		flags = IORESOURCE_IO;
-	} else
-		return AE_OK;
+		if (addr.resource_type == ACPI_MEMORY_RANGE &&
+		    addr.info.mem.caching == ACPI_PREFETCHABLE_MEMORY)
+			r.flags |= IORESOURCE_PREFETCH;
 
-	start = addr.minimum + addr.translation_offset;
-	orig_end = end = addr.maximum + addr.translation_offset;
+		translation_offset = addr.translation_offset;
+		orig_end = r.end;
+		r.start += translation_offset;
+		r.end += translation_offset;
 
-	/* Exclude non-addressable range or non-addressable portion of range */
-	end = min(end, (u64)iomem_resource.end);
-	if (end <= start) {
-		dev_info(&info->bridge->dev,
-			"host bridge window [%#llx-%#llx] "
-			"(ignored, not CPU addressable)\n", start, orig_end);
-		return AE_OK;
-	} else if (orig_end != end) {
-		dev_info(&info->bridge->dev,
-			"host bridge window [%#llx-%#llx] "
-			"([%#llx-%#llx] ignored, not CPU addressable)\n", 
-			start, orig_end, end + 1, orig_end);
+		/* Exclude non-addressable range or non-addressable portion of range */
+		r.end = min(r.end, iomem_resource.end);

Commit-ID:  e22ce93870deae0e9a54e1539f0088538f187780
Gitweb:     http://git.kernel.org/tip/e22ce93870deae0e9a54e1539f0088538f187780
Author:     Jiang Liu <[email protected]>
AuthorDate: Mon, 27 Oct 2014 13:21:34 +0800
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Mon, 3 Nov 2014 11:56:07 +0100

x86, PCI, ACPI: Kill private function resource_to_addr() in arch/x86/pci/acpi.c

Private function resource_to_addr() is used to parse ACPI resources for PCI host bridge. There are public interfaces available for that purpose, so replace resource_to_addr() with public interfaces.

Signed-off-by Jiang Liu <[email protected]>

Reviewed-by Bjorn Helgaas <[email protected]>

Cc Konrad Rzeszutek Wilk <[email protected]>

Cc Tony Luck <[email protected]>

Cc Joerg Roedel <[email protected]>

Cc Greg Kroah-Hartman <[email protected]>

Cc Benjamin Herrenschmidt <[email protected]>

Cc Rafael J. Wysocki <[email protected]>

Cc Randy Dunlap <[email protected]>

Cc Yinghai Lu <[email protected]>

Cc Borislav Petkov <[email protected]>

Link http://lkml.kernel.org/r/[email protected] open here

Signed-off-by Thomas Gleixner <[email protected]>

---
 arch/x86/pci/acpi.c | 144 +++++++++++++++++++---------------------------------
 1 file changed, 53 insertions(+), 91 deletions(-)

arch/x86/pci/acpi.c +46 -91

index cfd1b13..3f72d93 100644
@@ -218,114 +218,76 @@ static void teardown_mcfg_map(struct pci_root_info *info)
 }
 #endif
 
-static acpi_status resource_to_addr(struct acpi_resource *resource,
-                                   struct acpi_resource_address64 *addr)
-{
-       acpi_status status;
-       struct acpi_resource_memory24 *memory24;
-       struct acpi_resource_memory32 *memory32;
-       struct acpi_resource_fixed_memory32 *fixed_memory32;
-
-       memset(addr, 0, sizeof(*addr));
-       switch (resource->type) {
-       case ACPI_RESOURCE_TYPE_MEMORY24:
-               memory24 = &resource->data.memory24;
-               addr->resource_type = ACPI_MEMORY_RANGE;
-               addr->minimum = memory24->minimum;
-               addr->address_length = memory24->address_length;
-               addr->maximum = addr->minimum + addr->address_length - 1;
-               return AE_OK;
-       case ACPI_RESOURCE_TYPE_MEMORY32:
-               memory32 = &resource->data.memory32;
-               addr->resource_type = ACPI_MEMORY_RANGE;
-               addr->minimum = memory32->minimum;
-               addr->address_length = memory32->address_length;
-               addr->maximum = addr->minimum + addr->address_length - 1;
-               return AE_OK;
-       case ACPI_RESOURCE_TYPE_FIXED_MEMORY32:
-               fixed_memory32 = &resource->data.fixed_memory32;
-               addr->resource_type = ACPI_MEMORY_RANGE;
-               addr->minimum = fixed_memory32->address;
-               addr->address_length = fixed_memory32->address_length;
-               addr->maximum = addr->minimum + addr->address_length - 1;
-               return AE_OK;
-       case ACPI_RESOURCE_TYPE_ADDRESS16:
-       case ACPI_RESOURCE_TYPE_ADDRESS32:
-       case ACPI_RESOURCE_TYPE_ADDRESS64:
-               status = acpi_resource_to_address64(resource, addr);
-               if (ACPI_SUCCESS(status) &&
-                   (addr->resource_type == ACPI_MEMORY_RANGE ||
-                   addr->resource_type == ACPI_IO_RANGE) &&
-                   addr->address_length > 0) {
-                       return AE_OK;
-               }
-               break;
-       }
-       return AE_ERROR;
-}
-
 static acpi_status count_resource(struct acpi_resource *acpi_res, void *data)
 {
        struct pci_root_info *info = data;
-       struct acpi_resource_address64 addr;
-       acpi_status status;
+       struct resource r = {
+               .flags = 0
+       };
 
-       status = resource_to_addr(acpi_res, &addr);
-       if (ACPI_SUCCESS(status))
+       if (!acpi_dev_resource_memory(acpi_res, &r) &&
+           !acpi_dev_resource_address_space(acpi_res, &r))
+               return AE_OK;
+
+       if ((r.flags & (IORESOURCE_IO | IORESOURCE_MEM)) && resource_size(&r))
                info->res_num++;
+
        return AE_OK;
 }
 
 static acpi_status setup_resource(struct acpi_resource *acpi_res, void *data)
 {
        struct pci_root_info *info = data;
-       struct resource *res;
-       struct acpi_resource_address64 addr;
-       acpi_status status;
-       unsigned long flags;
-       u64 start, orig_end, end;
+       u64 translation_offset = 0;
+       struct resource r = {
+               .flags = 0
+       };
+
+       if (acpi_dev_resource_memory(acpi_res, &r)) {
+               r.flags &= IORESOURCE_MEM | IORESOURCE_IO;
+       } else if (acpi_dev_resource_address_space(acpi_res, &r)) {
+               u64 orig_end;
+               struct acpi_resource_address64 addr;
+
+               r.flags &= IORESOURCE_MEM | IORESOURCE_IO;
+               if (r.flags == 0)
+                       return AE_OK;
 
-       status = resource_to_addr(acpi_res, &addr);
-       if (!ACPI_SUCCESS(status))
-               return AE_OK;
+               if (ACPI_FAILURE(acpi_resource_to_address64(acpi_res, &addr)))
+                       return AE_OK;
 
-       if (addr.resource_type == ACPI_MEMORY_RANGE) {
-               flags = IORESOURCE_MEM;
-               if (addr.info.mem.caching == ACPI_PREFETCHABLE_MEMORY)
-                       flags |= IORESOURCE_PREFETCH;
-       } else if (addr.resource_type == ACPI_IO_RANGE) {
-               flags = IORESOURCE_IO;
-       } else
-               return AE_OK;
+               if (addr.resource_type == ACPI_MEMORY_RANGE &&
+                   addr.info.mem.caching == ACPI_PREFETCHABLE_MEMORY)
+                       r.flags |= IORESOURCE_PREFETCH;
 
-       start = addr.minimum + addr.translation_offset;
-       orig_end = end = addr.maximum + addr.translation_offset;
+               translation_offset = addr.translation_offset;
+               orig_end = r.end;
+               r.start += translation_offset;
+               r.end += translation_offset;
 
-       /* Exclude non-addressable range or non-addressable portion of range */
-       end = min(end, (u64)iomem_resource.end);
-       if (end <= start) {
-               dev_info(&info->bridge->dev,
-                       "host bridge window [%#llx-%#llx] "
-                       "(ignored, not CPU addressable)\n", start, orig_end);
-               return AE_OK;
-       } else if (orig_end != end) {
-               dev_info(&info->bridge->dev,
-                       "host bridge window [%#llx-%#llx] "
-                       "([%#llx-%#llx] ignored, not CPU addressable)\n",
-                       start, orig_end, end + 1, orig_end);
+               /* Exclude non-addressable range or non-addressable portion of range */
+               r.end = min(r.end, iomem_resource.end);
+               if (r.end <= r.start) {
+                       dev_info(&info->bridge->dev,
+                               "host bridge window [%#llx-%#llx] (ignored, not CPU addressable)\n",
+                                r.start, orig_end);
+                       return AE_OK;
+               } else if (orig_end != r.end) {
+                       dev_info(&info->bridge->dev,
+                               "host bridge window [%#llx-%#llx] ([%#llx-%#llx] ignored, not CPU addressable)\n",
+                               r.start, orig_end, r.end + 1, orig_end);
+               }
        }
 
-       res = &info->res[info->res_num];
-       res->name = info->name;
-       res->flags = flags;
-       res->start = start;
-       res->end = end;
-       info->res_offset[info->res_num] = addr.translation_offset;
-       info->res_num++;
-
-       if (!pci_use_crs)
-               dev_printk(KERN_DEBUG, &info->bridge->dev,
-                          "host bridge window %pR (ignored)\n", res);
+       if (r.flags && resource_size(&r)) {
+               r.name = info->name;

Quoted 192 lines · tip-bot for Jiang Liu

Commit-ID:  e22ce93870deae0e9a54e1539f0088538f187780
Gitweb:     http://git.kernel.org/tip/e22ce93870deae0e9a54e1539f0088538f187780
Author:     Jiang Liu <[email protected]>
AuthorDate: Mon, 27 Oct 2014 13:21:34 +0800
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Mon, 3 Nov 2014 11:56:07 +0100

x86, PCI, ACPI: Kill private function resource_to_addr() in arch/x86/pci/acpi.c

Private function resource_to_addr() is used to parse ACPI resources for PCI host bridge. There are public interfaces available for that purpose, so replace resource_to_addr() with public interfaces.

Signed-off-by Jiang Liu <[email protected]>

Reviewed-by Bjorn Helgaas <[email protected]>

Cc Konrad Rzeszutek Wilk <[email protected]>

Cc Tony Luck <[email protected]>

Cc Joerg Roedel <[email protected]>

Cc Greg Kroah-Hartman <[email protected]>

Cc Benjamin Herrenschmidt <[email protected]>

Cc Rafael J. Wysocki <[email protected]>

Cc Randy Dunlap <[email protected]>

Cc Yinghai Lu <[email protected]>

Cc Borislav Petkov <[email protected]>

Link http://lkml.kernel.org/r/[email protected] open here

Signed-off-by Thomas Gleixner <[email protected]>

---
 arch/x86/pci/acpi.c | 144 +++++++++++++++++++---------------------------------
 1 file changed, 53 insertions(+), 91 deletions(-)

arch/x86/pci/acpi.c +46 -91

index cfd1b13..3f72d93 100644
@@ -218,114 +218,76 @@ static void teardown_mcfg_map(struct pci_root_info *info)
 }
 #endif
 
-static acpi_status resource_to_addr(struct acpi_resource *resource,
-                                   struct acpi_resource_address64 *addr)
-{
-       acpi_status status;
-       struct acpi_resource_memory24 *memory24;
-       struct acpi_resource_memory32 *memory32;
-       struct acpi_resource_fixed_memory32 *fixed_memory32;
-
-       memset(addr, 0, sizeof(*addr));
-       switch (resource->type) {
-       case ACPI_RESOURCE_TYPE_MEMORY24:
-               memory24 = &resource->data.memory24;
-               addr->resource_type = ACPI_MEMORY_RANGE;
-               addr->minimum = memory24->minimum;
-               addr->address_length = memory24->address_length;
-               addr->maximum = addr->minimum + addr->address_length - 1;
-               return AE_OK;
-       case ACPI_RESOURCE_TYPE_MEMORY32:
-               memory32 = &resource->data.memory32;
-               addr->resource_type = ACPI_MEMORY_RANGE;
-               addr->minimum = memory32->minimum;
-               addr->address_length = memory32->address_length;
-               addr->maximum = addr->minimum + addr->address_length - 1;
-               return AE_OK;
-       case ACPI_RESOURCE_TYPE_FIXED_MEMORY32:
-               fixed_memory32 = &resource->data.fixed_memory32;
-               addr->resource_type = ACPI_MEMORY_RANGE;
-               addr->minimum = fixed_memory32->address;
-               addr->address_length = fixed_memory32->address_length;
-               addr->maximum = addr->minimum + addr->address_length - 1;
-               return AE_OK;
-       case ACPI_RESOURCE_TYPE_ADDRESS16:
-       case ACPI_RESOURCE_TYPE_ADDRESS32:
-       case ACPI_RESOURCE_TYPE_ADDRESS64:
-               status = acpi_resource_to_address64(resource, addr);
-               if (ACPI_SUCCESS(status) &&
-                   (addr->resource_type == ACPI_MEMORY_RANGE ||
-                   addr->resource_type == ACPI_IO_RANGE) &&
-                   addr->address_length > 0) {
-                       return AE_OK;
-               }
-               break;
-       }
-       return AE_ERROR;
-}
-
 static acpi_status count_resource(struct acpi_resource *acpi_res, void *data)
 {
        struct pci_root_info *info = data;
-       struct acpi_resource_address64 addr;
-       acpi_status status;
+       struct resource r = {
+               .flags = 0
+       };
 
-       status = resource_to_addr(acpi_res, &addr);
-       if (ACPI_SUCCESS(status))
+       if (!acpi_dev_resource_memory(acpi_res, &r) &&
+           !acpi_dev_resource_address_space(acpi_res, &r))
+               return AE_OK;
+
+       if ((r.flags & (IORESOURCE_IO | IORESOURCE_MEM)) && resource_size(&r))
                info->res_num++;
+
        return AE_OK;
 }
 
 static acpi_status setup_resource(struct acpi_resource *acpi_res, void *data)
 {
        struct pci_root_info *info = data;
-       struct resource *res;
-       struct acpi_resource_address64 addr;
-       acpi_status status;
-       unsigned long flags;
-       u64 start, orig_end, end;
+       u64 translation_offset = 0;
+       struct resource r = {
+               .flags = 0
+       };
+
+       if (acpi_dev_resource_memory(acpi_res, &r)) {
+               r.flags &= IORESOURCE_MEM | IORESOURCE_IO;
+       } else if (acpi_dev_resource_address_space(acpi_res, &r)) {
+               u64 orig_end;
+               struct acpi_resource_address64 addr;
+
+               r.flags &= IORESOURCE_MEM | IORESOURCE_IO;
+               if (r.flags == 0)
+                       return AE_OK;
 
-       status = resource_to_addr(acpi_res, &addr);
-       if (!ACPI_SUCCESS(status))
-               return AE_OK;
+               if (ACPI_FAILURE(acpi_resource_to_address64(acpi_res, &addr)))
+                       return AE_OK;
 
-       if (addr.resource_type == ACPI_MEMORY_RANGE) {
-               flags = IORESOURCE_MEM;
-               if (addr.info.mem.caching == ACPI_PREFETCHABLE_MEMORY)
-                       flags |= IORESOURCE_PREFETCH;
-       } else if (addr.resource_type == ACPI_IO_RANGE) {
-               flags = IORESOURCE_IO;
-       } else
-               return AE_OK;
+               if (addr.resource_type == ACPI_MEMORY_RANGE &&
+                   addr.info.mem.caching == ACPI_PREFETCHABLE_MEMORY)
+                       r.flags |= IORESOURCE_PREFETCH;
 
-       start = addr.minimum + addr.translation_offset;
-       orig_end = end = addr.maximum + addr.translation_offset;
+               translation_offset = addr.translation_offset;
+               orig_end = r.end;
+               r.start += translation_offset;
+               r.end += translation_offset;
 
-       /* Exclude non-addressable range or non-addressable portion of range */
-       end = min(end, (u64)iomem_resource.end);
-       if (end <= start) {
-               dev_info(&info->bridge->dev,
-                       "host bridge window [%#llx-%#llx] "
-                       "(ignored, not CPU addressable)\n", start, orig_end);
-               return AE_OK;
-       } else if (orig_end != end) {
-               dev_info(&info->bridge->dev,
-                       "host bridge window [%#llx-%#llx] "
-                       "([%#llx-%#llx] ignored, not CPU addressable)\n",
-                       start, orig_end, end + 1, orig_end);
+               /* Exclude non-addressable range or non-addressable portion of range */
+               r.end = min(r.end, iomem_resource.end);
+               if (r.end <= r.start) {
+                       dev_info(&info->bridge->dev,
+                               "host bridge window [%#llx-%#llx] (ignored, not CPU addressable)\n",
+                                r.start, orig_end);
+                       return AE_OK;
+               } else if (orig_end != r.end) {
+                       dev_info(&info->bridge->dev,
+                               "host bridge window [%#llx-%#llx] ([%#llx-%#llx] ignored, not CPU addressable)\n",
+                               r.start, orig_end, r.end + 1, orig_end);
+               }
        }
 
-       res = &info->res[info->res_num];
-       res->name = info->name;
-       res->flags = flags;
-       res->start = start;
-       res->end = end;
-       info->res_offset[info->res_num] = addr.translation_offset;
-       info->res_num++;
-
-       if (!pci_use_crs)
-               dev_printk(KERN_DEBUG, &info->bridge->dev,
-                          "host bridge window %pR (ignored)\n", res);
+       if (r.flags && resource_size(&r)) {
+               r.name = info->name;

arch/x86/pci/acpi.c static void teardown_mcfg_map(struct pci_root_info *info) · line 293

Quoted 10 lines

arch/x86/pci/acpi.c +7 -0

+               info->res[info->res_num] = r;
+               info->res_offset[info->res_num] = translation_offset;
+               info->res_num++;
+               if (!pci_use_crs)
+                       dev_printk(KERN_DEBUG, &info->bridge->dev,
+                                  "host bridge window %pR (ignored)\n", &r);
+       }
 
        return AE_OK;
 }

This one cause one system with Nehalem and one with Westmere failing.

[   32.353347] acpi PNP0A08:00: host bridge window expanded to [mem
0x00000000-0xffffffff]; [mem 0x000a0000-0x000bffff] ignored
[   32.362897] acpi PNP0A08:00: host bridge window expanded to [mem
0x00000000-0xffffffff]; [mem 0x000d0000-0x000dffff] ignored
[   32.382862] acpi PNP0A08:00: host bridge window expanded to [mem
0x00000000-0xffffffff]; [mem 0x00000000-0xffffffff] ignored
[   32.402889] acpi PNP0A08:00: host bridge window expanded to [mem
0x00000000-0xffffffff]; [??? 0x00000000-0xffffffff flags 0x0] ignored
[   32.423000] acpi PNP0A08:00: host bridge window expanded to [mem
0x00000000-0xffffffff]; [mem 0x00000000-0xffffffff] ignored
[   32.602921] PCI host bridge to bus 0000:00
[   32.603158] pci_bus 0000:00: root bus resource [bus 00-3f]
[   32.622782] pci_bus 0000:00: root bus resource [io  0x0000-0x5fff]
[   32.642569] pci_bus 0000:00: root bus resource [mem 0x00000000-0xffffffff]
[   32.642893] pci_bus 0000:00: root bus resource [mem

0xfc000000000-0xfc07fffffff pref]

Looks like the commit have several problems.

Attached patch should address them.

Please fix it before it get into linus tree.

Thanks

Yinghai

This one cause one system with Nehalem and one with Westmere failing.

[   32.353347] acpi PNP0A08:00: host bridge window expanded to [mem
0x00000000-0xffffffff]; [mem 0x000a0000-0x000bffff] ignored
[   32.362897] acpi PNP0A08:00: host bridge window expanded to [mem
0x00000000-0xffffffff]; [mem 0x000d0000-0x000dffff] ignored
[   32.382862] acpi PNP0A08:00: host bridge window expanded to [mem
0x00000000-0xffffffff]; [mem 0x00000000-0xffffffff] ignored
[   32.402889] acpi PNP0A08:00: host bridge window expanded to [mem
0x00000000-0xffffffff]; [??? 0x00000000-0xffffffff flags 0x0] ignored
[   32.423000] acpi PNP0A08:00: host bridge window expanded to [mem
0x00000000-0xffffffff]; [mem 0x00000000-0xffffffff] ignored
[   32.602921] PCI host bridge to bus 0000:00
[   32.603158] pci_bus 0000:00: root bus resource [bus 00-3f]
[   32.622782] pci_bus 0000:00: root bus resource [io  0x0000-0x5fff]
[   32.642569] pci_bus 0000:00: root bus resource [mem 0x00000000-0xffffffff]
[   32.642893] pci_bus 0000:00: root bus resource [mem

0xfc000000000-0xfc07fffffff pref]

Looks like the commit have several problems.

Attached patch should address them.

Please fix it before it get into linus tree.

On Tue, 9 Dec 2014, Yinghai Lu wrote:

Can you please

1) Cut out the completely irrelevant information from your replies? It's just annoying to scroll through hundreds of quoted lines to find the guts of the mail.

2) Send patches inline. It's a pain to review and reply and I can't use my normal tooling.

Quoted 8 lines

Attached patch should address them.

arch/x86/pci/acpi.c +1 -3

-       struct resource r = {
-               .flags = 0
-       };
+       struct resource r;

Quoted 1 line

+ memset(&r, 0, sizeof(r));

What's the point of this change? Both initialize r to 0. memset() generates better code, but that's irrelevant for the problem at hand.

Quoted 2 lines

Please fix it before it get into linus tree.

You can be sure that I'm going to fix the whole mess there proper and not by applying a cobbled together bandaid.

Quoted 2 lines

2) Send patches inline. It's a pain to review and reply and I can't use my normal tooling.

I can not, as gmail does not allow that.

Quoted 4 lines · Yinghai Lu

Quoted 2 lines

2) Send patches inline. It's a pain to review and reply and I can't use my normal tooling.

I can not, as gmail does not allow that.

Lemme guess, this is some kind of a joke you're making, right?

Quoted 4 lines · Borislav Petkov

Quoted 3 lines · Yinghai Lu

Quoted 2 lines

2) Send patches inline. It's a pain to review and reply and I can't use my normal tooling.

Quoted 3 lines

Quoted 1 line

I can not, as gmail does not allow that.

Lemme guess, this is some kind of a joke you're making, right?

I am using [email protected] to send as [email protected].

Tried with mutt or thunderbird etc, all kept on downloading ....

Tried with mutt or thunderbird etc, all kept on downloading ....

Quoted 7 lines · Thomas Gleixner

Quoted 6 lines

arch/x86/pci/acpi.c +2 -3

-       struct resource r = {
-               .flags = 0
-       };
+       struct resource r;
 
+       memset(&r, 0, sizeof(r));

Quoted 2 lines

What's the point of this change? Both initialize r to 0. memset() generates better code, but that's irrelevant for the problem at hand.

late there is

info->res[info->res_num] = r;

don't want the random pointer in r get copied.

Quoted 10 lines · Yinghai Lu

Quoted 9 lines · Thomas Gleixner

arch/x86/pci/acpi.c static void teardown_mcfg_map(struct pci · line 226

Quoted 6 lines

arch/x86/pci/acpi.c +2 -3

-       struct resource r = {
-               .flags = 0
-       };
+       struct resource r;
 
+       memset(&r, 0, sizeof(r));

What's the point of this change? Both initialize r to 0. memset() generates better code, but that's irrelevant for the problem at hand.

Did you actually read what I wrote?

        struct resource r = {
               .flags = 0
        };

initializes r completely to 0. So how do you get a random pointer in r?

Quoted 6 lines · Thomas Gleixner

On Tue, 9 Dec 2014, Yinghai Lu wrote:

Can you please
...
2) Send patches inline. It's a pain to review and reply and I can't use my normal tooling.

I can not, as gmail does not allow that.

Change acpi_dev_resource_address_space() to return failure if the acpi_resource structure can't be converted to an ACPI address64 structure, so caller could correctly detect failure.

Signed-off-by Jiang Liu <[email protected]>

---
 drivers/acpi/resource.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/acpi/resource.c +1 -1

index 2ba8f02ced36..782a0d15c25f 100644
@@ -200,7 +200,7 @@ bool acpi_dev_resource_address_space(struct acpi_resource *ares,
 
 	status = acpi_resource_to_address64(ares, &addr);
 	if (ACPI_FAILURE(status))
-		return true;
+		return false;
 
 	res->start = addr.minimum;
 	res->end = addr.maximum;

Change acpi_dev_resource_address_space() to return failure if the acpi_resource structure can't be converted to an ACPI address64 structure, so caller could correctly detect failure.

Signed-off-by Jiang Liu <[email protected]>

---
 drivers/acpi/resource.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/acpi/resource.c +1 -2

index 2ba8f02ced36..782a0d15c25f 100644
@@ -200,7 +200,7 @@ bool acpi_dev_resource_address_space(struct acpi_resource *ares,
 
        status = acpi_resource_to_address64(ares, &addr);
        if (ACPI_FAILURE(status))
-               return true;
+               return false;
 
        res->start = addr.minimum;
        res->end = addr.maximum;
--

1.7.10.4

Quoted 3 lines · Jiang Liu

Change acpi_dev_resource_address_space() to return failure if the acpi_resource structure can't be converted to an ACPI address64 structure, so caller could correctly detect failure.

Fixes 046d9ce6820e ("ACPI: Move device resources interpretation code

from PNP to ACPI core")

Possible stable candidate? 046d9ce6820e appeared in v3.8.

Quoted 19 lines

Signed-off-by Jiang Liu <[email protected]>

---
 drivers/acpi/resource.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/acpi/resource.c +1 -2

index 2ba8f02ced36..782a0d15c25f 100644
@@ -200,7 +200,7 @@ bool acpi_dev_resource_address_space(struct acpi_resource *ares,
 
        status = acpi_resource_to_address64(ares, &addr);
        if (ACPI_FAILURE(status))
-               return true;
+               return false;
 
        res->start = addr.minimum;
        res->end = addr.maximum;
--

Quoted 2 lines

1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Quoted 5 lines · Bjorn Helgaas

Quoted 3 lines · Jiang Liu

Change acpi_dev_resource_address_space() to return failure if the acpi_resource structure can't be converted to an ACPI address64 structure, so caller could correctly detect failure.

Quoted 4 lines

Fixes 046d9ce6820e ("ACPI: Move device resources interpretation code

from PNP to ACPI core")

Possible stable candidate? 046d9ce6820e appeared in v3.8.

Well, are we seeing problems with it?

Quoted 16 lines

Quoted 16 lines

Signed-off-by Jiang Liu <[email protected]>

---
 drivers/acpi/resource.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/acpi/resource.c +1 -1

index 2ba8f02ced36..782a0d15c25f 100644
@@ -200,7 +200,7 @@ bool acpi_dev_resource_address_space(struct acpi_resource *ares,
 
        status = acpi_resource_to_address64(ares, &addr);
        if (ACPI_FAILURE(status))
-               return true;
+               return false;
 

Quoted 9 lines

Quoted 5 lines

drivers/acpi/resource.c +0 -1

        res->start = addr.minimum;
        res->end = addr.maximum;
--

1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.