Commit 5bc0a116 authored Aug 16, 2016 by Will Deacon

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: 48ec83bc ("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>

parent 3714ce1d

drivers/iommu/arm-smmu-v3.c

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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:		case STRTAB_STE_0_CFG_S2_TRANS:
	ste_live = true;		ste_live = true;
	break;		break;
			case STRTAB_STE_0_CFG_ABORT:
			if (disable_bypass)
			break;
	default:		default:
	BUG(); /* STE corruption */		BUG(); /* STE corruption */
	}		}