View | Details | Raw Unified | Return to bug 272507 | Differences between
and this patch

Collapse All | Expand All

(-)b/sys/dev/acpica/acpi.c (-6 / +17 lines)
Lines 1369-1376 acpi_sysres_alloc(device_t dev) Link Here
1369
}
1369
}
1370
1370
1371
/*
1371
/*
1372
 * Reserve declared resources for devices found during attach once system
1372
 * Reserve declared resources for active devices found during the
1373
 * resources have been allocated.
1373
 * namespace scan once the boot-time attach of devices has completed.
1374
 *
1375
 * Ideally reserving firmware-assigned resources would work in a
1376
 * depth-first traversal of the device namespace, but this is
1377
 * complicated.  In particular, not all resources are enumerated by
1378
 * ACPI (e.g. PCI bridges and devices enumerate their resources via
1379
 * other means).  Some systems also enumerate devices via ACPI behind
1380
 * PCI bridges but without a matching a PCI device_t enumerated via
1381
 * PCI bus scanning, the device_t's end up as direct children of
1382
 * acpi0.  Doing this scan late is not ideal, but works for now.
1374
 */
1383
 */
1375
static void
1384
static void
1376
acpi_reserve_resources(device_t dev)
1385
acpi_reserve_resources(device_t dev)
Lines 2257-2265 acpi_probe_children(device_t bus) Link Here
2257
    /* Pre-allocate resources for our rman from any sysresource devices. */
2266
    /* Pre-allocate resources for our rman from any sysresource devices. */
2258
    acpi_sysres_alloc(bus);
2267
    acpi_sysres_alloc(bus);
2259
2268
2260
    /* Reserve resources already allocated to children. */
2261
    acpi_reserve_resources(bus);
2262
2263
    /* Create any static children by calling device identify methods. */
2269
    /* Create any static children by calling device identify methods. */
2264
    ACPI_DEBUG_PRINT((ACPI_DB_OBJECTS, "device identify routines\n"));
2270
    ACPI_DEBUG_PRINT((ACPI_DB_OBJECTS, "device identify routines\n"));
2265
    bus_generic_probe(bus);
2271
    bus_generic_probe(bus);
Lines 2268-2273 acpi_probe_children(device_t bus) Link Here
2268
    ACPI_DEBUG_PRINT((ACPI_DB_OBJECTS, "acpi bus_generic_attach\n"));
2274
    ACPI_DEBUG_PRINT((ACPI_DB_OBJECTS, "acpi bus_generic_attach\n"));
2269
    bus_generic_attach(bus);
2275
    bus_generic_attach(bus);
2270
2276
2277
    /*
2278
     * Reserve resources allocated to children but not yet allocated
2279
     * by a driver.
2280
     */
2281
    acpi_reserve_resources(bus);
2282
2271
    /* Attach wake sysctls. */
2283
    /* Attach wake sysctls. */
2272
    acpi_wake_sysctl_walk(bus);
2284
    acpi_wake_sysctl_walk(bus);
2273
2285
2274
- 

Return to bug 272507