Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Stefano Stabellini <stefano.stabellini@xilinx.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Link: https://lore.kernel.org/r/20200710223427.6897-8-sstabellini@kernel.org
Signed-off-by: Juergen Gross <jgross@suse.com>

authored by

Stefano Stabellini and committed by
Juergen Gross
e9aab7e4 38ba51de

+1 -7
+1 -6
drivers/xen/swiotlb-xen.c
··· 52 52 * Quick lookup value of the bus address of the IOTLB. 53 53 */ 54 54 55 - /* 56 - * Both of these functions should avoid XEN_PFN_PHYS because phys_addr_t 57 - * can be 32bit when dma_addr_t is 64bit leading to a loss in 58 - * information if the shift is done before casting to 64bit. 59 - */ 60 55 static inline dma_addr_t xen_phys_to_bus(struct device *dev, phys_addr_t paddr) 61 56 { 62 57 unsigned long bfn = pfn_to_bfn(XEN_PFN_DOWN(paddr)); ··· 96 101 { 97 102 unsigned long bfn = XEN_PFN_DOWN(dma_addr); 98 103 unsigned long xen_pfn = bfn_to_local_pfn(bfn); 99 - phys_addr_t paddr = XEN_PFN_PHYS(xen_pfn); 104 + phys_addr_t paddr = (phys_addr_t)xen_pfn << XEN_PAGE_SHIFT; 100 105 101 106 /* If the address is outside our domain, it CAN 102 107 * have the same virtual address as another address
-1
include/xen/page.h
··· 24 24 25 25 #define XEN_PFN_DOWN(x) ((x) >> XEN_PAGE_SHIFT) 26 26 #define XEN_PFN_UP(x) (((x) + XEN_PAGE_SIZE-1) >> XEN_PAGE_SHIFT) 27 - #define XEN_PFN_PHYS(x) ((phys_addr_t)(x) << XEN_PAGE_SHIFT) 28 27 29 28 #include <asm/xen/page.h> 30 29