Merge "iommu: arm-smmu: fix KW issues"