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

Commit 6abccd1b authored by Dan Williams's avatar Dan Williams
Browse files

x86, dax, pmem: remove indirection around memcpy_from_pmem() 



memcpy_from_pmem() maps directly to memcpy_mcsafe(). The wrapper
serves no real benefit aside from affording a more generic function name
than the x86-specific 'mcsafe'. However this would not be the first time
that x86 terminology leaked into the global namespace. For lack of
better name, just use memcpy_mcsafe() directly.

This conversion also catches a place where we should have been using
plain memcpy, acpi_nfit_blk_single_io().

Cc: <x86@kernel.org>
Cc: Jan Kara <jack@suse.cz>
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>
Acked-by: default avatarTony Luck <tony.luck@intel.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent d4b29fd7

arch/x86/include/asm/pmem.h

+0 −5
Original line number Diff line number Diff line
@@ -44,11 +44,6 @@ static inline void arch_memcpy_to_pmem(void *dst, const void *src, size_t n) 
		BUG();

}



static inline int arch_memcpy_from_pmem(void *dst, const void *src, size_t n)

{

	return memcpy_mcsafe(dst, src, n);

}



/**

 * arch_wb_cache_pmem - write back a cache range with CLWB

 * @vaddr:	virtual start address

arch/x86/include/asm/string_64.h

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ int strcmp(const char *cs, const char *ct); 
#define memset(s, c, n) __memset(s, c, n)

#endif



#define __HAVE_ARCH_MEMCPY_MCSAFE 1

__must_check int memcpy_mcsafe_unrolled(void *dst, const void *src, size_t cnt);

DECLARE_STATIC_KEY_FALSE(mcsafe_key);

drivers/acpi/nfit/core.c

+1 −2
Original line number Diff line number Diff line
@@ -1783,8 +1783,7 @@ static int acpi_nfit_blk_single_io(struct nfit_blk *nfit_blk, 
				mmio_flush_range((void __force *)

					mmio->addr.aperture + offset, c);



			memcpy_from_pmem(iobuf + copied,

					mmio->addr.aperture + offset, c);

			memcpy(iobuf + copied, mmio->addr.aperture + offset, c);

		}



		copied += c;

drivers/nvdimm/claim.c

+1 −1
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ static int nsio_rw_bytes(struct nd_namespace_common *ndns, 
	if (rw == READ) {

		if (unlikely(is_bad_pmem(&nsio->bb, sector, sz_align)))

			return -EIO;

		return memcpy_from_pmem(buf, nsio->addr + offset, size);

		return memcpy_mcsafe(buf, nsio->addr + offset, size);

	}



	if (unlikely(is_bad_pmem(&nsio->bb, sector, sz_align))) {

drivers/nvdimm/pmem.c

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static int read_pmem(struct page *page, unsigned int off, 
	int rc;

	void *mem = kmap_atomic(page);



	rc = memcpy_from_pmem(mem + off, pmem_addr, len);

	rc = memcpy_mcsafe(mem + off, pmem_addr, len);

	kunmap_atomic(mem);

	if (rc)

		return -EIO;