On Thu, 2015-07-30 at 12:55 -0400, Dan Williams wrote:
Update memremap_pmem() to query the architecture for the mapping type
the given persistent memory range and then pass those flags to generic
memremap(). arch_memremap_pmem_flags() is provided an address range to
evaluate in the event an arch has a need for different mapping types by
address range. For example the ACPI NFIT carries EFI mapping types in
its memory range description table.
Cc: Ross Zwisler <ross.zwisler(a)linux.intel.com>
Signed-off-by: Dan Williams <dan.j.williams(a)intel.com>
arch/x86/include/asm/io.h | 2 +-
arch/x86/mm/ioremap.c | 16 ++++++++++------
include/linux/pmem.h | 26 +++++++++++++++-----------
3 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
index 1a9d44ee9ed0..26c81b01419c 100644
@@ -245,7 +245,7 @@ static inline void flush_write_buffers(void)
-void __pmem *arch_memremap_pmem(resource_size_t offset, size_t size);
+unsigned long arch_memremap_pmem_flags(resource_size_t offset, size_t size);
#endif /* __KERNEL__ */
extern void native_io_delay(void);
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index ffbfcf2e701b..5a41e3e4ea1e 100644
@@ -205,6 +205,16 @@ err_free_memtype:
+unsigned long arch_memremap_pmem_flags(resource_size_t offset, size_t size)
+ * TODO: check the mapping type provided by platform firmware,
+ * per range.
+ return MEMREMAP_WB;
I'm not sure that the architecture code has the right information to be able
to tell the caller what the correct mapping is.
I think what you are ultimately looking for is the "Address Range Memory
Mapping Attribute" found in the System Physical Address Range Structure of the
NFIT, right? (ACPI 6.0, table 5-128) How can we get to that structure from
nfit-independent architecture code like arch_memremap_pmem_flags()? It seems
like that if we want to make the mapping type dynamic we should get the flags
from ND when the SPA range is provided by ND, and provide a reasonable default
(WB, it seems) when we are dealing with legacy PMEM? If PMEM had the flag
from whatever source, it could then pass it in to memremap_pmem(), and get a
mapping of the appropriate caching.
Another option of course is to just ignore the mapping attribute in the NFIT
like we've been doing, and just say "we know WB will be good enough", and
remove the TODO.