Commit 79218fd0 authored by Nicolin Chen's avatar Nicolin Chen Committed by Jason Gunthorpe
Browse files

iommu/amd: Drop unnecessary checks in amd_iommu_attach_device() 

The same checks are done in amd_iommu_probe_device(). If any of them fails
there, then the device won't get a group, so there's no way for it to even
reach amd_iommu_attach_device anymore.

Link: https://lore.kernel.org/r/c054654a81f2b675c73108fe4bf10e45335a721a.1666042872.git.nicolinc@nvidia.com


Suggested-by: default avatarRobin Murphy <robin.murphy@arm.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Reviewed-by: default avatarVasant Hegde <vasant.hegde@amd.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Signed-off-by: default avatarNicolin Chen <nicolinc@nvidia.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 30a0b95b

drivers/iommu/amd/iommu.c

+2 −10
Original line number Diff line number Diff line
@@ -2155,21 +2155,13 @@ static void amd_iommu_detach_device(struct iommu_domain *dom, 
static int amd_iommu_attach_device(struct iommu_domain *dom,

				   struct device *dev)

{

	struct iommu_dev_data *dev_data = dev_iommu_priv_get(dev);

	struct protection_domain *domain = to_pdomain(dom);

	struct iommu_dev_data *dev_data;

	struct amd_iommu *iommu;

	struct amd_iommu *iommu = rlookup_amd_iommu(dev);

	int ret;



	if (!check_device(dev))

		return -EINVAL;



	dev_data = dev_iommu_priv_get(dev);

	dev_data->defer_attach = false;



	iommu = rlookup_amd_iommu(dev);

	if (!iommu)

		return -EINVAL;



	if (dev_data->domain)

		detach_device(dev);