4 files changed, 61 insertions, 0 deletions

diff --git a/Documentation/ABI/testing/sysfs-class-iommu-amd-iommu b/Documentation/ABI/testing/sysfs-class-iommu-amd-iommu
new file mode 100644
index 000000000000..d6ba8e8a4a97
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-class-iommu-amd-iommu
@@ -0,0 +1,14 @@
+What:           /sys/class/iommu/<iommu>/amd-iommu/cap
+Date:           June 2014
+KernelVersion:  3.17
+Contact:        Alex Williamson <alex.williamson@redhat.com>
+Description:
+                IOMMU capability header as documented in the AMD IOMMU
+                specification.  Format: %x
+
+What:           /sys/class/iommu/<iommu>/amd-iommu/features
+Date:           June 2014
+KernelVersion:  3.17
+Contact:        Alex Williamson <alex.williamson@redhat.com>
+Description:
+                Extended features of the IOMMU.  Format: %llx
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 2e03c17c2499..c8f87a6c9b90 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -379,6 +379,9 @@ static int iommu_init_device(struct device *dev)
 
         dev->archdata.iommu = dev_data;
 
+        iommu_device_link(amd_iommu_rlookup_table[dev_data->devid]->iommu_dev,
+                          dev);
+
         return 0;
 }
 
@@ -403,6 +406,9 @@ static void iommu_uninit_device(struct device *dev)
         if (!dev_data)
                 return;
 
+        iommu_device_unlink(amd_iommu_rlookup_table[dev_data->devid]->iommu_dev,
+                            dev);
+
         iommu_group_remove_device(dev);
 
         /* Unlink from alias, it may change if another device is re-plugged */
diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
index 0e08545d7298..3783e0b44df6 100644
--- a/drivers/iommu/amd_iommu_init.c
+++ b/drivers/iommu/amd_iommu_init.c
@@ -26,6 +26,7 @@
 #include <linux/msi.h>
 #include <linux/amd-iommu.h>
 #include <linux/export.h>
+#include <linux/iommu.h>
 #include <asm/pci-direct.h>
 #include <asm/iommu.h>
 #include <asm/gart.h>
@@ -1197,6 +1198,39 @@ static void init_iommu_perf_ctr(struct amd_iommu *iommu)
         iommu->max_counters = (u8) ((val >> 7) & 0xf);
 }
 
+static ssize_t amd_iommu_show_cap(struct device *dev,
+                                  struct device_attribute *attr,
+                                  char *buf)
+{
+        struct amd_iommu *iommu = dev_get_drvdata(dev);
+        return sprintf(buf, "%x\n", iommu->cap);
+}
+static DEVICE_ATTR(cap, S_IRUGO, amd_iommu_show_cap, NULL);
+
+static ssize_t amd_iommu_show_features(struct device *dev,
+                                       struct device_attribute *attr,
+                                       char *buf)
+{
+        struct amd_iommu *iommu = dev_get_drvdata(dev);
+        return sprintf(buf, "%llx\n", iommu->features);
+}
+static DEVICE_ATTR(features, S_IRUGO, amd_iommu_show_features, NULL);
+
+static struct attribute *amd_iommu_attrs[] = {
+        &dev_attr_cap.attr,
+        &dev_attr_features.attr,
+        NULL,
+};
+
+static struct attribute_group amd_iommu_group = {
+        .name = "amd-iommu",
+        .attrs = amd_iommu_attrs,
+};
+
+static const struct attribute_group *amd_iommu_groups[] = {
+        &amd_iommu_group,
+        NULL,
+};
 
 static int iommu_init_pci(struct amd_iommu *iommu)
 {
@@ -1297,6 +1331,10 @@ static int iommu_init_pci(struct amd_iommu *iommu)
 
         amd_iommu_erratum_746_workaround(iommu);
 
+        iommu->iommu_dev = iommu_device_create(&iommu->dev->dev, iommu,
+                                               amd_iommu_groups, "ivhd%d",
+                                               iommu->index);
+
         return pci_enable_device(iommu->dev);
 }
 
diff --git a/drivers/iommu/amd_iommu_types.h b/drivers/iommu/amd_iommu_types.h
index 7277a200d916..557a20e533f0 100644
--- a/drivers/iommu/amd_iommu_types.h
+++ b/drivers/iommu/amd_iommu_types.h
@@ -577,6 +577,9 @@ struct amd_iommu {
         /* default dma_ops domain for that IOMMU */
         struct dma_ops_domain *default_dom;
 
+        /* IOMMU sysfs device */
+        struct device *iommu_dev;
+
         /*
          * We can't rely on the BIOS to restore all values on reinit, so we
          * need to stash them