[PATCH v2 18/25] libnvdimm, pmem: switch from ioremap_cache to memremap

From
Dan Williams <hidden>
Date
2015-07-28 23:06:57
Also in
linux-arch, lkml, nvdimm
Reply to
Ross Zwisler, 2015-07-28
On Tue, Jul 28, 2015 at 3:51 PM, Ross Zwisler
[off-list ref] wrote:
On Fri, 2015-07-24 at 22:39 -0400, Dan Williams wrote:
quoted
In preparation for deprecating ioremap_cache() convert its usage in
libnvdimm and the PMEM API to memremap.

Signed-off-by: Dan Williams <redacted>
---
 arch/x86/include/asm/io.h         |    7 +------
 arch/x86/mm/ioremap.c             |    6 ++++++
 tools/testing/nvdimm/Kbuild       |    2 +-
 tools/testing/nvdimm/test/iomap.c |    6 +++---
 4 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
index cc9c61bc1abe..8aeb6456188a 100644
--- a/arch/x86/include/asm/io.h
+++ b/arch/x86/include/asm/io.h
@@ -248,12 +248,7 @@ static inline void flush_write_buffers(void)
 #endif
 }

-static inline void __pmem *arch_memremap_pmem(resource_size_t offset,
-     unsigned long size)
-{
-     return (void __force __pmem *) ioremap_cache(offset, size);
-}
-
+void __pmem *arch_memremap_pmem(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 6f759c7c2ab7..7b422e7574b1 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -317,6 +317,12 @@ void __iomem *ioremap_cache(resource_size_t phys_addr, unsigned long size)
 }
 EXPORT_SYMBOL(ioremap_cache);

+void __pmem *arch_memremap_pmem(resource_size_t offset, size_t size)
+{
+     return (void __force __pmem *) ioremap_cache(offset, size);
Did you mean for this to be a call to memremap() instead of ioremap_cache()?
The ioremap_cache elimination comes in "[PATCH v2 25/25] pmem: convert
to generic memremap", but yeah I should update the changelog to
reflect this is more about pushing the calls to ioremap_cache() out of
line.  It would be circular at this point in the series to call back
out to memremap to have it turn around and call ioremap_cache again.
Thread (67 messages) 67 messages, 10 authors, last reply 2016-04-21
Keyboard shortcuts
hback out one level
jnext message in thread / next series-diff position
kprevious message in thread / previous series-diff position
ldrill in
Escclose help / fold thread tree
?toggle this help