lkml.org 
[lkml]   [2010]   [Apr]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH 3/3] x86,pci,acpi: Handle invalid _CRS


Don't clear root bus resource too early, until We can make sure _CRS works

also restore it, if all _CRS get rejected because of conflicts

Signed-off-by: Yinghai Lu <yinghai@kernel.org>

---
arch/x86/pci/acpi.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)

Index: linux-2.6/arch/x86/pci/acpi.c
===================================================================
--- linux-2.6.orig/arch/x86/pci/acpi.c
+++ linux-2.6/arch/x86/pci/acpi.c
@@ -196,9 +196,6 @@ get_current_resources(struct acpi_device
struct pci_root_info info;
size_t size;

- if (pci_use_crs)
- pci_bus_remove_resources(bus);
-
info.bridge = device;
info.bus = bus;
info.res_num = 0;
@@ -217,10 +214,20 @@ get_current_resources(struct acpi_device
goto name_alloc_fail;
sprintf(info.name, "PCI Bus %04x:%02x", domain, busnum);

+ /* Only clear that when _CRS works for sure*/
+ if (pci_use_crs)
+ pci_bus_remove_resources(bus);
+
info.res_num = 0;
acpi_walk_resources(device->handle, METHOD_NAME__CRS, setup_resource,
&info);

+ if (pci_use_crs && !info.res_num) {
+ /* Restore default one */
+ bus->resource[0] = &ioport_resource;
+ bus->resource[1] = &iomem_resource;
+ }
+
return;

name_alloc_fail:

\
 
 \ /
  Last update: 2010-04-21 07:41    [W:0.231 / U:0.044 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site