pci: move ATS code to common directory

PCI ATS code is common for all architecture, move code to common
directory to be usable for other architectures.

No functional change intended.

Signed-off-by: Rahul Singh <rahul.singh@arm.com>

diff --git a/xen/drivers/passthrough/Makefile b/xen/drivers/passthrough/Makefile
index cc646612c7fecaf19031043b235a8d57ee2a7335..445690e3e547b8f4cd5f2c23ecd2bfeba7cae081 100644 (file)
--- a/xen/drivers/passthrough/Makefile
+++ b/xen/drivers/passthrough/Makefile
@@ -6,3 +6,4 @@ obj-$(CONFIG_ARM) += arm/
 obj-y += iommu.o
 obj-$(CONFIG_HAS_PCI) += pci.o
 obj-$(CONFIG_HAS_DEVICE_TREE) += device_tree.o
+obj-$(CONFIG_HAS_PCI) += ats.o

diff --git a/xen/drivers/passthrough/ats.c b/xen/drivers/passthrough/ats.c
new file mode 100644 (file)
index 0000000..7f7b16d
--- /dev/null
+++ b/xen/drivers/passthrough/ats.c
@@ -0,0 +1,86 @@
+/*
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <xen/param.h>
+#include <xen/sched.h>
+#include <xen/pci.h>
+#include <xen/pci_regs.h>
+#include "ats.h"
+
+bool_t __read_mostly ats_enabled = 0;
+boolean_param("ats", ats_enabled);
+
+int enable_ats_device(struct pci_dev *pdev, struct list_head *ats_list)
+{
+    u32 value;
+    u16 seg = pdev->seg;
+    u8 bus = pdev->bus, devfn = pdev->devfn;
+    int pos;
+
+    pos = pci_find_ext_capability(seg, bus, devfn, PCI_EXT_CAP_ID_ATS);
+    BUG_ON(!pos);
+
+    if ( iommu_verbose )
+        dprintk(XENLOG_INFO, "%pp: ATS capability found\n", &pdev->sbdf);
+
+    value = pci_conf_read16(pdev->sbdf, pos + ATS_REG_CTL);
+    if ( value & ATS_ENABLE )
+    {
+        struct pci_dev *other;
+
+        list_for_each_entry ( other, ats_list, ats.list )
+            if ( other == pdev )
+            {
+                pos = 0;
+                break;
+            }
+    }
+
+    if ( !(value & ATS_ENABLE) )
+    {
+        value |= ATS_ENABLE;
+        pci_conf_write16(pdev->sbdf, pos + ATS_REG_CTL, value);
+    }
+
+    if ( pos )
+    {
+        pdev->ats.cap_pos = pos;
+        value = pci_conf_read16(pdev->sbdf, pos + ATS_REG_CAP);
+        pdev->ats.queue_depth = value & ATS_QUEUE_DEPTH_MASK ?:
+                                ATS_QUEUE_DEPTH_MASK + 1;
+        list_add(&pdev->ats.list, ats_list);
+    }
+
+    if ( iommu_verbose )
+        dprintk(XENLOG_INFO, "%pp: ATS %s enabled\n",
+                &pdev->sbdf, pos ? "is" : "was");
+
+    return pos;
+}
+
+void disable_ats_device(struct pci_dev *pdev)
+{
+    u32 value;
+
+    BUG_ON(!pdev->ats.cap_pos);
+
+    value = pci_conf_read16(pdev->sbdf, pdev->ats.cap_pos + ATS_REG_CTL);
+    value &= ~ATS_ENABLE;
+    pci_conf_write16(pdev->sbdf, pdev->ats.cap_pos + ATS_REG_CTL, value);
+
+    list_del(&pdev->ats.list);
+
+    if ( iommu_verbose )
+        dprintk(XENLOG_INFO, "%pp: ATS is disabled\n", &pdev->sbdf);
+}

diff --git a/xen/drivers/passthrough/x86/Makefile b/xen/drivers/passthrough/x86/Makefile
index 69284a5d191f02e780689731a7c1a73ccfc879da..75b288533640f2777edf76bf9ea8c1751cae9874 100644 (file)
--- a/xen/drivers/passthrough/x86/Makefile
+++ b/xen/drivers/passthrough/x86/Makefile
@@ -1,3 +1,2 @@
-obj-y += ats.o
 obj-y += iommu.o
 obj-$(CONFIG_HVM) += hvm.o

diff --git a/xen/drivers/passthrough/x86/ats.c b/xen/drivers/passthrough/x86/ats.c
deleted file mode 100644 (file)
index 4628ffd..0000000
--- a/xen/drivers/passthrough/x86/ats.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <xen/param.h>
-#include <xen/sched.h>
-#include <xen/pci.h>
-#include <xen/pci_regs.h>
-#include "../ats.h"
-
-bool_t __read_mostly ats_enabled = 0;
-boolean_param("ats", ats_enabled);
-
-int enable_ats_device(struct pci_dev *pdev, struct list_head *ats_list)
-{
-    u32 value;
-    u16 seg = pdev->seg;
-    u8 bus = pdev->bus, devfn = pdev->devfn;
-    int pos;
-
-    pos = pci_find_ext_capability(seg, bus, devfn, PCI_EXT_CAP_ID_ATS);
-    BUG_ON(!pos);
-
-    if ( iommu_verbose )
-        dprintk(XENLOG_INFO, "%pp: ATS capability found\n", &pdev->sbdf);
-
-    value = pci_conf_read16(pdev->sbdf, pos + ATS_REG_CTL);
-    if ( value & ATS_ENABLE )
-    {
-        struct pci_dev *other;
-
-        list_for_each_entry ( other, ats_list, ats.list )
-            if ( other == pdev )
-            {
-                pos = 0;
-                break;
-            }
-    }
-
-    if ( !(value & ATS_ENABLE) )
-    {
-        value |= ATS_ENABLE;
-        pci_conf_write16(pdev->sbdf, pos + ATS_REG_CTL, value);
-    }
-
-    if ( pos )
-    {
-        pdev->ats.cap_pos = pos;
-        value = pci_conf_read16(pdev->sbdf, pos + ATS_REG_CAP);
-        pdev->ats.queue_depth = value & ATS_QUEUE_DEPTH_MASK ?:
-                                ATS_QUEUE_DEPTH_MASK + 1;
-        list_add(&pdev->ats.list, ats_list);
-    }
-
-    if ( iommu_verbose )
-        dprintk(XENLOG_INFO, "%pp: ATS %s enabled\n",
-                &pdev->sbdf, pos ? "is" : "was");
-
-    return pos;
-}
-
-void disable_ats_device(struct pci_dev *pdev)
-{
-    u32 value;
-
-    BUG_ON(!pdev->ats.cap_pos);
-
-    value = pci_conf_read16(pdev->sbdf, pdev->ats.cap_pos + ATS_REG_CTL);
-    value &= ~ATS_ENABLE;
-    pci_conf_write16(pdev->sbdf, pdev->ats.cap_pos + ATS_REG_CTL, value);
-
-    list_del(&pdev->ats.list);
-
-    if ( iommu_verbose )
-        dprintk(XENLOG_INFO, "%pp: ATS is disabled\n", &pdev->sbdf);
-}