aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/apei
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2012-02-14 05:29:55 -0500
committerLen Brown <len.brown@intel.com>2012-03-22 01:44:54 -0400
commit653f4b538f66d37db560e0f56af08117136d29b7 (patch)
tree1728249946368a4befa5ade048bafeba9d9fddce /drivers/acpi/apei
parent33620c5419e8a11814dd11e02a80e6ef77a43407 (diff)
ACPICA: Expand OSL memory read/write interfaces to 64 bits
This change expands acpi_os_read_memory and acpi_os_write_memory to a full 64 bits. This allows 64 bit transfers via the acpi_read and acpi_write interfaces. Note: The internal acpi_hw_read and acpi_hw_write interfaces remain at 32 bits, because 64 bits is not needed to access the standard ACPI registers. Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Lin Ming <ming.m.lin@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/apei')
-rw-r--r--drivers/acpi/apei/apei-base.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/apei/apei-base.c b/drivers/acpi/apei/apei-base.c
index e5d53b7ddc7e..ca773683d87e 100644
--- a/drivers/acpi/apei/apei-base.c
+++ b/drivers/acpi/apei/apei-base.c
@@ -605,7 +605,7 @@ int apei_read(u64 *val, struct acpi_generic_address *reg)
605 *val = 0; 605 *val = 0;
606 switch(reg->space_id) { 606 switch(reg->space_id) {
607 case ACPI_ADR_SPACE_SYSTEM_MEMORY: 607 case ACPI_ADR_SPACE_SYSTEM_MEMORY:
608 status = acpi_os_read_memory64((acpi_physical_address) 608 status = acpi_os_read_memory((acpi_physical_address)
609 address, val, reg->bit_width); 609 address, val, reg->bit_width);
610 if (ACPI_FAILURE(status)) 610 if (ACPI_FAILURE(status))
611 return -EIO; 611 return -EIO;
@@ -636,7 +636,7 @@ int apei_write(u64 val, struct acpi_generic_address *reg)
636 636
637 switch (reg->space_id) { 637 switch (reg->space_id) {
638 case ACPI_ADR_SPACE_SYSTEM_MEMORY: 638 case ACPI_ADR_SPACE_SYSTEM_MEMORY:
639 status = acpi_os_write_memory64((acpi_physical_address) 639 status = acpi_os_write_memory((acpi_physical_address)
640 address, val, reg->bit_width); 640 address, val, reg->bit_width);
641 if (ACPI_FAILURE(status)) 641 if (ACPI_FAILURE(status))
642 return -EIO; 642 return -EIO;