On Fri 09-06-17 13:24:35, Dan Williams wrote: > Kill this globally defined wrapper and move to libnvdimm so that we can > ultimately remove include/linux/pmem.h. > > Cc: <[email protected]> > Cc: Jan Kara <[email protected]> > Cc: Jeff Moyer <[email protected]> > Cc: Ingo Molnar <[email protected]> > Cc: Christoph Hellwig <[email protected]> > Cc: "H. Peter Anvin" <[email protected]> > Cc: Thomas Gleixner <[email protected]> > Cc: Matthew Wilcox <[email protected]> > Cc: Ross Zwisler <[email protected]> > Signed-off-by: Dan Williams <[email protected]>
Looks good to me. You can add: Reviewed-by: Jan Kara <[email protected]> Honza > --- > drivers/nvdimm/claim.c | 3 ++- > drivers/nvdimm/pmem.c | 2 +- > drivers/nvdimm/pmem.h | 3 +++ > include/linux/pmem.h | 19 ------------------- > 4 files changed, 6 insertions(+), 21 deletions(-) > > diff --git a/drivers/nvdimm/claim.c b/drivers/nvdimm/claim.c > index b8b9c8ca7862..d2e16c0401df 100644 > --- a/drivers/nvdimm/claim.c > +++ b/drivers/nvdimm/claim.c > @@ -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; > } > diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c > index 3b87702d46bb..68737bc68a07 100644 > --- a/drivers/nvdimm/pmem.c > +++ b/drivers/nvdimm/pmem.c > @@ -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; > } > diff --git a/drivers/nvdimm/pmem.h b/drivers/nvdimm/pmem.h > index 9137ec80b85f..d579c7095a45 100644 > --- a/drivers/nvdimm/pmem.h > +++ b/drivers/nvdimm/pmem.h > @@ -10,6 +10,9 @@ > 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 > */ > diff --git a/include/linux/pmem.h b/include/linux/pmem.h > index 33ae761f010a..559c00848583 100644 > --- a/include/linux/pmem.h > +++ b/include/linux/pmem.h > @@ -30,11 +30,6 @@ static inline void arch_memcpy_to_pmem(void *dst, const > void *src, size_t n) > { > BUG(); > } > - > -static inline void arch_invalidate_pmem(void *addr, size_t size) > -{ > - BUG(); > -} > #endif > > static inline bool arch_has_pmem_api(void) > @@ -61,18 +56,4 @@ static inline void memcpy_to_pmem(void *dst, const void > *src, size_t n) > else > memcpy(dst, src, n); > } > - > -/** > - * invalidate_pmem - flush a pmem range from the cache hierarchy > - * @addr: virtual start address > - * @size: bytes to invalidate (internally aligned to cache line size) > - * > - * For platforms that support clearing poison this flushes any poisoned > - * ranges out of the cache > - */ > -static inline void invalidate_pmem(void *addr, size_t size) > -{ > - if (arch_has_pmem_api()) > - arch_invalidate_pmem(addr, size); > -} > #endif /* __PMEM_H__ */ > -- Jan Kara <[email protected]> SUSE Labs, CR -- dm-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/dm-devel
