aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2017-05-30 01:40:44 -0400
committerDan Williams <dan.j.williams@intel.com>2017-06-15 17:35:24 -0400
commit4e4f00a9b51a1c52ebdd728a1caeb3b9fe48c39d (patch)
tree949f4063c4ec29fa77660d12390942976dce8d0f /include/linux
parent81f558701ae8d5677635118751b1b4043094c7e9 (diff)
x86, dax, libnvdimm: remove wb_cache_pmem() indirection
With all handling of the CONFIG_ARCH_HAS_PMEM_API case being moved to libnvdimm and the pmem driver directly we do not need to provide global wrappers and fallbacks in the CONFIG_ARCH_HAS_PMEM_API=n case. The pmem driver will simply not link to arch_wb_cache_pmem() in that case. Same as before, pmem flushing is only defined for x86_64, via clean_cache_range(), but it is straightforward to add other archs in the future. arch_wb_cache_pmem() is an exported function since the pmem module needs to find it, but it is privately declared in drivers/nvdimm/pmem.h because there are no consumers outside of the pmem driver. Cc: <x86@kernel.org> Cc: Jan Kara <jack@suse.cz> Cc: Jeff Moyer <jmoyer@redhat.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Oliver O'Halloran <oohall@gmail.com> Cc: Matthew Wilcox <mawilcox@microsoft.com> Cc: Ross Zwisler <ross.zwisler@linux.intel.com> Suggested-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/pmem.h19
1 files changed, 0 insertions, 19 deletions
diff --git a/include/linux/pmem.h b/include/linux/pmem.h
index 772bd02a5b52..33ae761f010a 100644
--- a/include/linux/pmem.h
+++ b/include/linux/pmem.h
@@ -31,11 +31,6 @@ static inline void arch_memcpy_to_pmem(void *dst, const void *src, size_t n)
31 BUG(); 31 BUG();
32} 32}
33 33
34static inline void arch_wb_cache_pmem(void *addr, size_t size)
35{
36 BUG();
37}
38
39static inline void arch_invalidate_pmem(void *addr, size_t size) 34static inline void arch_invalidate_pmem(void *addr, size_t size)
40{ 35{
41 BUG(); 36 BUG();
@@ -80,18 +75,4 @@ static inline void invalidate_pmem(void *addr, size_t size)
80 if (arch_has_pmem_api()) 75 if (arch_has_pmem_api())
81 arch_invalidate_pmem(addr, size); 76 arch_invalidate_pmem(addr, size);
82} 77}
83
84/**
85 * wb_cache_pmem - write back processor cache for PMEM memory range
86 * @addr: virtual start address
87 * @size: number of bytes to write back
88 *
89 * Write back the processor cache range starting at 'addr' for 'size' bytes.
90 * See blkdev_issue_flush() note for memcpy_to_pmem().
91 */
92static inline void wb_cache_pmem(void *addr, size_t size)
93{
94 if (arch_has_pmem_api())
95 arch_wb_cache_pmem(addr, size);
96}
97#endif /* __PMEM_H__ */ 78#endif /* __PMEM_H__ */