From: Joerg Roedel <joro@8bytes.org>
To: Sebastian Ott <sebott@linux.vnet.ibm.com>,
Gerald Schaefer <gerald.schaefer@de.ibm.com>
Cc: iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org,
Joerg Roedel <jroedel@suse.de>
Subject: [PATCH 2/2] iommu/s390: Add support for iommu_device handling
Date: Thu, 27 Apr 2017 17:28:25 +0200 [thread overview]
Message-ID: <1493306905-32334-3-git-send-email-joro@8bytes.org> (raw)
In-Reply-To: <1493306905-32334-1-git-send-email-joro@8bytes.org>
From: Joerg Roedel <jroedel@suse.de>
Add support for the iommu_device_register interface to make
the s390 hardware iommus visible to the iommu core and in
sysfs.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
arch/s390/include/asm/pci.h | 1 +
drivers/iommu/s390-iommu.c | 30 ++++++++++++++++++++++++++++++
2 files changed, 31 insertions(+)
diff --git a/arch/s390/include/asm/pci.h b/arch/s390/include/asm/pci.h
index 045665d..8c071af 100644
--- a/arch/s390/include/asm/pci.h
+++ b/arch/s390/include/asm/pci.h
@@ -124,6 +124,7 @@ struct zpci_dev {
unsigned long iommu_pages;
unsigned int next_bit;
+ struct iommu_device iommu_dev; /* IOMMU core handle */
struct iommu_group *group; /* IOMMU group for all devices behind this zdev */
char res_name[16];
diff --git a/drivers/iommu/s390-iommu.c b/drivers/iommu/s390-iommu.c
index cad3ad0..ec7f5e4 100644
--- a/drivers/iommu/s390-iommu.c
+++ b/drivers/iommu/s390-iommu.c
@@ -18,6 +18,8 @@
*/
#define S390_IOMMU_PGSIZES (~0xFFFUL)
+static struct iommu_ops s390_iommu_ops;
+
struct s390_domain {
struct iommu_domain domain;
struct list_head devices;
@@ -173,10 +175,13 @@ static struct iommu_group *s390_iommu_device_group(struct device *dev)
static int s390_iommu_add_device(struct device *dev)
{
struct iommu_group *group = iommu_group_get_for_dev(dev);
+ struct zpci_dev *zdev = to_pci_dev(dev)->sysdata;
+
if (IS_ERR(group))
return PTR_ERR(group);
iommu_group_put(group);
+ iommu_device_link(&zdev->iommu_dev, dev);
return 0;
}
@@ -203,6 +208,7 @@ static void s390_iommu_remove_device(struct device *dev)
s390_iommu_detach_device(domain, dev);
}
+ iommu_device_unlink(&zdev->iommu_dev, dev);
iommu_group_remove_device(dev);
}
@@ -342,13 +348,37 @@ int zpci_init_iommu(struct zpci_dev *zdev)
if (IS_ERR(zdev->group)) {
rc = PTR_ERR(zdev->group);
zdev->group = NULL;
+ goto out_err;
}
+ rc = iommu_device_sysfs_add(&zdev->iommu_dev, NULL, NULL,
+ "s390-iommu.%08x", zdev->fid);
+ if (rc)
+ goto out_group;
+
+ iommu_device_set_ops(&zdev->iommu_dev, &s390_iommu_ops);
+
+ rc = iommu_device_register(&zdev->iommu_dev);
+ if (rc)
+ goto out_sysfs;
+
+ return 0;
+
+out_sysfs:
+ iommu_device_sysfs_remove(&zdev->iommu_dev);
+
+out_group:
+ iommu_group_put(zdev->group);
+ zdev->group = NULL;
+
+out_err:
return rc;
}
void zpci_destroy_iommu(struct zpci_dev *zdev)
{
+ iommu_device_unregister(&zdev->iommu_dev);
+ iommu_device_sysfs_remove(&zdev->iommu_dev);
iommu_group_put(zdev->group);
zdev->group = NULL;
}
--
1.9.1
next prev parent reply other threads:[~2017-04-27 15:28 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-27 15:28 [RFC PATCH 0/2] iommu/s390: Fix iommu-groups and add sysfs support Joerg Roedel
2017-04-27 15:28 ` [PATCH 1/2] iommu/s390: Fix IOMMU groups Joerg Roedel
2017-04-27 18:11 ` Gerald Schaefer
2017-04-27 21:12 ` Joerg Roedel
2017-04-28 13:20 ` Gerald Schaefer
2017-04-28 14:40 ` Joerg Roedel
2017-04-28 17:50 ` kbuild test robot
2017-04-27 15:28 ` Joerg Roedel [this message]
2017-04-28 23:02 ` [PATCH 2/2] iommu/s390: Add support for iommu_device handling kbuild test robot
2017-04-27 18:10 ` [RFC PATCH 0/2] iommu/s390: Fix iommu-groups and add sysfs support Gerald Schaefer
2017-04-27 21:03 ` Joerg Roedel
2017-04-28 12:46 ` Gerald Schaefer
2017-04-28 14:55 ` Joerg Roedel
2017-04-28 15:25 ` Sebastian Ott
2017-04-28 22:29 ` Joerg Roedel
2017-04-28 18:06 ` Gerald Schaefer
2017-04-28 22:40 ` Joerg Roedel
2017-06-15 13:11 [PATCH 0/2 v2] iommu/s390: Improve " Joerg Roedel
2017-06-15 13:11 ` [PATCH 2/2] iommu/s390: Add support for iommu_device handling Joerg Roedel
2017-06-19 15:02 ` Gerald Schaefer
2017-06-27 15:28 ` Joerg Roedel
2017-06-29 13:27 ` Gerald Schaefer
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=1493306905-32334-3-git-send-email-joro@8bytes.org \
--to=joro@8bytes.org \
--cc=gerald.schaefer@de.ibm.com \
--cc=iommu@lists.linux-foundation.org \
--cc=jroedel@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=sebott@linux.vnet.ibm.com \
/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).