diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-11-02 19:18:08 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-11-02 19:18:08 +0100 |
| commit | 722c908f84c67bf120105ca870675cadc1bb7b20 (patch) | |
| tree | 1fb261d952624623e35f1f4ec958c7b4e4226d96 /drivers/iommu/mtk_iommu.c | |
| parent | irq/core: Fix boot crash when the irqaffinity= boot parameter is passed on CP... (diff) | |
| parent | irqchip: mips-gic: Make IPI bitmaps static (diff) | |
| download | linux-722c908f84c67bf120105ca870675cadc1bb7b20.tar.xz linux-722c908f84c67bf120105ca870675cadc1bb7b20.zip | |
Merge tag 'irqchip-4.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/core
Pull the second batch of irqchip updates for 4.15 from marc Zyngier:
- A number of MIPS GIC updates and cleanups
- One GICv4 update
- Another firmware workaround for GICv2
- Support for Mason8 GPIOs
- Tiny documentation fix
Diffstat (limited to 'drivers/iommu/mtk_iommu.c')
| -rw-r--r-- | drivers/iommu/mtk_iommu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c index bd515be5b380..16d33ac19db0 100644 --- a/drivers/iommu/mtk_iommu.c +++ b/drivers/iommu/mtk_iommu.c @@ -371,7 +371,8 @@ static int mtk_iommu_map(struct iommu_domain *domain, unsigned long iova, int ret; spin_lock_irqsave(&dom->pgtlock, flags); - ret = dom->iop->map(dom->iop, iova, paddr, size, prot); + ret = dom->iop->map(dom->iop, iova, paddr & DMA_BIT_MASK(32), + size, prot); spin_unlock_irqrestore(&dom->pgtlock, flags); return ret; |