diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
index 1f33580e0006c71e0311d89cda01c18da77cb67d..74eb98bd3e6e039536effd27e0f08bb83626c061 100644
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
@@ -1610,11 +1610,6 @@ static void arm_smmu_write_strtab_ent(struct arm_smmu_master *master, u32 sid,
 			 STRTAB_STE_2_S2PTW | STRTAB_STE_2_S2AA64 |
 			 STRTAB_STE_2_S2R);
 
-		if (smmu->features & ARM_SMMU_FEAT_HA)
-			dst[2] |= cpu_to_le64(STRTAB_STE_2_S2HA);
-		if (smmu->features & ARM_SMMU_FEAT_HD)
-			dst[2] |= cpu_to_le64(STRTAB_STE_2_S2HD);
-
 		dst[3] = cpu_to_le64(vttbr);
 
 		val |= FIELD_PREP(STRTAB_STE_0_CFG, STRTAB_STE_0_CFG_S2_TRANS);
diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h
index 9abce4732456dbb54d23e5712b2222703b6f33d2..d0f3181a22c5008294a73b39e206d6d0ade2ffc4 100644
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h
@@ -294,8 +294,6 @@
 #define STRTAB_STE_2_S2AA64		(1UL << 51)
 #define STRTAB_STE_2_S2ENDI		(1UL << 52)
 #define STRTAB_STE_2_S2PTW		(1UL << 54)
-#define STRTAB_STE_2_S2HD		(1UL << 55)
-#define STRTAB_STE_2_S2HA		(1UL << 56)
 #define STRTAB_STE_2_S2R		(1UL << 58)
 
 #define STRTAB_STE_3_S2TTB_MASK		GENMASK_ULL(51, 4)
diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c
index 2740a35fe71493fe33262eea7900a18e6e254b71..3fc6ae00dc96bf02299ca65e9c383a358b4210f7 100644
--- a/drivers/iommu/io-pgtable-arm.c
+++ b/drivers/iommu/io-pgtable-arm.c
@@ -401,12 +401,8 @@ static arm_lpae_iopte arm_lpae_prot_to_pte(struct arm_lpae_io_pgtable *data,
 		pte = ARM_LPAE_PTE_HAP_FAULT;
 		if (prot & IOMMU_READ)
 			pte |= ARM_LPAE_PTE_HAP_READ;
-		if (prot & IOMMU_WRITE) {
+		if (prot & IOMMU_WRITE)
 			pte |= ARM_LPAE_PTE_HAP_WRITE;
-			if (data->iop.fmt == ARM_64_LPAE_S2 &&
-			    cfg->quirks & IO_PGTABLE_QUIRK_ARM_HD)
-				pte |= ARM_LPAE_PTE_DBM;
-		}
 	}
 
 	/*