[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20160122184626.GF2948@linux.intel.com>
Date: Fri, 22 Jan 2016 13:46:26 -0500
From: Matthew Wilcox <willy@...ux.intel.com>
To: Dan Williams <dan.j.williams@...el.com>
Cc: akpm@...ux-foundation.org,
Ross Zwisler <ross.zwisler@...ux.intel.com>,
linux-kernel@...r.kernel.org, linux-mm@...ck.org
Subject: Re: [PATCH] phys_to_pfn_t: use phys_addr_t
Missed one:
static inline dma_addr_t pfn_t_to_phys(pfn_t pfn)
{
return PFN_PHYS(pfn_t_to_pfn(pfn));
}
On Fri, Jan 22, 2016 at 09:51:14AM -0800, Dan Williams wrote:
> A dma_addr_t is potentially smaller than a phys_addr_t on some archs.
> Don't truncate the address when doing the pfn conversion.
>
> Cc: Ross Zwisler <ross.zwisler@...ux.intel.com>
> Reported-by: Matthew Wilcox <willy@...ux.intel.com>
> Signed-off-by: Dan Williams <dan.j.williams@...el.com>
> ---
> include/linux/pfn_t.h | 2 +-
> kernel/memremap.c | 2 +-
> tools/testing/nvdimm/test/iomap.c | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/include/linux/pfn_t.h b/include/linux/pfn_t.h
> index 0703b5360d31..98145a17c1eb 100644
> --- a/include/linux/pfn_t.h
> +++ b/include/linux/pfn_t.h
> @@ -29,7 +29,7 @@ static inline pfn_t pfn_to_pfn_t(unsigned long pfn)
> return __pfn_to_pfn_t(pfn, 0);
> }
>
> -extern pfn_t phys_to_pfn_t(dma_addr_t addr, unsigned long flags);
> +extern pfn_t phys_to_pfn_t(phys_addr_t addr, unsigned long flags);
>
> static inline bool pfn_t_has_page(pfn_t pfn)
> {
> diff --git a/kernel/memremap.c b/kernel/memremap.c
> index e517a16cb426..7f6d08f41d72 100644
> --- a/kernel/memremap.c
> +++ b/kernel/memremap.c
> @@ -150,7 +150,7 @@ void devm_memunmap(struct device *dev, void *addr)
> }
> EXPORT_SYMBOL(devm_memunmap);
>
> -pfn_t phys_to_pfn_t(dma_addr_t addr, unsigned long flags)
> +pfn_t phys_to_pfn_t(phys_addr_t addr, unsigned long flags)
> {
> return __pfn_to_pfn_t(addr >> PAGE_SHIFT, flags);
> }
> diff --git a/tools/testing/nvdimm/test/iomap.c b/tools/testing/nvdimm/test/iomap.c
> index 7ec7df9e7fc7..0c1a7e65bb81 100644
> --- a/tools/testing/nvdimm/test/iomap.c
> +++ b/tools/testing/nvdimm/test/iomap.c
> @@ -113,7 +113,7 @@ void *__wrap_devm_memremap_pages(struct device *dev, struct resource *res,
> }
> EXPORT_SYMBOL(__wrap_devm_memremap_pages);
>
> -pfn_t __wrap_phys_to_pfn_t(dma_addr_t addr, unsigned long flags)
> +pfn_t __wrap_phys_to_pfn_t(phys_addr_t addr, unsigned long flags)
> {
> struct nfit_test_resource *nfit_res = get_nfit_res(addr);
>
Powered by blists - more mailing lists