5 files changed, 110 insertions, 14 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 2c77359dbdc9..e7e197e3a4ff 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -954,11 +954,7 @@ int __init acpi_ec_ecdt_probe(void)
                boot_ec->command_addr = ecdt_ptr->control.address;
                boot_ec->data_addr = ecdt_ptr->data.address;
                boot_ec->gpe = ecdt_ptr->gpe;
-                if (ACPI_FAILURE(acpi_get_handle(NULL, ecdt_ptr->id,
+                boot_ec->handle = ACPI_ROOT_OBJECT;
-                                &boot_ec->handle))) {
-                        pr_info("Failed to locate handle for boot EC\n");
-                        boot_ec->handle = ACPI_ROOT_OBJECT;
-                }
        } else {
                /* This workaround is needed only on some broken machines,
                 * which require early EC, but fail to provide ECDT */
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index 7f19859580c7..7af414a3c63e 100644
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -25,6 +25,7 @@
 */
+#include <linux/dmi.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -76,6 +77,101 @@ static struct acpi_prt_entry *acpi_pci_irq_find_prt_entry(int segment,
        return NULL;
 }
+/* http://bugzilla.kernel.org/show_bug.cgi?id=4773 */
+static struct dmi_system_id medion_md9580[] = {
+        {
+                .ident = "Medion MD9580-F laptop",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "MEDIONNB"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "A555"),
+                },
+        },
+        { }
+};
+/* http://bugzilla.kernel.org/show_bug.cgi?id=5044 */
+static struct dmi_system_id dell_optiplex[] = {
+        {
+                .ident = "Dell Optiplex GX1",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex GX1 600S+"),
+                },
+        },
+        { }
+};
+/* http://bugzilla.kernel.org/show_bug.cgi?id=10138 */
+static struct dmi_system_id hp_t5710[] = {
+        {
+                .ident = "HP t5710",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "hp t5000 series"),
+                        DMI_MATCH(DMI_BOARD_NAME, "098Ch"),
+                },
+        },
+        { }
+};
+struct prt_quirk {
+        struct dmi_system_id    *system;
+        unsigned int            segment;
+        unsigned int            bus;
+        unsigned int            device;
+        unsigned char           pin;
+        char                    *source;        /* according to BIOS */
+        char                    *actual_source;
+};
+/*
+ * These systems have incorrect _PRT entries.  The BIOS claims the PCI
+ * interrupt at the listed segment/bus/device/pin is connected to the first
+ * link device, but it is actually connected to the second.
+ */
+static struct prt_quirk prt_quirks[] = {
+        { medion_md9580, 0, 0, 9, 'A',
+                "\\_SB_.PCI0.ISA.LNKA",
+                "\\_SB_.PCI0.ISA.LNKB"},
+        { dell_optiplex, 0, 0, 0xd, 'A',
+                "\\_SB_.LNKB",
+                "\\_SB_.LNKA"},
+        { hp_t5710, 0, 0, 1, 'A',
+                "\\_SB_.PCI0.LNK1",
+                "\\_SB_.PCI0.LNK3"},
+};
+static void
+do_prt_fixups(struct acpi_prt_entry *entry, struct acpi_pci_routing_table *prt)
+{
+        int i;
+        struct prt_quirk *quirk;
+        for (i = 0; i < ARRAY_SIZE(prt_quirks); i++) {
+                quirk = &prt_quirks[i];
+                /* All current quirks involve link devices, not GSIs */
+                if (!prt->source)
+                        continue;
+                if (dmi_check_system(quirk->system) &&
+                    entry->id.segment == quirk->segment &&
+                    entry->id.bus == quirk->bus &&
+                    entry->id.device == quirk->device &&
+                    entry->pin + 'A' == quirk->pin &&
+                    !strcmp(prt->source, quirk->source) &&
+                    strlen(prt->source) >= strlen(quirk->actual_source)) {
+                        printk(KERN_WARNING PREFIX "firmware reports "
+                                "%04x:%02x:%02x[%c] connected to %s; "
+                                "changing to %s\n",
+                                entry->id.segment, entry->id.bus,
+                                entry->id.device, 'A' + entry->pin,
+                                prt->source, quirk->actual_source);
+                        strcpy(prt->source, quirk->actual_source);
+                }
+        }
+}
 static int
 acpi_pci_irq_add_entry(acpi_handle handle,
                       int segment, int bus, struct acpi_pci_routing_table *prt)
@@ -96,6 +192,8 @@ acpi_pci_irq_add_entry(acpi_handle handle,
        entry->id.function = prt->address & 0xFFFF;
        entry->pin = prt->pin;
+        do_prt_fixups(entry, prt);
        /*
         * Type 1: Dynamic
         * ---------------
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index a3cc8a98255c..d9316ab66347 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -840,17 +840,19 @@ static int is_processor_present(acpi_handle handle)
        status = acpi_evaluate_integer(handle, "_STA", NULL, &sta);
-        /*
-         * if a processor object does not have an _STA object,
-         * OSPM assumes that the processor is present.
-         */
-        if (status == AE_NOT_FOUND)
-                return 1;
        if (ACPI_SUCCESS(status) && (sta & ACPI_STA_DEVICE_PRESENT))
                return 1;
-        ACPI_EXCEPTION((AE_INFO, status, "Processor Device is not present"));
+        /*
+         * _STA is mandatory for a processor that supports hot plug
+         */
+        if (status == AE_NOT_FOUND)
+                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                "Processor does not support hot plug\n"));
+        else
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "Processor Device is not present"));
        return 0;
 }
