diff options
author | njl <njl@FreeBSD.org> | 2007-10-09 07:48:07 +0000 |
---|---|---|
committer | njl <njl@FreeBSD.org> | 2007-10-09 07:48:07 +0000 |
commit | 8232e57ef030a255ea897c975899b89dd23e5b19 (patch) | |
tree | c4ab0542129085ecf40e29de22eec6dd511d2fb6 /sys/dev/acpica/acpivar.h | |
parent | 53e91b664f022a526b5454c12fcce75b2044a029 (diff) | |
download | FreeBSD-src-8232e57ef030a255ea897c975899b89dd23e5b19.zip FreeBSD-src-8232e57ef030a255ea897c975899b89dd23e5b19.tar.gz |
Fix the HPET table probe routine to run from device_identify() instead
of directly from acpi0. Before it would attach prior to the sysresource
devices, causing the later allocation of its memory range to fail and
print a warning like "acpi0: reservation of fed00000, 1000 (3) failed".
Use an explicit define for our probe order base value of 10.
Help from: jhb
Tested by: Abdullah Ibn Hamad Al-Marri <almarrie / gmail.com>
MFC after: 3 days
Approved by: re
Diffstat (limited to 'sys/dev/acpica/acpivar.h')
-rw-r--r-- | sys/dev/acpica/acpivar.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h index 1034273..35bd66d 100644 --- a/sys/dev/acpica/acpivar.h +++ b/sys/dev/acpica/acpivar.h @@ -432,8 +432,6 @@ int acpi_battery_get_battinfo(device_t dev, /* Embedded controller. */ void acpi_ec_ecdt_probe(device_t); -/* HPET table probe*/ -void acpi_hpet_table_probe(device_t); /* AC adapter interface. */ int acpi_acad_get_acline(int *); @@ -449,6 +447,14 @@ int acpi_PkgGas(device_t dev, ACPI_OBJECT *res, int idx, int *type, int *rid, struct resource **dst, u_int flags); ACPI_HANDLE acpi_GetReference(ACPI_HANDLE scope, ACPI_OBJECT *obj); +/* + * Base level for BUS_ADD_CHILD. Special devices are added at orders less + * than this, and normal devices at or above this level. This keeps the + * probe order sorted so that things like sysresource are available before + * their children need them. + */ +#define ACPI_DEV_BASE_ORDER 10 + /* Default number of task queue threads to start. */ #ifndef ACPI_MAX_THREADS #define ACPI_MAX_THREADS 3 |