Cc: Avuton Olrich <avuton@...>, Rene Herman <rene.herman@...>, Len Brown <len.brown@...>, Linux Kernel Mailing List <linux-kernel@...>, Rafael J. Wysocki <rjw@...>
On Monday 02 June 2008 01:06:12 pm Rene Herman wrote:
Thank you very much for doing all the work to bisect this and write
up such a complete report.
Can you try the patch below, please?
PNP: mark resources that conflict with PCI devices "disabled"
Both the PNP/PCI conflict detection quirk and the PNP system
driver must use the same mechanism to mark resources as disabled.
I think it's best to keep the resource and to keep the type bit
(IORESOURCE_MEM, etc), so that we match the list from firmware
as closely as possible.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Index: work11/drivers/pnp/quirks.c
===================================================================
--- work11.orig/drivers/pnp/quirks.c 2008-06-02 14:59:03.000000000 -0600
+++ work11/drivers/pnp/quirks.c 2008-06-02 15:42:35.000000000 -0600
@@ -286,7 +286,7 @@ static void quirk_system_pci_resources(s
pci_name(pdev), i,
(unsigned long long) pci_start,
(unsigned long long) pci_end);
- res->flags = 0;
+ res->flags |= IORESOURCE_DISABLED;
}
}
}
Index: work11/drivers/pnp/system.c
===================================================================
--- work11.orig/drivers/pnp/system.c 2008-06-02 14:58:56.000000000 -0600
+++ work11/drivers/pnp/system.c 2008-06-02 15:44:36.000000000 -0600
@@ -81,7 +81,7 @@ static void reserve_resources_of_dev(str
}
for (i = 0; (res = pnp_get_resource(dev, IORESOURCE_MEM, i)); i++) {
- if (res->flags & IORESOURCE_UNSET)
+ if (res->flags & IORESOURCE_DISABLED)
continue;
reserve_range(dev, res->start, res->end, 0);
--
