diff options
| author | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2014-11-21 11:10:39 +0000 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-01-15 10:43:27 +0000 |
| commit | de705e65b8e65fce1151597df50efadf3e0e150a (patch) | |
| tree | 8494d0380306a77542c32273cbbea88516190f40 /drivers | |
| parent | 43172522fc590e4e27d79492c30be9827cdacce2 (diff) | |
| download | linux-stable-de705e65b8e65fce1151597df50efadf3e0e150a.tar.gz linux-stable-de705e65b8e65fce1151597df50efadf3e0e150a.tar.bz2 linux-stable-de705e65b8e65fce1151597df50efadf3e0e150a.zip | |
swiotlb-xen: remove BUG_ON in xen_bus_to_phys
commit c884227eaae9936f8ecbde6e1387bccdab5f4e90 upstream.
On x86 truncation cannot occur because config XEN depends on X86_64 ||
(X86_32 && X86_PAE).
On ARM truncation can occur without CONFIG_ARM_LPAE, when the dma
operation involves foreign grants. However in that case the physical
address returned by xen_bus_to_phys is actually invalid (there is no mfn
to pfn tracking for foreign grants on ARM) and it is not used.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/xen/swiotlb-xen.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c index bc6fb0d24ad5..f21282da9876 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -96,8 +96,6 @@ static inline phys_addr_t xen_bus_to_phys(dma_addr_t baddr) dma_addr_t dma = (dma_addr_t)pfn << PAGE_SHIFT; phys_addr_t paddr = dma; - BUG_ON(paddr != dma); /* truncation has occurred, should never happen */ - paddr |= baddr & ~PAGE_MASK; return paddr; |