Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751504AbbG1XG5 (ORCPT ); Tue, 28 Jul 2015 19:06:57 -0400 Received: from mail-wi0-f173.google.com ([209.85.212.173]:36879 "EHLO mail-wi0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750915AbbG1XGz (ORCPT ); Tue, 28 Jul 2015 19:06:55 -0400 MIME-Version: 1.0 In-Reply-To: <1438123889.2459.0.camel@linux.intel.com> References: <20150725023649.8664.59145.stgit@dwillia2-desk3.amr.corp.intel.com> <20150725023940.8664.2784.stgit@dwillia2-desk3.amr.corp.intel.com> <1438123889.2459.0.camel@linux.intel.com> Date: Tue, 28 Jul 2015 16:06:54 -0700 Message-ID: Subject: Re: [PATCH v2 18/25] libnvdimm, pmem: switch from ioremap_cache to memremap From: Dan Williams To: Ross Zwisler Cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , linux-arch@vger.kernel.org, "linux-nvdimm@lists.01.org" , "linux-kernel@vger.kernel.org" , Russell King , Christoph Hellwig , "linux-arm-kernel@lists.infradead.org" Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2319 Lines: 56 On Tue, Jul 28, 2015 at 3:51 PM, Ross Zwisler wrote: > On Fri, 2015-07-24 at 22:39 -0400, Dan Williams wrote: >> In preparation for deprecating ioremap_cache() convert its usage in >> libnvdimm and the PMEM API to memremap. >> >> Signed-off-by: Dan Williams >> --- >> arch/x86/include/asm/io.h | 7 +------ >> arch/x86/mm/ioremap.c | 6 ++++++ >> tools/testing/nvdimm/Kbuild | 2 +- >> tools/testing/nvdimm/test/iomap.c | 6 +++--- >> 4 files changed, 11 insertions(+), 10 deletions(-) >> >> diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h >> index cc9c61bc1abe..8aeb6456188a 100644 >> --- a/arch/x86/include/asm/io.h >> +++ b/arch/x86/include/asm/io.h >> @@ -248,12 +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); >> -} >> - >> +void __pmem *arch_memremap_pmem(resource_size_t offset, size_t size); >> #endif /* __KERNEL__ */ >> >> extern void native_io_delay(void); >> diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c >> index 6f759c7c2ab7..7b422e7574b1 100644 >> --- a/arch/x86/mm/ioremap.c >> +++ b/arch/x86/mm/ioremap.c >> @@ -317,6 +317,12 @@ void __iomem *ioremap_cache(resource_size_t phys_addr, unsigned long size) >> } >> EXPORT_SYMBOL(ioremap_cache); >> >> +void __pmem *arch_memremap_pmem(resource_size_t offset, size_t size) >> +{ >> + return (void __force __pmem *) ioremap_cache(offset, size); > > Did you mean for this to be a call to memremap() instead of ioremap_cache()? The ioremap_cache elimination comes in "[PATCH v2 25/25] pmem: convert to generic memremap", but yeah I should update the changelog to reflect this is more about pushing the calls to ioremap_cache() out of line. It would be circular at this point in the series to call back out to memremap to have it turn around and call ioremap_cache again. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/