diff options
| author |   Will Deacon <will.deacon@arm.com> | 2016-08-16 14:29:16 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2016-08-19 09:48:15 +0100 |
| commit | 5bc0a11664e17e9f9551983f5b660bd48b57483c (patch) | |
| tree | 6c06e1eab2c9e960cdee16de2a1a0cba24ce0437 /drivers/iommu/arm-smmu-v3.c | |
| parent | iommu/arm-smmu: Disable stalling faults for all endpoints (diff) | |
| download | linux-dev-5bc0a11664e17e9f9551983f5b660bd48b57483c.tar.xz linux-dev-5bc0a11664e17e9f9551983f5b660bd48b57483c.zip | |
iommu/arm-smmu: Don't BUG() if we find aborting STEs with disable_bypass
The disable_bypass cmdline option changes the SMMUv3 driver to put down
faulting stream table entries by default, as opposed to bypassing
transactions from unconfigured devices.
In this mode of operation, it is entirely expected to see aborting
entries in the stream table if and when we come to installing a valid
translation, so don't trigger a BUG() as a result of misdiagnosing these
entries as stream table corruption.
Cc: <stable@vger.kernel.org>
Fixes: 48ec83bcbcf5 ("iommu/arm-smmu: Add initial driver support for ARM SMMUv3 devices")
Tested-by: Robin Murphy <robin.murphy@arm.com>
Reported-by: Robin Murphy <robin.murphy@arm.com>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'drivers/iommu/arm-smmu-v3.c')
| -rw-r--r-- | drivers/iommu/arm-smmu-v3.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c index 330623f8e344..641e88761319 100644 --- a/drivers/iommu/arm-smmu-v3.c +++ b/drivers/iommu/arm-smmu-v3.c @@ -1034,6 +1034,9 @@ static void arm_smmu_write_strtab_ent(struct arm_smmu_device *smmu, u32 sid, case STRTAB_STE_0_CFG_S2_TRANS: ste_live = true; break; + case STRTAB_STE_0_CFG_ABORT: + if (disable_bypass) + break; default: BUG(); /* STE corruption */ } |