Skip to content

Commit 24dfb19

Browse files
LuBaolujoergroedel
authored andcommitted
iommu/ipmmu-vmsa: Call arm_iommu_release_mapping() in release path
In the iommu driver's release_device operation, the driver should detach the device from any attached domain and release the resources allocated in the probe_device and probe_finalize paths. Replace arm_iommu_detach_device() with arm_iommu_release_mapping() in the release path of the ipmmu-vmsa driver. The device_release callback is called in device_del(), this device is not coming back. Zeroing out pointers and testing for a condition which cannot be true by construction is simply a waste of time and code. The bonus is that it also removes a obstacle of arm_iommu_detach_device() re-entering the iommu core during release_device. With this removed, the iommu core code could be simplified a lot. Signed-off-by: Jason Gunthorpe <jgg@nvidia.com> Suggested-by: Robin Murphy <robin.murphy@arm.com> Link: https://lore.kernel.org/linux-iommu/7b248ba1-3967-5cd8-82e9-0268c706d320@arm.com/ Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com> Reviewed-by: Jason Gunthorpe <jgg@nvidia.com> Link: https://lore.kernel.org/r/20230322064956.263419-2-baolu.lu@linux.intel.com Signed-off-by: Joerg Roedel <jroedel@suse.de>
1 parent a6c9e38 commit 24dfb19

1 file changed

Lines changed: 12 additions & 2 deletions

File tree

drivers/iommu/ipmmu-vmsa.c

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#define arm_iommu_create_mapping(...) NULL
3131
#define arm_iommu_attach_device(...) -ENODEV
3232
#define arm_iommu_release_mapping(...) do {} while (0)
33-
#define arm_iommu_detach_device(...) do {} while (0)
3433
#endif
3534

3635
#define IPMMU_CTX_MAX 16U
@@ -820,7 +819,18 @@ static void ipmmu_probe_finalize(struct device *dev)
820819

821820
static void ipmmu_release_device(struct device *dev)
822821
{
823-
arm_iommu_detach_device(dev);
822+
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
823+
struct ipmmu_vmsa_device *mmu = to_ipmmu(dev);
824+
unsigned int i;
825+
826+
for (i = 0; i < fwspec->num_ids; ++i) {
827+
unsigned int utlb = fwspec->ids[i];
828+
829+
ipmmu_imuctr_write(mmu, utlb, 0);
830+
mmu->utlb_ctx[utlb] = IPMMU_CTX_INVALID;
831+
}
832+
833+
arm_iommu_release_mapping(mmu->mapping);
824834
}
825835

826836
static struct iommu_group *ipmmu_find_group(struct device *dev)

0 commit comments

Comments
 (0)