Merge "iommu: arm-smmu: Fix locking issue"