2 files changed, 17 insertions, 35 deletions

diff --git a/drivers/acpi/acpica/hwregs.c b/drivers/acpi/acpica/hwregs.c
index 17a78e5ef175..6b6c83b87b52 100644
--- a/drivers/acpi/acpica/hwregs.c
+++ b/drivers/acpi/acpica/hwregs.c
@@ -157,6 +157,7 @@ acpi_hw_validate_register(struct acpi_generic_address *reg,
 acpi_status acpi_hw_read(u32 *value, struct acpi_generic_address *reg)
 {
         u64 address;
+        u64 value64;
         acpi_status status;
 
         ACPI_FUNCTION_NAME(hw_read);
@@ -178,7 +179,9 @@ acpi_status acpi_hw_read(u32 *value, struct acpi_generic_address *reg)
          */
         if (reg->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) {
                 status = acpi_os_read_memory((acpi_physical_address)
-                                             address, value, reg->bit_width);
+                                             address, &value64, reg->bit_width);
+
+                *value = (u32)value64;
         } else {                /* ACPI_ADR_SPACE_SYSTEM_IO, validated earlier */
 
                 status = acpi_hw_read_port((acpi_io_address)
@@ -228,7 +231,8 @@ acpi_status acpi_hw_write(u32 value, struct acpi_generic_address *reg)
          */
         if (reg->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) {
                 status = acpi_os_write_memory((acpi_physical_address)
-                                              address, value, reg->bit_width);
+                                              address, (u64)value,
+                                              reg->bit_width);
         } else {                /* ACPI_ADR_SPACE_SYSTEM_IO, validated earlier */
 
                 status = acpi_hw_write_port((acpi_io_address)
diff --git a/drivers/acpi/acpica/hwxface.c b/drivers/acpi/acpica/hwxface.c
index bb8dba612212..a716fede4f25 100644
--- a/drivers/acpi/acpica/hwxface.c
+++ b/drivers/acpi/acpica/hwxface.c
@@ -138,11 +138,6 @@ acpi_status acpi_read(u64 *return_value, struct acpi_generic_address *reg)
                 return (status);
         }
 
-        width = reg->bit_width;
-        if (width == 64) {
-                width = 32;     /* Break into two 32-bit transfers */
-        }
-
         /* Initialize entire 64-bit return value to zero */
 
         *return_value = 0;
@@ -154,24 +149,17 @@ acpi_status acpi_read(u64 *return_value, struct acpi_generic_address *reg)
          */
         if (reg->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) {
                 status = acpi_os_read_memory((acpi_physical_address)
-                                             address, &value, width);
+                                             address, return_value,
+                                             reg->bit_width);
                 if (ACPI_FAILURE(status)) {
                         return (status);
                 }
-                *return_value = value;
-
-                if (reg->bit_width == 64) {
-
-                        /* Read the top 32 bits */
+        } else {                /* ACPI_ADR_SPACE_SYSTEM_IO, validated earlier */
 
-                        status = acpi_os_read_memory((acpi_physical_address)
-                                                     (address + 4), &value, 32);
-                        if (ACPI_FAILURE(status)) {
-                                return (status);
-                        }
-                        *return_value |= ((u64)value << 32);
+                width = reg->bit_width;
+                if (width == 64) {
+                        width = 32;     /* Break into two 32-bit transfers */
                 }
-        } else {                /* ACPI_ADR_SPACE_SYSTEM_IO, validated earlier */
 
                 status = acpi_hw_read_port((acpi_io_address)
                                            address, &value, width);
@@ -231,32 +219,22 @@ acpi_status acpi_write(u64 value, struct acpi_generic_address *reg)
                 return (status);
         }
 
-        width = reg->bit_width;
-        if (width == 64) {
-                width = 32;     /* Break into two 32-bit transfers */
-        }
-
         /*
          * Two address spaces supported: Memory or IO. PCI_Config is
          * not supported here because the GAS structure is insufficient
          */
         if (reg->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) {
                 status = acpi_os_write_memory((acpi_physical_address)
-                                              address, ACPI_LODWORD(value),
-                                              width);
+                                              address, value, reg->bit_width);
                 if (ACPI_FAILURE(status)) {
                         return (status);
                 }
+        } else {                /* ACPI_ADR_SPACE_SYSTEM_IO, validated earlier */
 
-                if (reg->bit_width == 64) {
-                        status = acpi_os_write_memory((acpi_physical_address)
-                                                      (address + 4),
-                                                      ACPI_HIDWORD(value), 32);
-                        if (ACPI_FAILURE(status)) {
-                                return (status);
-                        }
+                width = reg->bit_width;
+                if (width == 64) {
+                        width = 32;     /* Break into two 32-bit transfers */
                 }
-        } else {                /* ACPI_ADR_SPACE_SYSTEM_IO, validated earlier */
 
                 status = acpi_hw_write_port((acpi_io_address)
                                             address, ACPI_LODWORD(value),