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>

1 files changed, 2 insertions, 84 deletions

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 412a1e04a922..1dea025e4e98 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -699,49 +699,6 @@ acpi_status acpi_os_write_port(acpi_io_address port, u32 value, u32 width)
 
 EXPORT_SYMBOL(acpi_os_write_port);
 
-acpi_status
-acpi_os_read_memory(acpi_physical_address phys_addr, u32 * value, u32 width)
-{
-        void __iomem *virt_addr;
-        unsigned int size = width / 8;
-        bool unmap = false;
-        u32 dummy;
-
-        rcu_read_lock();
-        virt_addr = acpi_map_vaddr_lookup(phys_addr, size);
-        if (!virt_addr) {
-                rcu_read_unlock();
-                virt_addr = acpi_os_ioremap(phys_addr, size);
-                if (!virt_addr)
-                        return AE_BAD_ADDRESS;
-                unmap = true;
-        }
-
-        if (!value)
-                value = &dummy;
-
-        switch (width) {
-        case 8:
-                *(u8 *) value = readb(virt_addr);
-                break;
-        case 16:
-                *(u16 *) value = readw(virt_addr);
-                break;
-        case 32:
-                *(u32 *) value = readl(virt_addr);
-                break;
-        default:
-                BUG();
-        }
-
-        if (unmap)
-                iounmap(virt_addr);
-        else
-                rcu_read_unlock();
-
-        return AE_OK;
-}
-
 #ifdef readq
 static inline u64 read64(const volatile void __iomem *addr)
 {
@@ -758,7 +715,7 @@ static inline u64 read64(const volatile void __iomem *addr)
 #endif
 
 acpi_status
-acpi_os_read_memory64(acpi_physical_address phys_addr, u64 *value, u32 width)
+acpi_os_read_memory(acpi_physical_address phys_addr, u64 *value, u32 width)
 {
         void __iomem *virt_addr;
         unsigned int size = width / 8;
@@ -803,45 +760,6 @@ acpi_os_read_memory64(acpi_physical_address phys_addr, u64 *value, u32 width)
         return AE_OK;
 }
 
-acpi_status
-acpi_os_write_memory(acpi_physical_address phys_addr, u32 value, u32 width)
-{
-        void __iomem *virt_addr;
-        unsigned int size = width / 8;
-        bool unmap = false;
-
-        rcu_read_lock();
-        virt_addr = acpi_map_vaddr_lookup(phys_addr, size);
-        if (!virt_addr) {
-                rcu_read_unlock();
-                virt_addr = acpi_os_ioremap(phys_addr, size);
-                if (!virt_addr)
-                        return AE_BAD_ADDRESS;
-                unmap = true;
-        }
-
-        switch (width) {
-        case 8:
-                writeb(value, virt_addr);
-                break;
-        case 16:
-                writew(value, virt_addr);
-                break;
-        case 32:
-                writel(value, virt_addr);
-                break;
-        default:
-                BUG();
-        }
-
-        if (unmap)
-                iounmap(virt_addr);
-        else
-                rcu_read_unlock();
-
-        return AE_OK;
-}
-
 #ifdef writeq
 static inline void write64(u64 val, volatile void __iomem *addr)
 {
@@ -856,7 +774,7 @@ static inline void write64(u64 val, volatile void __iomem *addr)
 #endif
 
 acpi_status
-acpi_os_write_memory64(acpi_physical_address phys_addr, u64 value, u32 width)
+acpi_os_write_memory(acpi_physical_address phys_addr, u64 value, u32 width)
 {
         void __iomem *virt_addr;
         unsigned int size = width / 8;