The branch main has been updated by andrew:
URL:
https://cgit.FreeBSD.org/src/commit/?id=9a5dddc94f5cc5bd3c213f4afe2b147078e3bb6c
commit 9a5dddc94f5cc5bd3c213f4afe2b147078e3bb6c
Author: Andrew Turner <and...@freebsd.org>
AuthorDate: 2023-03-16 15:34:59 +0000
Commit: Andrew Turner <and...@freebsd.org>
CommitDate: 2023-03-16 16:45:42 +0000
Remove unneeded arm64 smmu macros
These aren't used by the driver so can be removed.
Sponsored by: Arm Ltd
Differential Revision: https://reviews.freebsd.org/D38950
---
sys/arm64/iommu/iommu_pte.h | 5 -----
1 file changed, 5 deletions(-)
diff --git a/sys/arm64/iommu/iommu_pte.h b/sys/arm64/iommu/iommu_pte.h
index 99f1ca30ec55..88800c15ba42 100644
--- a/sys/arm64/iommu/iommu_pte.h
+++ b/sys/arm64/iommu/iommu_pte.h
@@ -45,7 +45,6 @@
/* Level 1 table, 1GiB per entry */
#define IOMMU_L1_SHIFT 30
#define IOMMU_L1_SIZE (1 << IOMMU_L1_SHIFT)
-#define IOMMU_L1_OFFSET (IOMMU_L1_SIZE - 1)
#define IOMMU_L1_INVAL IOMMU_L0_INVAL
#define IOMMU_L1_BLOCK 0x1
#define IOMMU_L1_TABLE IOMMU_L0_TABLE
@@ -53,17 +52,13 @@
/* Level 2 table, 2MiB per entry */
#define IOMMU_L2_SHIFT 21
#define IOMMU_L2_SIZE (1 << IOMMU_L2_SHIFT)
-#define IOMMU_L2_OFFSET (IOMMU_L2_SIZE - 1)
#define IOMMU_L2_INVAL IOMMU_L1_INVAL
#define IOMMU_L2_BLOCK IOMMU_L1_BLOCK
#define IOMMU_L2_TABLE IOMMU_L1_TABLE
-#define IOMMU_L2_BLOCK_MASK UINT64_C(0xffffffe00000)
-
/* Level 3 table, 4KiB per entry */
#define IOMMU_L3_SHIFT 12
#define IOMMU_L3_SIZE (1 << IOMMU_L3_SHIFT)
-#define IOMMU_L3_OFFSET (IOMMU_L3_SIZE - 1)
#define IOMMU_L3_SHIFT 12
#define IOMMU_L3_INVAL 0x0
/* 0x1 is reserved */
