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

Commit 76e9f0ee authored by Dan Williams's avatar Dan Williams
Browse files

phys_to_pfn_t: use phys_addr_t 



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@linux.intel.com>
Reported-by: default avatarMatthew Wilcox <willy@linux.intel.com>
[willy: fix pfn_t_to_phys as well]
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 03fc2da6

include/linux/pfn_t.h

+2 −2
Original line number Diff line number Diff line
@@ -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)

{
@@ -48,7 +48,7 @@ static inline struct page *pfn_t_to_page(pfn_t pfn) 
	return NULL;

}



static inline dma_addr_t pfn_t_to_phys(pfn_t pfn)

static inline phys_addr_t pfn_t_to_phys(pfn_t pfn)

{

	return PFN_PHYS(pfn_t_to_pfn(pfn));

}

kernel/memremap.c

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

}

tools/testing/nvdimm/test/iomap.c

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