Commit a9ebcb88 authored by Kiryl Shutsemau's avatar Kiryl Shutsemau Committed by Ingo Molnar
Browse files

mm/memremap: Pass down MEMREMAP_* flags to arch_memremap_wb() 



x86 version of arch_memremap_wb() needs the flags to decide if the mapping
has to be encrypted or decrypted.

Pass down the flag to arch_memremap_wb(). All current implementations
ignore the argument.

Signed-off-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: linux-mm@kvack.org
Link: https://lore.kernel.org/r/20250217163822.343400-2-kirill.shutemov@linux.intel.com
parent affe678f

arch/arm/include/asm/io.h

+1 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ void __iomem *ioremap_wc(resource_size_t res_cookie, size_t size); 
void iounmap(volatile void __iomem *io_addr);

#define iounmap iounmap



void *arch_memremap_wb(phys_addr_t phys_addr, size_t size);

void *arch_memremap_wb(phys_addr_t phys_addr, size_t size, unsigned long flags);

#define arch_memremap_wb arch_memremap_wb



/*

arch/arm/mm/ioremap.c

+1 −1
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ void __arm_iomem_set_ro(void __iomem *ptr, size_t size) 
	set_memory_ro((unsigned long)ptr, PAGE_ALIGN(size) / PAGE_SIZE);

}



void *arch_memremap_wb(phys_addr_t phys_addr, size_t size)

void *arch_memremap_wb(phys_addr_t phys_addr, size_t size, unsigned long flags)

{

	return (__force void *)arch_ioremap_caller(phys_addr, size,

						   MT_MEMORY_RW,

arch/arm/mm/nommu.c

+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ void __iomem *pci_remap_cfgspace(resource_size_t res_cookie, size_t size) 
EXPORT_SYMBOL_GPL(pci_remap_cfgspace);

#endif



void *arch_memremap_wb(phys_addr_t phys_addr, size_t size)

void *arch_memremap_wb(phys_addr_t phys_addr, size_t size, unsigned long flags)

{

	return (void *)phys_addr;

}

arch/riscv/include/asm/io.h

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ __io_writes_outs(outs, u64, q, __io_pbr(), __io_paw()) 
#include <asm-generic/io.h>



#ifdef CONFIG_MMU

#define arch_memremap_wb(addr, size)	\

#define arch_memremap_wb(addr, size, flags)	\

	((__force void *)ioremap_prot((addr), (size), _PAGE_KERNEL))

#endif

kernel/iomem.c

+3 −2
Original line number Diff line number Diff line
@@ -6,7 +6,8 @@ 
#include <linux/ioremap.h>



#ifndef arch_memremap_wb

static void *arch_memremap_wb(resource_size_t offset, unsigned long size)

static void *arch_memremap_wb(resource_size_t offset, unsigned long size,

			      unsigned long flags)

{

#ifdef ioremap_cache

	return (__force void *)ioremap_cache(offset, size);
@@ -91,7 +92,7 @@ void *memremap(resource_size_t offset, size_t size, unsigned long flags) 
		if (is_ram == REGION_INTERSECTS)

			addr = try_ram_remap(offset, size, flags);

		if (!addr)

			addr = arch_memremap_wb(offset, size);

			addr = arch_memremap_wb(offset, size, flags);

	}



	/*