d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert back to probing Host-PCI bridges in the order we encounter them in

Browse Source 
the tree rather than sorting them by their address on PCI bus 0.

Reported by:	kan
This commit is contained in:
jhb 2008-04-07 18:35:11 +00:00
parent be8c113316
commit 589d19f263
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sys/dev/acpica/acpi.c
View File

@ -131,7 +131,7 @@ static int acpi_set_powerstate_method(device_t bus, device_t child,
static int acpi_isa_pnp_probe(device_t bus, device_t child,
struct isa_pnp_id *ids);
static void acpi_probe_children(device_t bus);
static int acpi_probe_order(ACPI_HANDLE handle, int *order);
static void acpi_probe_order(ACPI_HANDLE handle, int *order);
static ACPI_STATUS acpi_probe_child(ACPI_HANDLE handle, UINT32 level,
void *context, void **status);
static BOOLEAN acpi_MatchHid(ACPI_HANDLE h, const char *hid);
@ -1520,21 +1520,19 @@ acpi_probe_children(device_t bus)
}
/*
* Determine the probe order for a given device and return non-zero if it
* should be attached immediately.
* Determine the probe order for a given device.
*/
static int
static void
acpi_probe_order(ACPI_HANDLE handle, int *order)
{
ACPI_OBJECT_TYPE type;
u_int addr;
/*
* 1. I/O port and memory system resource holders
* 2. Embedded controllers (to handle early accesses)
* 3. PCI Link Devices
* 11 - 266. Host-PCI bridges sorted by _ADR
* 280. CPUs
* ACPI_DEV_BASE_ORDER. Host-PCI bridges
* ACPI_DEV_BASE_ORDER + 10. CPUs
*/
AcpiGetType(handle, &type);
if (acpi_MatchHid(handle, "PNP0C01") || acpi_MatchHid(handle, "PNP0C02"))
@ -1543,15 +1541,10 @@ acpi_probe_order(ACPI_HANDLE handle, int *order)
*order = 2;
else if (acpi_MatchHid(handle, "PNP0C0F"))
*order = 3;
else if (acpi_MatchHid(handle, "PNP0A03")) {
if (ACPI_SUCCESS(acpi_GetInteger(handle, "_ADR", &addr)))
*order = 11 + ACPI_ADR_PCI_SLOT(addr) * (PCI_FUNCMAX + 1) +
ACPI_ADR_PCI_FUNC(addr);
else
*order = 11;
} else if (type == ACPI_TYPE_PROCESSOR)
*order = 280;
return (0);
else if (acpi_MatchHid(handle, "PNP0A03"))
*order = ACPI_DEV_BASE_ORDER;
else if (type == ACPI_TYPE_PROCESSOR)
*order = ACPI_DEV_BASE_ORDER + 10;
}
/*
@ -1601,13 +1594,13 @@ acpi_probe_child(ACPI_HANDLE handle, UINT32 level, void *context, void **status)
* placeholder so that the probe/attach passes will run
* breadth-first. Orders less than ACPI_DEV_BASE_ORDER
* are reserved for special objects (i.e., system
* resources). Orders between ACPI_DEV_BASE_ORDER and 300
* resources). Orders between ACPI_DEV_BASE_ORDER and 100
* are used for Host-PCI bridges (and effectively all
* their children) and CPUs. Larger values are used for
* all other devices.
*/
ACPI_DEBUG_PRINT((ACPI_DB_OBJECTS, "scanning '%s'\n", handle_str));
order = level * 10 + 300;
order = level * 10 + 100;
acpi_probe_order(handle, &order);
child = BUS_ADD_CHILD(bus, order, NULL, -1);
if (child == NULL)