ACPI: Revert conflicting workaround for BIOS w/ mangled PRT entries
Len Brown
reviewerPATCH 1/1 ACPI: Revert conflicting workaround for BIOS w/ mangled PRT entries
From: Zhang Rui <[email protected]>
upstream 82babbb3887e234c995626e4121d411ea9070ca5
backported to 2.6.29.2
2f894ef9c8b36a35d80709bedca276d2fc691941
in Linux-2.6.21 worked around BIOS with mangled _PRT entries:
http://bugzilla.kernel.org/show_bug.cgi?id=6859
d0e184abc5983281ef189db2c759d65d56eb1b80
worked around the same issue via ACPICA, and shipped in 2.6.27.
Unfortunately the two workarounds conflict:
http://bugzilla.kernel.org/show_bug.cgi?id=12270
So revert the Linux specific one.
Signed-off-by Zhang Rui <[email protected]>
Signed-off-by Len Brown <[email protected]>
--- drivers/acpi/acpica/rscreate.c | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-)
drivers/acpi/acpica/rscreate.c +2 -25
@@ -191,8 +191,6 @@ acpi_rs_create_pci_routing_table(union a user_prt = ACPI_CAST_PTR(struct acpi_pci_routing_table, buffer);for (index =0 ; index < number_of_elements; index++) { -int source_name_index =2 ; -int source_index_index =3 ;/* * Point user_prt past this current structure
@@ -261,27 +259,6 @@ acpi_rs_create_pci_routing_table(union areturn_ACPI_STATUS (AE_BAD_DATA ); } -/* -* If BIOS erroneously reversed the _PRT source_name and source_index, -* then reverse them back. -*/ -if (ACPI_GET_OBJECT_TYPE (sub_object_list[3 ]) != -ACPI_TYPE_INTEGER ) { -if (acpi_gbl_enable_interpreter_slack) { - source_name_index =3 ; - source_index_index =2 ; -printk (KERN_WARNING -"ACPI: Handling Garbled _PRT entry\n" ); - }else { -ACPI_ERROR ((AE_INFO , -"(PRT[%X].source_index) Need Integer, found %s" , - index, -acpi_ut_get_object_type_name - (sub_object_list[3 ]))); -return_ACPI_STATUS (AE_BAD_DATA ); - } - } - user_prt->pin = (u32 ) obj_desc->integer.value;/*
@@ -305,7 +282,7 @@ acpi_rs_create_pci_routing_table(union a* 3) Third subobject: Dereference the PRT.source_name * The name may be unresolved (slack mode), so allow a null object */ - obj_desc = sub_object_list[source_name_index]; + obj_desc = sub_object_list[2 ];if (obj_desc) {switch (ACPI_GET_OBJECT_TYPE (obj_desc)) {case ACPI_TYPE_LOCAL_REFERENCE :
@@ -379,7 +356,7 @@ acpi_rs_create_pci_routing_table(union a/* 4) Fourth subobject: Dereference the PRT.source_index */ - obj_desc = sub_object_list[source_index_index]; + obj_desc = sub_object_list[3 ];if (ACPI_GET_OBJECT_TYPE (obj_desc) !=ACPI_TYPE_INTEGER ) { ACPI_ERROR((AE_INFO, "(PRT[%X].SourceIndex) Need Integer, found %s",