[PATCH v8 02/21] acpi: fix acpi_os_ioremap for arm64

[Rafael J. Wysocki]

On Monday, February 02, 2015 08:45:30 PM Hanjun Guo wrote:
> From: Mark Salter <msalter at redhat.com>
> 
> The acpi_os_ioremap() function may be used to map normal RAM or IO
> regions. The current implementation simply uses ioremap_cache(). This
> will work for some architectures, but arm64 ioremap_cache() cannot be
> used to map IO regions which don't support caching. So for arm64, use
> ioremap() for non-RAM regions.
> 
> CC: Rafael J Wysocki <rjw at rjwysocki.net>
> Signed-off-by: Mark Salter <msalter at redhat.com>
> Signed-off-by: Hanjun Guo <hanjun.guo at linaro.org>
> ---
>  include/acpi/acpi_io.h | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/include/acpi/acpi_io.h b/include/acpi/acpi_io.h
> index 444671e..9d573db 100644
> --- a/include/acpi/acpi_io.h
> +++ b/include/acpi/acpi_io.h
> @@ -1,11 +1,17 @@
>  #ifndef _ACPI_IO_H_
>  #define _ACPI_IO_H_
>  
> +#include <linux/mm.h>
>  #include <linux/io.h>
>  
>  static inline void __iomem *acpi_os_ioremap(acpi_physical_address phys,
>  					    acpi_size size)
>  {
> +#ifdef CONFIG_ARM64
> +	if (!page_is_ram(phys >> PAGE_SHIFT))
> +		return ioremap(phys, size);
> +#endif

I don't want to see #ifdef CONFIG_ARM64 in this file.

There are multiple examples of how things like this are done.  Generally,
the logic is "If the architecture provides its own function for this, use
that one, or use the generic one provided here otherwise."

> +
>         return ioremap_cache(phys, size);
>  }
>  
> 

-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.