Merge "iommu/arm-smmu: Fix io-coherency enablement for clients using S1 bypass"

This commit is contained in:
qctecmdr 2020-12-09 19:47:45 -08:00 • committed by Gerrit - the friendly Code Review server
commit ac19da4fa6
2 changed files with 2 additions and 0 deletions

View file

@ -1715,6 +1715,7 @@ static void arm_smmu_write_context_bank(struct arm_smmu_device *smmu, int idx,
reg |= FIELD_PREP(SCTLR_WACFG, SCTLR_WACFG_WA) |
FIELD_PREP(SCTLR_RACFG, SCTLR_RACFG_RA) |
FIELD_PREP(SCTLR_SHCFG, SCTLR_SHCFG_OSH) |
SCTLR_MTCFG |
FIELD_PREP(SCTLR_MEM_ATTR, SCTLR_MEM_ATTR_OISH_WB_CACHE);
} else {

View file

@ -153,6 +153,7 @@ enum arm_smmu_cbar_type {
#define SCTLR_RACFG GENMASK(25, 24)
#define SCTLR_RACFG_RA 0x2
#define SCTLR_SHCFG GENMASK(23, 22)
#define SCTLR_SHCFG_OSH 0x1
#define SCTLR_SHCFG_NSH 0x3
#define SCTLR_MTCFG BIT(20)
#define SCTLR_MEM_ATTR GENMASK(19, 16)