summaryrefslogtreecommitdiffstats
path: root/arch/ia64/hp/common
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2018-04-12 09:33:30 +0200
committerChristoph Hellwig <hch@lst.de>2018-05-07 07:15:41 +0200
commit325ef1857fff8b2049322921e19421b6c5ad74e5 (patch)
treed4f0dc35d4e37e18c432e76292e3a453462dd02e /arch/ia64/hp/common
parentnet: remove the PCI_DMA_BUS_IS_PHYS check in illegal_highdma (diff)
downloadlinux-325ef1857fff8b2049322921e19421b6c5ad74e5.tar.xz
linux-325ef1857fff8b2049322921e19421b6c5ad74e5.zip
PCI: remove PCI_DMA_BUS_IS_PHYS
This was used by the ide, scsi and networking code in the past to determine if they should bounce payloads. Now that the dma mapping always have to support dma to all physical memory (thanks to swiotlb for non-iommu systems) there is no need to this crude hack any more. Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Palmer Dabbelt <palmer@sifive.com> (for riscv) Reviewed-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'arch/ia64/hp/common')
-rw-r--r--arch/ia64/hp/common/sba_iommu.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
index aec4a3354abe..6f05aba9012f 100644
--- a/arch/ia64/hp/common/sba_iommu.c
+++ b/arch/ia64/hp/common/sba_iommu.c
@@ -1845,9 +1845,6 @@ static void ioc_init(unsigned long hpa, struct ioc *ioc)
ioc_resource_init(ioc);
ioc_sac_init(ioc);
- if ((long) ~iovp_mask > (long) ia64_max_iommu_merge_mask)
- ia64_max_iommu_merge_mask = ~iovp_mask;
-
printk(KERN_INFO PFX
"%s %d.%d HPA 0x%lx IOVA space %dMb at 0x%lx\n",
ioc->name, (ioc->rev >> 4) & 0xF, ioc->rev & 0xF,