diff options
| author | Will Deacon <will.deacon@arm.com> | 2016-08-16 14:29:16 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-07 08:34:48 +0200 |
| commit | fcc5540e61a150782fce77e3086bf9409614a789 (patch) | |
| tree | add812bcc448eb7418f2097774c28518ff65987e | |
| parent | d182fcb5ad4172d26bcd5a4af71fc08c0cb85481 (diff) | |
| download | linux-stable-fcc5540e61a150782fce77e3086bf9409614a789.tar.gz linux-stable-fcc5540e61a150782fce77e3086bf9409614a789.tar.bz2 linux-stable-fcc5540e61a150782fce77e3086bf9409614a789.zip | |
iommu/arm-smmu: Don't BUG() if we find aborting STEs with disable_bypass
commit 5bc0a11664e17e9f9551983f5b660bd48b57483c upstream.
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.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 0cc667ae7a37..46ba2b64b6b3 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 */ } |