user/sven/linux.git/include/linux/io-pgtable.h, branch v5.4.262

Merge branch 'arm/smmu' into arm/mediatek

2019-08-30T14:12:10Z

iommu/io-pgtable-arm-v7s: Extend to support PA[33:32] for MediaTek

2019-08-30T13:57:26Z

MediaTek extend the arm v7s descriptor to support up to 34 bits PA where the bit32 and bit33 are encoded in the bit9 and bit4 of the PTE respectively. Meanwhile the iova still is 32bits. Regarding whether the pagetable address could be over 4GB, the mt8183 support it while the previous mt8173 don't, thus keep it as is. Signed-off-by: Yong Wu Acked-by: Will Deacon Signed-off-by: Joerg Roedel

iommu/io-pgtable-arm-v7s: Rename the quirk from MTK_4GB to MTK_EXT

2019-08-30T13:57:26Z

In previous mt2712/mt8173, MediaTek extend the v7s to support 4GB dram. But in the latest mt8183, We extend it to support the PA up to 34bit. Then the "MTK_4GB" name is not so fit, This patch only change the quirk name to "MTK_EXT". Signed-off-by: Yong Wu Acked-by: Will Deacon Signed-off-by: Joerg Roedel

iommu/io-pgtable: Pass struct iommu_iotlb_gather to ->tlb_add_page()

2019-07-29T16:22:59Z

With all the pieces in place, we can finally propagate the iommu_iotlb_gather structure from the call to unmap() down to the IOMMU drivers' implementation of ->tlb_add_page(). Currently everybody ignores it, but the machinery is now there to defer invalidation. Signed-off-by: Will Deacon

iommu/io-pgtable: Pass struct iommu_iotlb_gather to ->unmap()

2019-07-29T16:22:59Z

Update the io-pgtable ->unmap() function to take an iommu_iotlb_gather pointer as an argument, and update the callers as appropriate. Signed-off-by: Will Deacon

iommu/io-pgtable: Remove unused ->tlb_sync() callback

2019-07-29T16:22:58Z

The ->tlb_sync() callback is no longer used, so it can be removed. Signed-off-by: Will Deacon

iommu/io-pgtable: Replace ->tlb_add_flush() with ->tlb_add_page()

2019-07-29T16:22:57Z

The ->tlb_add_flush() callback in the io-pgtable API now looks a bit silly: - It takes a size and a granule, which are always the same - It takes a 'bool leaf', which is always true - It only ever flushes a single page With that in mind, replace it with an optional ->tlb_add_page() callback that drops the useless parameters. Signed-off-by: Will Deacon

iommu/io-pgtable-arm: Call ->tlb_flush_walk() and ->tlb_flush_leaf()

2019-07-29T16:22:57Z

Now that all IOMMU drivers using the io-pgtable API implement the ->tlb_flush_walk() and ->tlb_flush_leaf() callbacks, we can use them in the io-pgtable code instead of ->tlb_add_flush() immediately followed by ->tlb_sync(). Signed-off-by: Will Deacon

iommu/io-pgtable: Introduce tlb_flush_walk() and tlb_flush_leaf()

2019-07-29T16:22:55Z

In preparation for deferring TLB flushes to iommu_tlb_sync(), introduce two new synchronous invalidation helpers to the io-pgtable API, which allow the unmap() code to force invalidation in cases where it cannot be deferred (e.g. when replacing a table with a block or when TLBI_ON_MAP is set). Signed-off-by: Will Deacon

iommu/io-pgtable: Rename iommu_gather_ops to iommu_flush_ops

2019-07-24T12:32:33Z

In preparation for TLB flush gathering in the IOMMU API, rename the iommu_gather_ops structure in io-pgtable to iommu_flush_ops, which better describes its purpose and avoids the potential for confusion between different levels of the API. $ find linux/ -type f -name '*.[ch]' | xargs sed -i 's/gather_ops/flush_ops/g' Signed-off-by: Will Deacon