[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20220913082448.31120-3-nicolinc@nvidia.com>
Date: Tue, 13 Sep 2022 01:24:45 -0700
From: Nicolin Chen <nicolinc@...dia.com>
To: <joro@...tes.org>, <suravee.suthikulpanit@....com>,
<will@...nel.org>, <robin.murphy@....com>, <robdclark@...il.com>,
<dwmw2@...radead.org>, <baolu.lu@...ux.intel.com>,
<agross@...nel.org>, <bjorn.andersson@...aro.org>,
<konrad.dybcio@...ainline.org>, <matthias.bgg@...il.com>,
<heiko@...ech.de>, <orsonzhai@...il.com>,
<baolin.wang@...ux.alibaba.com>, <zhang.lyra@...il.com>,
<thierry.reding@...il.com>, <jean-philippe@...aro.org>,
<jgg@...dia.com>, <sricharan@...eaurora.org>
CC: <yong.wu@...iatek.com>, <vdumpa@...dia.com>,
<jonathanh@...dia.com>, <tglx@...utronix.de>,
<shameerali.kolothum.thodi@...wei.com>,
<thunder.leizhen@...wei.com>, <christophe.jaillet@...adoo.fr>,
<yangyingliang@...wei.com>, <jon@...id-run.com>,
<iommu@...ts.linux.dev>, <linux-kernel@...r.kernel.org>,
<linux-arm-kernel@...ts.infradead.org>,
<linux-arm-msm@...r.kernel.org>,
<linux-mediatek@...ts.infradead.org>,
<linux-rockchip@...ts.infradead.org>,
<linux-tegra@...r.kernel.org>,
<virtualization@...ts.linux-foundation.org>
Subject: [PATCH 2/5] 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 any more.
Suggested-by: Robin Murphy <robin.murphy@....com>
Cc: Joerg Roedel <joro@...tes.org>
Cc: Suravee Suthikulpanit <suravee.suthikulpanit@....com>
Signed-off-by: Nicolin Chen <nicolinc@...dia.com>
---
drivers/iommu/amd/iommu.c | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c
index 828672a46a3d..930d9946b9f7 100644
--- a/drivers/iommu/amd/iommu.c
+++ b/drivers/iommu/amd/iommu.c
@@ -2135,21 +2135,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);
--
2.17.1
Powered by blists - more mailing lists