Skip to content

Commit ec7ca73

Browse files
danielmentzgooglewilldeacon
authored andcommitted
iommu/io-pgtable-arm: Remove unused macro iopte_prot
Commit 33729a5 ("iommu/io-pgtable-arm: Remove split on unmap behavior") removed the last user of the macro iopte_prot. Remove the macro definition of iopte_prot as well as three other related definitions. Fixes: 33729a5 ("iommu/io-pgtable-arm: Remove split on unmap behavior") Signed-off-by: Daniel Mentz <[email protected]> Reviewed-by: Liviu Dudau <[email protected]> Reviewed-by: Jason Gunthorpe <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Will Deacon <[email protected]>
1 parent 86731a2 commit ec7ca73

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed

drivers/iommu/io-pgtable-arm.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,6 @@
8585
#define ARM_LPAE_PTE_NS (((arm_lpae_iopte)1) << 5)
8686
#define ARM_LPAE_PTE_VALID (((arm_lpae_iopte)1) << 0)
8787

88-
#define ARM_LPAE_PTE_ATTR_LO_MASK (((arm_lpae_iopte)0x3ff) << 2)
89-
/* Ignore the contiguous bit for block splitting */
90-
#define ARM_LPAE_PTE_ATTR_HI_MASK (ARM_LPAE_PTE_XN | ARM_LPAE_PTE_DBM)
91-
#define ARM_LPAE_PTE_ATTR_MASK (ARM_LPAE_PTE_ATTR_LO_MASK | \
92-
ARM_LPAE_PTE_ATTR_HI_MASK)
9388
/* Software bit for solving coherency races */
9489
#define ARM_LPAE_PTE_SW_SYNC (((arm_lpae_iopte)1) << 55)
9590

@@ -155,8 +150,6 @@
155150
#define iopte_type(pte) \
156151
(((pte) >> ARM_LPAE_PTE_TYPE_SHIFT) & ARM_LPAE_PTE_TYPE_MASK)
157152

158-
#define iopte_prot(pte) ((pte) & ARM_LPAE_PTE_ATTR_MASK)
159-
160153
#define iopte_writeable_dirty(pte) \
161154
(((pte) & ARM_LPAE_PTE_AP_WR_CLEAN_MASK) == ARM_LPAE_PTE_DBM)
162155

0 commit comments

Comments
 (0)