--- a/drivers/iommu/arm-smmu-t19x.c +++ b/drivers/iommu/arm-smmu-t19x.c @@ -2535,7 +2535,10 @@ static void arm_smmu_device_reset(struct arm_smmu_device *smmu) reg = readl_relaxed(ARM_SMMU_GR0_NS(smmu) + ARM_SMMU_GR0_sCR0); /* Enable fault reporting */ - reg |= (sCR0_GFRE | sCR0_GFIE | sCR0_GCFGFRE | sCR0_GCFGFIE | sCR0_USFCFG); + reg |= (sCR0_GFRE | sCR0_GFIE | sCR0_GCFGFRE | sCR0_GCFGFIE); + + /* Disable Unidentified stream fault reporting */ + reg &= ~(sCR0_USFCFG); /* Disable TLB broadcasting. */ reg |= (sCR0_VMIDPNE | sCR0_PTM);