Stable request for longterm support kernel 2.6.32 - git comit id: b7b30de53aef6ce773d34837ba7d8422bd3baeec

Stable request for longterm support kernel 2.6.32 - git comit id: b7b30de53aef6ce773d34837ba7d8422bd3baeec

[Thomas Renninger]

Hi,

processor objects declared under _PR. scope and not declared
with the traditional:
Processor (XXXX, 0x0F, 0x00000410, 0x06) {}
processor declaration, but with the new _HID("ACPI0007")
declaration:
Device (XXXX){
     Name (_HID, "ACPI0007")
     Name (_UID, 0x00000028)
}
are also not recognized which leads to not functioning idle
and cpufreq routines on cores.

Bjorn's patch fixes these as well and is therefore a critical
fix and justifies queueing for stable kernel.

The patch needs slight adjusting for 2.6.32.
I've backported it and will send (reply on this mail) a
patch which should apply cleanly on 2.6.32 stable kernel.

Please consider to add.

Thanks,

   Thomas

[PATCH 2.6.32] ACPI: use _HID when supplied by root-level devices

[Thomas Renninger]

From: Bjorn Helgaas <bjorn.helgaas@hp.com>

Git-commit: b7b30de53aef6ce773d34837ba7d8422bd3baeec

trenn: This one also solves the problem of not registered
processor devices declared with _HID("ACPI0007") in _PR scope
(which is handled at this place as if the device is declared
under ROOT scope).

Previously, we assumed the only Device object immediately below the root
was the \_SB Scope (which the ACPI CA treats as a Device), so we forced
the HID of all such objects to ACPI_BUS_HID ("LNXSYBUS").

However, there are DSDTs that supply root-level Device objects with _HIDs.
This patch makes us pay attention to those _HIDs and only add the 
synthetic
ACPI_BUS_HID for root-level objects that do not supply their own _HID.

For example, this DSDT: https://bugzilla.kernel.org/show_bug.cgi?id=15605
contains:

    Scope (_SB) {
	...
    }
    Device (AMW0) {
	Name (_HID, EisaId ("PNP0C14"))
	...
    }

and we should use "PNP0C14" for the AMW0 device, not "LNXSYBUS".

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Acked-by: Zhang Rui <rui.zhang@intel.com>
Tested-by: Yong Wang <yong.y.wang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Thomas Renninger <trenn@suse.de>
Tested-by: Thomas Renninger <trenn@suse.de>

---
 drivers/acpi/scan.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Index: linux-2.6.32-SLE11-SP1/drivers/acpi/scan.c
===================================================================
--- linux-2.6.32-SLE11-SP1.orig/drivers/acpi/scan.c
+++ linux-2.6.32-SLE11-SP1/drivers/acpi/scan.c
@@ -1046,12 +1046,6 @@ static void acpi_device_set_id(struct ac
 		if (ACPI_IS_ROOT_DEVICE(device)) {
 			acpi_add_id(device, ACPI_SYSTEM_HID);
 			break;
-		} else if (ACPI_IS_ROOT_DEVICE(device->parent)) {
-			/* \_SB_, the only root-level namespace device */
-			acpi_add_id(device, ACPI_BUS_HID);
-			strcpy(device->pnp.device_name, ACPI_BUS_DEVICE_NAME);
-			strcpy(device->pnp.device_class, ACPI_BUS_CLASS);
-			break;
 		}
 
 		status = acpi_get_object_info(device->handle, &info);
@@ -1089,6 +1083,12 @@ static void acpi_device_set_id(struct ac
 			acpi_add_id(device, ACPI_BAY_HID);
 		else if (ACPI_SUCCESS(acpi_dock_match(device)))
 			acpi_add_id(device, ACPI_DOCK_HID);
+		else if (!acpi_device_hid(device) &&
+			 ACPI_IS_ROOT_DEVICE(device->parent)) {
+			acpi_add_id(device, ACPI_BUS_HID); /* \_SB, LNXSYBUS */
+			strcpy(device->pnp.device_name, ACPI_BUS_DEVICE_NAME);
+			strcpy(device->pnp.device_class, ACPI_BUS_CLASS);
+		}
 
 		break;
 	case ACPI_BUS_TYPE_POWER: