iommu/io-pgtalbe-arm: Remove "iopte_type(pte, l)" extra parameter "l"
Subsystems (2)
PATCH RESEND 1/1 iommu/io-pgtalbe-arm: Remove "iopte_type(pte, l)" extra parameter "l"
Knowing from the code, the macro "iopte_type(pte, l)" doesn't use the parameter "l" (level). So we'd better to remove it.
Fixes e1d3c0fd701df(iommu: add ARM LPAE page table allocator)
Signed-off-by Kunkun Jiang <[email protected]>
--- drivers/iommu/io-pgtable-arm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/iommu/io-pgtable-arm.c +5 -5
@@ -130,7 +130,7 @@/* IOPTE accessors */ #define iopte_deref (pte,d) __va(iopte_to_paddr(pte, d)) -#define iopte_type (pte,l) \ +#define iopte_type (pte) \ (((pte) >> ARM_LPAE_PTE_TYPE_SHIFT) & ARM_LPAE_PTE_TYPE_MASK)#define iopte_prot (pte) ((pte) & ARM_LPAE_PTE_ATTR_MASK)
@@ -151,9 +151,9 @@ static inline bool iopte_leaf(arm_lpae_iopte pte, int lvl, enum io_pgtable_fmt fmt) {if (lvl == (ARM_LPAE_MAX_LEVELS -1 ) && fmt !=ARM_MALI_LPAE ) -return iopte_type (pte, lvl) ==ARM_LPAE_PTE_TYPE_PAGE ; +return iopte_type (pte) ==ARM_LPAE_PTE_TYPE_PAGE ; -return iopte_type (pte, lvl) ==ARM_LPAE_PTE_TYPE_BLOCK ; +return iopte_type (pte) ==ARM_LPAE_PTE_TYPE_BLOCK ; } static arm_lpae_iopte paddr_to_iopte(phys_addr_t paddr,
@@ -280,7 +280,7 @@ static int arm_lpae_init_pte(struct arm_lpae_io_pgtable *data,/* We require an unmap first */ WARN_ON (!selftest_running);return -EEXIST ; - }else if (iopte_type (pte, lvl) ==ARM_LPAE_PTE_TYPE_TABLE ) { + }else if (iopte_type (pte) ==ARM_LPAE_PTE_TYPE_TABLE ) {/* * We need to unmap and free the old table before * overwriting it with a block entry.
@@ -548,7 +548,7 @@ static size_t arm_lpae_split_blk_unmap(struct arm_lpae_io_pgtable *data,* block, but anything else is invalid. We can't misinterpret * a page entry here since we're never at the last level. */ -if (iopte_type (pte, lvl -1 ) !=ARM_LPAE_PTE_TYPE_TABLE ) +if (iopte_type (pte) !=ARM_LPAE_PTE_TYPE_TABLE )return 0 ; tablep =iopte_deref (pte, data);
Signature · 6 lines
2.19.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Quoted 2 lines · Kunkun Jiang
Knowing from the code, the macro "
iopte_type(pte, l)" doesn't use the parameter "l" (level). So we'd better to remove it.
Applied to arm64 (for-next/iommu/misc), thanks!
[1/1] iommu/io-pgtalbe-arm: Remove "iopte_type(pte, l)" extra parameter "l"
https://git.kernel.org/arm64/c/f37eb48466d2
Cheers,
Signature · 9 lines
Will https://fixes.arm64.dev https://next.arm64.dev https://will.arm64.dev _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu