projects / people / pmueller / ipfire-2.x.git / blame
| Commit | Line | Data |
|---|---|---|
| 00e5a55c BS |
1 | From: Myron Stowe <myron.stowe@hp.com> |
| 2 | Subject: ACPI: Disambiguate processor declaration type | |
| 3 | References: bnc#440062 | |
| 4 | Patch-Mainline: yes | |
| 5 | Commit-ID: ad93a765c1834db031b5bf1c2baf2a50d0462ca4 | |
| 6 | ||
| 7 | Signed-off-by: Thomas Renninger <trenn@suse.de> | |
| 8 | ||
| 9 | Declaring processors in ACPI namespace can be done using either a | |
| 10 | "Processor" definition or a "Device" definition (see section 8.4 - | |
| 11 | Declaring Processors; "Advanced Configuration and Power Interface | |
| 12 | Specification", Revision 3.0b). Currently the two processor | |
| 13 | declaration types are conflated. | |
| 14 | ||
| 15 | This patch disambiguates the processor declaration's definition type | |
| 16 | enabling subsequent code to behave uniquely based explicitly on the | |
| 17 | declaration's type. | |
| 18 | ||
| 19 | Signed-off-by: Myron Stowe <myron.stowe@hp.com> | |
| 20 | Signed-off-by: Len Brown <len.brown@intel.com> | |
| 21 | ||
| 22 | --- | |
| 23 | drivers/acpi/processor_core.c | 1 + | |
| 24 | drivers/acpi/scan.c | 2 +- | |
| 25 | include/acpi/acpi_drivers.h | 1 + | |
| 26 | 3 files changed, 3 insertions(+), 1 deletion(-) | |
| 27 | ||
| 28 | --- a/drivers/acpi/processor_core.c | |
| 29 | +++ b/drivers/acpi/processor_core.c | |
| 30 | @@ -89,6 +89,7 @@ static int acpi_processor_handle_eject(s | |
| 31 | ||
| 32 | ||
| 33 | static const struct acpi_device_id processor_device_ids[] = { | |
| 34 | + {ACPI_PROCESSOR_OBJECT_HID, 0}, | |
| 35 | {ACPI_PROCESSOR_HID, 0}, | |
| 36 | {"", 0}, | |
| 37 | }; | |
| 38 | --- a/drivers/acpi/scan.c | |
| 39 | +++ b/drivers/acpi/scan.c | |
| 40 | @@ -1002,7 +1002,7 @@ static void acpi_device_set_id(struct ac | |
| 41 | hid = ACPI_POWER_HID; | |
| 42 | break; | |
| 43 | case ACPI_BUS_TYPE_PROCESSOR: | |
| 44 | - hid = ACPI_PROCESSOR_HID; | |
| 45 | + hid = ACPI_PROCESSOR_OBJECT_HID; | |
| 46 | break; | |
| 47 | case ACPI_BUS_TYPE_SYSTEM: | |
| 48 | hid = ACPI_SYSTEM_HID; | |
| 49 | --- a/include/acpi/acpi_drivers.h | |
| 50 | +++ b/include/acpi/acpi_drivers.h | |
| 51 | @@ -41,6 +41,7 @@ | |
| 52 | */ | |
| 53 | ||
| 54 | #define ACPI_POWER_HID "LNXPOWER" | |
| 55 | +#define ACPI_PROCESSOR_OBJECT_HID "ACPI_CPU" | |
| 56 | #define ACPI_PROCESSOR_HID "ACPI0007" | |
| 57 | #define ACPI_SYSTEM_HID "LNXSYSTM" | |
| 58 | #define ACPI_THERMAL_HID "LNXTHERM" |