diff --git a/drivers/acpi/utilities/utobject.c b/drivers/acpi/utilities/utobject.c
index 76ee766c84f9..e08b3fa6639f 100644
--- a/drivers/acpi/utilities/utobject.c
+++ b/drivers/acpi/utilities/utobject.c
@@ -432,7 +432,7 @@ acpi_ut_get_simple_object_size(union acpi_operand_object *internal_object,
         * element -- which is legal)
         */
        if (!internal_object) {
-                *obj_length = 0;
+                *obj_length = sizeof(union acpi_object);
                return_ACPI_STATUS(AE_OK);
        }
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 12cce69b5441..ace958cb3894 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -713,7 +713,7 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
        kfree(obj);
-        if (device->cap._BCL && device->cap._BCM && device->cap._BQC && max_level > 0){
+        if (device->cap._BCL && device->cap._BCM && max_level > 0) {
                int result;
                static int count = 0;
                char *name;

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index 2c77359dbdc9..e7e197e3a4ff 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c
@@ -954,11 +954,7 @@ int __init acpi_ec_ecdt_probe(void)
954	boot_ec->command_addr = ecdt_ptr->control.address;	954	boot_ec->command_addr = ecdt_ptr->control.address;
955	boot_ec->data_addr = ecdt_ptr->data.address;	955	boot_ec->data_addr = ecdt_ptr->data.address;
956	boot_ec->gpe = ecdt_ptr->gpe;	956	boot_ec->gpe = ecdt_ptr->gpe;
957	if (ACPI_FAILURE(acpi_get_handle(NULL, ecdt_ptr->id,	957	boot_ec->handle = ACPI_ROOT_OBJECT;
958	&boot_ec->handle))) {
959	pr_info("Failed to locate handle for boot EC\n");
960	boot_ec->handle = ACPI_ROOT_OBJECT;
961	}
962	} else {	958	} else {
963	/* This workaround is needed only on some broken machines,	959	/* This workaround is needed only on some broken machines,
964	* which require early EC, but fail to provide ECDT */	960	* which require early EC, but fail to provide ECDT */


diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c index 7f19859580c7..7af414a3c63e 100644 --- a/drivers/acpi/pci_irq.c +++ b/drivers/acpi/pci_irq.c
@@ -25,6 +25,7 @@
25	*/	25	*/
26		26
27		27
		28	#include <linux/dmi.h>
28	#include <linux/kernel.h>	29	#include <linux/kernel.h>
29	#include <linux/module.h>	30	#include <linux/module.h>
30	#include <linux/init.h>	31	#include <linux/init.h>
@@ -76,6 +77,101 @@ static struct acpi_prt_entry *acpi_pci_irq_find_prt_entry(int segment,
76	return NULL;	77	return NULL;
77	}	78	}
78		79
		80	/* http://bugzilla.kernel.org/show_bug.cgi?id=4773 */
		81	static struct dmi_system_id medion_md9580[] = {
		82	{
		83	.ident = "Medion MD9580-F laptop",
		84	.matches = {
		85	DMI_MATCH(DMI_SYS_VENDOR, "MEDIONNB"),
		86	DMI_MATCH(DMI_PRODUCT_NAME, "A555"),
		87	},
		88	},
		89	{ }
		90	};
		91
		92	/* http://bugzilla.kernel.org/show_bug.cgi?id=5044 */
		93	static struct dmi_system_id dell_optiplex[] = {
		94	{
		95	.ident = "Dell Optiplex GX1",
		96	.matches = {
		97	DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"),
		98	DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex GX1 600S+"),
		99	},
		100	},
		101	{ }
		102	};
		103
		104	/* http://bugzilla.kernel.org/show_bug.cgi?id=10138 */
		105	static struct dmi_system_id hp_t5710[] = {
		106	{
		107	.ident = "HP t5710",
		108	.matches = {
		109	DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
		110	DMI_MATCH(DMI_PRODUCT_NAME, "hp t5000 series"),
		111	DMI_MATCH(DMI_BOARD_NAME, "098Ch"),
		112	},
		113	},
		114	{ }
		115	};
		116
		117	struct prt_quirk {
		118	struct dmi_system_id *system;
		119	unsigned int segment;
		120	unsigned int bus;
		121	unsigned int device;
		122	unsigned char pin;
		123	char source; / according to BIOS */
		124	char *actual_source;
		125	};
		126
		127	/*
		128	* These systems have incorrect _PRT entries. The BIOS claims the PCI
		129	* interrupt at the listed segment/bus/device/pin is connected to the first
		130	* link device, but it is actually connected to the second.
		131	*/
		132	static struct prt_quirk prt_quirks[] = {
		133	{ medion_md9580, 0, 0, 9, 'A',
		134	"\\_SB_.PCI0.ISA.LNKA",
		135	"\\_SB_.PCI0.ISA.LNKB"},
		136	{ dell_optiplex, 0, 0, 0xd, 'A',
		137	"\\_SB_.LNKB",
		138	"\\_SB_.LNKA"},
		139	{ hp_t5710, 0, 0, 1, 'A',
		140	"\\_SB_.PCI0.LNK1",
		141	"\\_SB_.PCI0.LNK3"},
		142	};
		143
		144	static void
		145	do_prt_fixups(struct acpi_prt_entry entry, struct acpi_pci_routing_table prt)
		146	{
		147	int i;
		148	struct prt_quirk *quirk;
		149
		150	for (i = 0; i < ARRAY_SIZE(prt_quirks); i++) {
		151	quirk = &prt_quirks[i];
		152
		153	/* All current quirks involve link devices, not GSIs */
		154	if (!prt->source)
		155	continue;
		156
		157	if (dmi_check_system(quirk->system) &&
		158	entry->id.segment == quirk->segment &&
		159	entry->id.bus == quirk->bus &&
		160	entry->id.device == quirk->device &&
		161	entry->pin + 'A' == quirk->pin &&
		162	!strcmp(prt->source, quirk->source) &&
		163	strlen(prt->source) >= strlen(quirk->actual_source)) {
		164	printk(KERN_WARNING PREFIX "firmware reports "
		165	"%04x:%02x:%02x[%c] connected to %s; "
		166	"changing to %s\n",
		167	entry->id.segment, entry->id.bus,
		168	entry->id.device, 'A' + entry->pin,
		169	prt->source, quirk->actual_source);
		170	strcpy(prt->source, quirk->actual_source);
		171	}
		172	}
		173	}
		174
79	static int	175	static int
80	acpi_pci_irq_add_entry(acpi_handle handle,	176	acpi_pci_irq_add_entry(acpi_handle handle,
81	int segment, int bus, struct acpi_pci_routing_table *prt)	177	int segment, int bus, struct acpi_pci_routing_table *prt)
@@ -96,6 +192,8 @@ acpi_pci_irq_add_entry(acpi_handle handle,
96	entry->id.function = prt->address & 0xFFFF;	192	entry->id.function = prt->address & 0xFFFF;
97	entry->pin = prt->pin;	193	entry->pin = prt->pin;
98		194
		195	do_prt_fixups(entry, prt);
		196
99	/*	197	/*
100	* Type 1: Dynamic	198	* Type 1: Dynamic
101	* ---------------	199	* ---------------


diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index a3cc8a98255c..d9316ab66347 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c
@@ -840,17 +840,19 @@ static int is_processor_present(acpi_handle handle)
840		840
841		841
842	status = acpi_evaluate_integer(handle, "_STA", NULL, &sta);	842	status = acpi_evaluate_integer(handle, "_STA", NULL, &sta);
843	/*
844	* if a processor object does not have an _STA object,
845	* OSPM assumes that the processor is present.
846	*/
847	if (status == AE_NOT_FOUND)
848	return 1;
849		843
850	if (ACPI_SUCCESS(status) && (sta & ACPI_STA_DEVICE_PRESENT))	844	if (ACPI_SUCCESS(status) && (sta & ACPI_STA_DEVICE_PRESENT))
851	return 1;	845	return 1;
852		846
853	ACPI_EXCEPTION((AE_INFO, status, "Processor Device is not present"));	847	/*
		848	* _STA is mandatory for a processor that supports hot plug
		849	*/
		850	if (status == AE_NOT_FOUND)
		851	ACPI_DEBUG_PRINT((ACPI_DB_INFO,
		852	"Processor does not support hot plug\n"));
		853	else
		854	ACPI_EXCEPTION((AE_INFO, status,
		855	"Processor Device is not present"));
854	return 0;	856	return 0;
855	}	857	}
856		858


diff --git a/drivers/acpi/utilities/utobject.c b/drivers/acpi/utilities/utobject.c index 76ee766c84f9..e08b3fa6639f 100644 --- a/drivers/acpi/utilities/utobject.c +++ b/drivers/acpi/utilities/utobject.c
@@ -432,7 +432,7 @@ acpi_ut_get_simple_object_size(union acpi_operand_object *internal_object,
432	* element -- which is legal)	432	* element -- which is legal)
433	*/	433	*/
434	if (!internal_object) {	434	if (!internal_object) {
435	*obj_length = 0;	435	*obj_length = sizeof(union acpi_object);
436	return_ACPI_STATUS(AE_OK);	436	return_ACPI_STATUS(AE_OK);
437	}	437	}
438		438


diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index 12cce69b5441..ace958cb3894 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c
@@ -713,7 +713,7 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
713		713
714	kfree(obj);	714	kfree(obj);
715		715
716	if (device->cap._BCL && device->cap._BCM && device->cap._BQC && max_level > 0){	716	if (device->cap._BCL && device->cap._BCM && max_level > 0) {
717	int result;	717	int result;
718	static int count = 0;	718	static int count = 0;
719	char *name;	719	char *name;