[ACPI] [PATCH] fix _MEM handling in Type Specific Flags (resend)

[Bjorn H. <bjo...@hp...>]

I sent this earlier (Jan 20!), but I don't think I saw any response.
Just wanted to make sure it's not dropped.  I checked, and it
still applies cleanly to 2.6.5-rc1.

It looks like cache_attribute is currently used by hot-plug.
The current code sets cache_attribute incorrectly (it extracts
(_MTP | _MEM) when it should extract only _MEM).


ACPI: Fix _MEM handling (it's only two bits, not four).

The memory attributes (_MEM) in Type Specific Flags are only two bits,
not four.  See ACPI spec 2.0c, Table 6-28.

===== drivers/acpi/resources/rsaddr.c 1.15 vs edited =====
--- 1.15/drivers/acpi/resources/rsaddr.c	Mon Oct  6 10:15:00 2003
+++ edited/drivers/acpi/resources/rsaddr.c	Tue Nov 18 12:43:44 2003
@@ -149,7 +149,7 @@
 		output_struct->data.address16.attribute.memory.read_write_attribute =
 				(u16) (temp8 & 0x01);
 		output_struct->data.address16.attribute.memory.cache_attribute =
-				(u16) ((temp8 >> 1) & 0x0F);
+				(u16) ((temp8 >> 1) & 0x03);
 	}
 	else {
 		if (ACPI_IO_RANGE == output_struct->data.address16.resource_type) {
@@ -347,7 +347,7 @@
 
 		temp8 |=
 			(linked_list->data.address16.attribute.memory.cache_attribute &
-			 0x0F) << 1;
+			 0x03) << 1;
 	}
 	else if (ACPI_IO_RANGE == linked_list->data.address16.resource_type) {
 		temp8 = (u8)
@@ -539,7 +539,7 @@
 				(u16) (temp8 & 0x01);
 
 		output_struct->data.address32.attribute.memory.cache_attribute =
-				(u16) ((temp8 >> 1) & 0x0F);
+				(u16) ((temp8 >> 1) & 0x03);
 	}
 	else {
 		if (ACPI_IO_RANGE == output_struct->data.address32.resource_type) {
@@ -735,7 +735,7 @@
 
 		temp8 |=
 			(linked_list->data.address32.attribute.memory.cache_attribute &
-			 0x0F) << 1;
+			 0x03) << 1;
 	}
 	else if (ACPI_IO_RANGE == linked_list->data.address32.resource_type) {
 		temp8 = (u8)
@@ -926,7 +926,7 @@
 				(u16) (temp8 & 0x01);
 
 		output_struct->data.address64.attribute.memory.cache_attribute =
-				(u16) ((temp8 >> 1) & 0x0F);
+				(u16) ((temp8 >> 1) & 0x03);
 	}
 	else {
 		if (ACPI_IO_RANGE == output_struct->data.address64.resource_type) {
@@ -1124,7 +1124,7 @@
 
 		temp8 |=
 			(linked_list->data.address64.attribute.memory.cache_attribute &
-			 0x0F) << 1;
+			 0x03) << 1;
 	}
 	else if (ACPI_IO_RANGE == linked_list->data.address64.resource_type) {
 		temp8 = (u8)