Commit e9aab7e4 authored by Stefano Stabellini's avatar Stefano Stabellini Committed by Juergen Gross
Browse files

swiotlb-xen: remove XEN_PFN_PHYS 



XEN_PFN_PHYS is only used in one place in swiotlb-xen making things more
complex than need to be.

Remove the definition of XEN_PFN_PHYS and open code the cast in the one
place where it is needed.

Signed-off-by: default avatarStefano Stabellini <stefano.stabellini@xilinx.com>
Reviewed-by: default avatarJuergen Gross <jgross@suse.com>
Link: https://lore.kernel.org/r/20200710223427.6897-8-sstabellini@kernel.org


Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
parent 38ba51de

drivers/xen/swiotlb-xen.c

+1 −6
Original line number Diff line number Diff line
@@ -52,11 +52,6 @@ static unsigned long xen_io_tlb_nslabs; 
 * Quick lookup value of the bus address of the IOTLB.

 */



/*

 * Both of these functions should avoid XEN_PFN_PHYS because phys_addr_t

 * can be 32bit when dma_addr_t is 64bit leading to a loss in

 * information if the shift is done before casting to 64bit.

 */

static inline dma_addr_t xen_phys_to_bus(struct device *dev, phys_addr_t paddr)

{

	unsigned long bfn = pfn_to_bfn(XEN_PFN_DOWN(paddr));
@@ -101,7 +96,7 @@ static int is_xen_swiotlb_buffer(struct device *dev, dma_addr_t dma_addr) 
{

	unsigned long bfn = XEN_PFN_DOWN(dma_addr);

	unsigned long xen_pfn = bfn_to_local_pfn(bfn);

	phys_addr_t paddr = XEN_PFN_PHYS(xen_pfn);

	phys_addr_t paddr = (phys_addr_t)xen_pfn << XEN_PAGE_SHIFT;



	/* If the address is outside our domain, it CAN

	 * have the same virtual address as another address

include/xen/page.h

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 


#define XEN_PFN_DOWN(x)	((x) >> XEN_PAGE_SHIFT)

#define XEN_PFN_UP(x)	(((x) + XEN_PAGE_SIZE-1) >> XEN_PAGE_SHIFT)

#define XEN_PFN_PHYS(x)	((phys_addr_t)(x) << XEN_PAGE_SHIFT)



#include <asm/xen/page.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE