Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3277b4ea authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Rafael J. Wysocki
Browse files

ACPI / osl: replace custom implementation of readq / writeq 



The readq() and writeq() helpers are available in the
asm-generic/io-64-nonatomic-hi-lo.h and asm-generic/io-64-nonatomic-lo-hi.h
headers. Replace custom implementation by the generic helpers.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent c13dcf9f

drivers/acpi/osl.c

+3 −30
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 


#include <asm/io.h>

#include <asm/uaccess.h>

#include <asm-generic/io-64-nonatomic-lo-hi.h>



#include "internal.h"
@@ -947,21 +948,6 @@ acpi_status acpi_os_write_port(acpi_io_address port, u32 value, u32 width) 


EXPORT_SYMBOL(acpi_os_write_port);



#ifdef readq

static inline u64 read64(const volatile void __iomem *addr)

{

	return readq(addr);

}

#else

static inline u64 read64(const volatile void __iomem *addr)

{

	u64 l, h;

	l = readl(addr);

	h = readl(addr+4);

	return l | (h << 32);

}

#endif



acpi_status

acpi_os_read_memory(acpi_physical_address phys_addr, u64 *value, u32 width)

{
@@ -994,7 +980,7 @@ acpi_os_read_memory(acpi_physical_address phys_addr, u64 *value, u32 width) 
		*(u32 *) value = readl(virt_addr);

		break;

	case 64:

		*(u64 *) value = read64(virt_addr);

		*(u64 *) value = readq(virt_addr);

		break;

	default:

		BUG();
@@ -1008,19 +994,6 @@ acpi_os_read_memory(acpi_physical_address phys_addr, u64 *value, u32 width) 
	return AE_OK;

}



#ifdef writeq

static inline void write64(u64 val, volatile void __iomem *addr)

{

	writeq(val, addr);

}

#else

static inline void write64(u64 val, volatile void __iomem *addr)

{

	writel(val, addr);

	writel(val>>32, addr+4);

}

#endif



acpi_status

acpi_os_write_memory(acpi_physical_address phys_addr, u64 value, u32 width)

{
@@ -1049,7 +1022,7 @@ acpi_os_write_memory(acpi_physical_address phys_addr, u64 value, u32 width) 
		writel(value, virt_addr);

		break;

	case 64:

		write64(value, virt_addr);

		writeq(value, virt_addr);

		break;

	default:

		BUG();