From: Wan Zongshun <vincent.wan@amd.com>
To: Joerg Roedel <joro@8bytes.org>, <iommu@lists.linux-foundation.org>
Cc: <vw@iommu.org>, <mcuos.com@gmail.com>,
<linux-kernel@vger.kernel.org>,
"Wan Zongshun" <Vincent.Wan@amd.com>
Subject: [PATCH v2] iommu/amd: Add proper error check in two functions
Date: Thu, 16 Jun 2016 07:57:04 -0400 [thread overview]
Message-ID: <1466078224-3155-1-git-send-email-vincent.wan@amd.com> (raw)
From: Wan Zongshun <Vincent.Wan@amd.com>
This patch is to do the following:
1. Add error check for caller of iommu_device_create.
2. Add error check for caller of iommu_device_link and
move 'iommu = amd_iommu_rlookup_table[dev_data->devid]' out of
iommuv2 capability condition that make iommu_device_link also
use the 'iommu' to make code more clear and no more than 80
characters.
Signed-off-by: Wan Zongshun <Vincent.Wan@amd.com>
---
Changes from v1:
Don't fail the iommu_init_device() function when the iommu_device_link returned
an error,just print a warning message.
---
drivers/iommu/amd_iommu.c | 11 +++++------
drivers/iommu/amd_iommu_init.c | 2 ++
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 634f636..dbdcaeb 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -476,6 +476,7 @@ out:
static int iommu_init_device(struct device *dev)
{
struct iommu_dev_data *dev_data;
+ struct amd_iommu *iommu;
int devid;
if (dev->archdata.iommu)
@@ -491,17 +492,15 @@ static int iommu_init_device(struct device *dev)
dev_data->alias = get_alias(dev);
- if (dev_is_pci(dev) && pci_iommuv2_capable(to_pci_dev(dev))) {
- struct amd_iommu *iommu;
+ iommu = amd_iommu_rlookup_table[dev_data->devid];
- iommu = amd_iommu_rlookup_table[dev_data->devid];
+ if (dev_is_pci(dev) && pci_iommuv2_capable(to_pci_dev(dev)))
dev_data->iommu_v2 = iommu->is_iommu_v2;
- }
dev->archdata.iommu = dev_data;
- iommu_device_link(amd_iommu_rlookup_table[dev_data->devid]->iommu_dev,
- dev);
+ if (iommu_device_link(iommu->iommu_dev, dev))
+ dev_warn(dev, "Creating iommu device link failed in sysfs.\n");
return 0;
}
diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
index 9e00341..73fa986 100644
--- a/drivers/iommu/amd_iommu_init.c
+++ b/drivers/iommu/amd_iommu_init.c
@@ -1526,6 +1526,8 @@ static int iommu_init_pci(struct amd_iommu *iommu)
iommu->iommu_dev = iommu_device_create(&iommu->dev->dev, iommu,
amd_iommu_groups, "ivhd%d",
iommu->index);
+ if (IS_ERR(iommu->iommu_dev))
+ return PTR_ERR(iommu->iommu_dev);
return pci_enable_device(iommu->dev);
}
--
1.9.1
reply other threads:[~2016-06-16 4:35 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1466078224-3155-1-git-send-email-vincent.wan@amd.com \
--to=vincent.wan@amd.com \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mcuos.com@gmail.com \
--cc=vw@iommu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).