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

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

pmem: convert to generic memremap 



Kill arch_memremap_pmem() and just let the architecture specify the
flags to be passed to memremap().  Default to writethrough by default.

Suggested-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarRoss Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 3103dc03

arch/x86/include/asm/io.h

+1 −5
Original line number Diff line number Diff line
@@ -248,11 +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);

}

#define ARCH_MEMREMAP_PMEM MEMREMAP_WB



#endif /* __KERNEL__ */

include/linux/pmem.h

+9 −19
Original line number Diff line number Diff line
@@ -28,12 +28,6 @@ static inline bool __arch_has_wmb_pmem(void) 
	return false;

}



static inline void __pmem *arch_memremap_pmem(resource_size_t offset,

		unsigned long size)

{

	return NULL;

}



static inline void arch_memcpy_to_pmem(void __pmem *dst, const void *src,

		size_t n)

{
@@ -43,8 +37,8 @@ static inline void arch_memcpy_to_pmem(void __pmem *dst, const void *src, 


/*

 * Architectures that define ARCH_HAS_PMEM_API must provide

 * implementations for arch_memremap_pmem(), arch_memcpy_to_pmem(),

 * arch_wmb_pmem(), and __arch_has_wmb_pmem().

 * implementations for arch_memcpy_to_pmem(), arch_wmb_pmem(), and

 * __arch_has_wmb_pmem().

 */



static inline void memcpy_from_pmem(void *dst, void __pmem const *src, size_t size)
@@ -54,7 +48,7 @@ static inline void memcpy_from_pmem(void *dst, void __pmem const *src, size_t si 


static inline void memunmap_pmem(void __pmem *addr)

{

	iounmap((void __force __iomem *) addr);

	memunmap((void __force *) addr);

}



/**
@@ -85,18 +79,12 @@ static inline bool arch_has_pmem_api(void) 
 * default_memremap_pmem + default_memcpy_to_pmem is sufficient for

 * making data durable relative to i/o completion.

 */

static void default_memcpy_to_pmem(void __pmem *dst, const void *src,

static inline void default_memcpy_to_pmem(void __pmem *dst, const void *src,

		size_t size)

{

	memcpy((void __force *) dst, src, size);

}



static void __pmem *default_memremap_pmem(resource_size_t offset,

		unsigned long size)

{

	return (void __pmem __force *)ioremap_wt(offset, size);

}



/**

 * memremap_pmem - map physical persistent memory for pmem api

 * @offset: physical address of persistent memory
@@ -112,9 +100,11 @@ static void __pmem *default_memremap_pmem(resource_size_t offset, 
static inline void __pmem *memremap_pmem(resource_size_t offset,

		unsigned long size)

{

	if (arch_has_pmem_api())

		return arch_memremap_pmem(offset, size);

	return default_memremap_pmem(offset, size);

#ifdef ARCH_MEMREMAP_PMEM

	return (void __pmem *) memremap(offset, size, ARCH_MEMREMAP_PMEM);

#else

	return (void __pmem *) memremap(offset, size, MEMREMAP_WT);

#endif

}



/**

tools/testing/nvdimm/Kbuild

+2 −2
Original line number Diff line number Diff line 
ldflags-y += --wrap=ioremap_wt

ldflags-y += --wrap=ioremap_wc

ldflags-y += --wrap=devm_ioremap_nocache

ldflags-y += --wrap=ioremap_cache

ldflags-y += --wrap=memremap

ldflags-y += --wrap=memunmap

ldflags-y += --wrap=ioremap_nocache

ldflags-y += --wrap=iounmap

ldflags-y += --wrap=__request_region

tools/testing/nvdimm/test/iomap.c

+25 −9
Original line number Diff line number Diff line
@@ -80,11 +80,20 @@ void __iomem *__wrap_devm_ioremap_nocache(struct device *dev, 
}

EXPORT_SYMBOL(__wrap_devm_ioremap_nocache);



void __iomem *__wrap_ioremap_cache(resource_size_t offset, unsigned long size)

void *__wrap_memremap(resource_size_t offset, size_t size,

		unsigned long flags)

{

	return __nfit_test_ioremap(offset, size, ioremap_cache);

	struct nfit_test_resource *nfit_res;



	rcu_read_lock();

	nfit_res = get_nfit_res(offset);

	rcu_read_unlock();

	if (nfit_res)

		return (void __iomem *) nfit_res->buf + offset

			- nfit_res->res->start;

	return memremap(offset, size, flags);

}

EXPORT_SYMBOL(__wrap_ioremap_cache);

EXPORT_SYMBOL(__wrap_memremap);



void __iomem *__wrap_ioremap_nocache(resource_size_t offset, unsigned long size)

{
@@ -92,12 +101,6 @@ void __iomem *__wrap_ioremap_nocache(resource_size_t offset, unsigned long size) 
}

EXPORT_SYMBOL(__wrap_ioremap_nocache);



void __iomem *__wrap_ioremap_wt(resource_size_t offset, unsigned long size)

{

	return __nfit_test_ioremap(offset, size, ioremap_wt);

}

EXPORT_SYMBOL(__wrap_ioremap_wt);



void __iomem *__wrap_ioremap_wc(resource_size_t offset, unsigned long size)

{

	return __nfit_test_ioremap(offset, size, ioremap_wc);
@@ -117,6 +120,19 @@ void __wrap_iounmap(volatile void __iomem *addr) 
}

EXPORT_SYMBOL(__wrap_iounmap);



void __wrap_memunmap(void *addr)

{

	struct nfit_test_resource *nfit_res;



	rcu_read_lock();

	nfit_res = get_nfit_res((unsigned long) addr);

	rcu_read_unlock();

	if (nfit_res)

		return;

	return memunmap(addr);

}

EXPORT_SYMBOL(__wrap_memunmap);



struct resource *__wrap___request_region(struct resource *parent,

		resource_size_t start, resource_size_t n, const char *name,

		int flags)