leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iommu/arm-smmu: Ensure IAS is set correctly for AArch32-capable SMMUs

Browse Source 
AArch32-capable SMMU implementations have a minimum IAS of 40 bits, so
ensure that is reflected in the stage-2 page table configuration.

Signed-off-by: Will Deacon <will.deacon@arm.com>
This commit is contained in:
Will Deacon
2015-08-20 12:12:32 +01:00
parent ffcb6d1686
commit f0c453dbcc
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/iommu/arm-smmu-v3.c
View File

@@ -56,6 +56,7 @@
#define IDR0_TTF_SHIFT 2 #define IDR0_TTF_SHIFT 2
#define IDR0_TTF_MASK 0x3 #define IDR0_TTF_MASK 0x3
#define IDR0_TTF_AARCH64 (2 << IDR0_TTF_SHIFT) #define IDR0_TTF_AARCH64 (2 << IDR0_TTF_SHIFT)
#define IDR0_TTF_AARCH32_64 (3 << IDR0_TTF_SHIFT)
#define IDR0_S1P (1 << 1) #define IDR0_S1P (1 << 1)
#define IDR0_S2P (1 << 0) #define IDR0_S2P (1 << 0)
@@ -2460,7 +2461,13 @@ static int arm_smmu_device_probe(struct arm_smmu_device *smmu)
} }
/* We only support the AArch64 table format at present */ /* We only support the AArch64 table format at present */
if ((reg & IDR0_TTF_MASK << IDR0_TTF_SHIFT) < IDR0_TTF_AARCH64) { switch (reg & IDR0_TTF_MASK << IDR0_TTF_SHIFT) {
case IDR0_TTF_AARCH32_64:
smmu->ias = 40;
/* Fallthrough */
case IDR0_TTF_AARCH64:
break;
default:
dev_err(smmu->dev, "AArch64 table format not supported!\n"); dev_err(smmu->dev, "AArch64 table format not supported!\n");
return -ENXIO; return -ENXIO;
} }
@@ -2541,8 +2548,7 @@ static int arm_smmu_device_probe(struct arm_smmu_device *smmu)
dev_warn(smmu->dev, dev_warn(smmu->dev,
"failed to set DMA mask for table walker\n"); "failed to set DMA mask for table walker\n");
if (!smmu->ias) smmu->ias = max(smmu->ias, smmu->oas);
smmu->ias = smmu->oas;
dev_info(smmu->dev, "ias %lu-bit, oas %lu-bit (features 0x%08x)\n", dev_info(smmu->dev, "ias %lu-bit, oas %lu-bit (features 0x%08x)\n",
smmu->ias, smmu->oas, smmu->features); smmu->ias, smmu->oas, smmu->features);