diff options
author | Eric Auger <eric.auger@redhat.com> | 2017-01-19 15:58:03 -0500 |
---|---|---|
committer | Will Deacon <will.deacon@arm.com> | 2017-01-23 10:00:47 -0500 |
commit | 5018c8d5ef0c172592eb98cf10e253d47b544ba8 (patch) | |
tree | c963fb697a74208ce7566e8bef1565b74e217094 | |
parent | 9d72f87babf144ff3ca5d85655c710de05110038 (diff) |
iommu/arm-smmu: Do not advertise IOMMU_CAP_INTR_REMAP anymore
IOMMU_CAP_INTR_REMAP has been advertised in arm-smmu(-v3) although
on ARM this property is not attached to the IOMMU but rather is
implemented in the MSI controller (GICv3 ITS).
Now vfio_iommu_type1 checks MSI remapping capability at MSI controller
level, let's correct this.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Acked-by: Will Deacon <will.deacon@arm.com>
Reviewed-by: Tomasz Nowicki <tomasz.nowicki@caviumnetworks.com>
Tested-by: Tomasz Nowicki <tomasz.nowicki@caviumnetworks.com>
Tested-by: Bharat Bhushan <bharat.bhushan@nxp.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
-rw-r--r-- | drivers/iommu/arm-smmu-v3.c | 2 | ||||
-rw-r--r-- | drivers/iommu/arm-smmu.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c index 6c4111cb19ff..d9cf6cb8c6cc 100644 --- a/drivers/iommu/arm-smmu-v3.c +++ b/drivers/iommu/arm-smmu-v3.c | |||
@@ -1375,8 +1375,6 @@ static bool arm_smmu_capable(enum iommu_cap cap) | |||
1375 | switch (cap) { | 1375 | switch (cap) { |
1376 | case IOMMU_CAP_CACHE_COHERENCY: | 1376 | case IOMMU_CAP_CACHE_COHERENCY: |
1377 | return true; | 1377 | return true; |
1378 | case IOMMU_CAP_INTR_REMAP: | ||
1379 | return true; /* MSIs are just memory writes */ | ||
1380 | case IOMMU_CAP_NOEXEC: | 1378 | case IOMMU_CAP_NOEXEC: |
1381 | return true; | 1379 | return true; |
1382 | default: | 1380 | default: |
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index a354572491c8..13d26009b8e0 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c | |||
@@ -1374,8 +1374,6 @@ static bool arm_smmu_capable(enum iommu_cap cap) | |||
1374 | * requests. | 1374 | * requests. |
1375 | */ | 1375 | */ |
1376 | return true; | 1376 | return true; |
1377 | case IOMMU_CAP_INTR_REMAP: | ||
1378 | return true; /* MSIs are just memory writes */ | ||
1379 | case IOMMU_CAP_NOEXEC: | 1377 | case IOMMU_CAP_NOEXEC: |
1380 | return true; | 1378 | return true; |
1381 | default: | 1379 | default: |