Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2b61257 authored by Dan Williams's avatar Dan Williams
Browse files

x86, libnvdimm, pmem: move arch_invalidate_pmem() to libnvdimm 



Kill this globally defined wrapper and move to libnvdimm so that we can
ultimately remove include/linux/pmem.h and asm/pmem.h.

Cc: <x86@kernel.org>
Cc: Jeff Moyer <jmoyer@redhat.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Matthew Wilcox <mawilcox@microsoft.com>
Cc: Ross Zwisler <ross.zwisler@linux.intel.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 4e4f00a9

arch/x86/include/asm/pmem.h

+0 −5
Original line number Diff line number Diff line
@@ -43,10 +43,5 @@ static inline void arch_memcpy_to_pmem(void *dst, const void *src, size_t n) 
				__func__, dst, src, rem))

		BUG();

}



static inline void arch_invalidate_pmem(void *addr, size_t size)

{

	clflush_cache_range(addr, size);

}

#endif /* CONFIG_ARCH_HAS_PMEM_API */

#endif /* __ASM_X86_PMEM_H__ */

arch/x86/mm/pageattr.c

+6 −0
Original line number Diff line number Diff line
@@ -150,6 +150,12 @@ void clflush_cache_range(void *vaddr, unsigned int size) 
}

EXPORT_SYMBOL_GPL(clflush_cache_range);



void arch_invalidate_pmem(void *addr, size_t size)

{

	clflush_cache_range(addr, size);

}

EXPORT_SYMBOL_GPL(arch_invalidate_pmem);



static void __cpa_flush_all(void *arg)

{

	unsigned long cache = (unsigned long)arg;

drivers/nvdimm/claim.c

+2 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/sizes.h>

#include <linux/pmem.h>

#include "nd-core.h"

#include "pmem.h"

#include "pfn.h"

#include "btt.h"

#include "nd.h"
@@ -272,7 +273,7 @@ static int nsio_rw_bytes(struct nd_namespace_common *ndns, 
				cleared /= 512;

				badblocks_clear(&nsio->bb, sector, cleared);

			}

			invalidate_pmem(nsio->addr + offset, size);

			arch_invalidate_pmem(nsio->addr + offset, size);

		} else

			rc = -EIO;

	}

drivers/nvdimm/pmem.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ static int pmem_clear_poison(struct pmem_device *pmem, phys_addr_t offset, 
		badblocks_clear(&pmem->bb, sector, cleared);

	}



	invalidate_pmem(pmem->virt_addr + offset, len);

	arch_invalidate_pmem(pmem->virt_addr + offset, len);



	return rc;

}

drivers/nvdimm/pmem.h

+4 −0
Original line number Diff line number Diff line
@@ -7,10 +7,14 @@ 


#ifdef CONFIG_ARCH_HAS_PMEM_API

void arch_wb_cache_pmem(void *addr, size_t size);

void arch_invalidate_pmem(void *addr, size_t size);

#else

static inline void arch_wb_cache_pmem(void *addr, size_t size)

{

}

static inline void arch_invalidate_pmem(void *addr, size_t size)

{

}

#endif



/* this definition is in it's own header for tools/testing/nvdimm to consume */