intel_th: Add pci glue layer for Intel(R) Trace Hub

This patch adds basic support for PCI-based Intel TH devices. It requests
2 bars (configuration registers for the subdevices and STH channel MMIO
region) and calls into Intel TH core code to create the bus with subdevices
etc.

Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/hwtracing/intel_th/Kconfig b/drivers/hwtracing/intel_th/Kconfig
index 0cb01ee9090ec0ebd6c4d1adbb43d7c5710949e8..6601613614fb196972a0fa236658cdbcf377881a 100644 (file)
--- a/drivers/hwtracing/intel_th/Kconfig
+++ b/drivers/hwtracing/intel_th/Kconfig
@@ -15,6 +15,15 @@ config INTEL_TH
 
 if INTEL_TH
 
+config INTEL_TH_PCI
+       tristate "Intel(R) Trace Hub PCI controller"
+       depends on PCI
+       help
+         Intel(R) Trace Hub may exist as a PCI device. This option enables
+         support glue layer for PCI-based Intel TH.
+
+         Say Y here to enable PCI Intel TH support.
+
 config INTEL_TH_DEBUG
        bool "Intel(R) Trace Hub debugging"
        depends on DEBUG_FS

diff --git a/drivers/hwtracing/intel_th/Makefile b/drivers/hwtracing/intel_th/Makefile
index dfd7906462da48b7a525fb39b2a385214794c89c..5c13ed4121ad13d113c8142ab342cd159a8fa1e7 100644 (file)
--- a/drivers/hwtracing/intel_th/Makefile
+++ b/drivers/hwtracing/intel_th/Makefile
@@ -1,3 +1,6 @@
 obj-$(CONFIG_INTEL_TH)         += intel_th.o
 intel_th-y                     := core.o
 intel_th-$(CONFIG_INTEL_TH_DEBUG) += debug.o
+
+obj-$(CONFIG_INTEL_TH_PCI)     += intel_th_pci.o
+intel_th_pci-y                 := pci.o

diff --git a/drivers/hwtracing/intel_th/pci.c b/drivers/hwtracing/intel_th/pci.c
new file mode 100644 (file)
index 0000000..641e879
--- /dev/null
+++ b/drivers/hwtracing/intel_th/pci.c
@@ -0,0 +1,86 @@
+/*
+ * Intel(R) Trace Hub pci driver
+ *
+ * Copyright (C) 2014-2015 Intel Corporation.
+ *
+ * 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.
+ */
+
+#define pr_fmt(fmt)    KBUILD_MODNAME ": " fmt
+
+#include <linux/types.h>
+#include <linux/module.h>
+#include <linux/device.h>
+#include <linux/sysfs.h>
+#include <linux/pci.h>
+
+#include "intel_th.h"
+
+#define DRIVER_NAME "intel_th_pci"
+
+#define BAR_MASK (BIT(TH_MMIO_CONFIG) | BIT(TH_MMIO_SW))
+
+static int intel_th_pci_probe(struct pci_dev *pdev,
+                             const struct pci_device_id *id)
+{
+       struct intel_th *th;
+       int err;
+
+       err = pcim_enable_device(pdev);
+       if (err)
+               return err;
+
+       err = pcim_iomap_regions_request_all(pdev, BAR_MASK, DRIVER_NAME);
+       if (err)
+               return err;
+
+       th = intel_th_alloc(&pdev->dev, pdev->resource,
+                           DEVICE_COUNT_RESOURCE, pdev->irq);
+       if (IS_ERR(th))
+               return PTR_ERR(th);
+
+       pci_set_drvdata(pdev, th);
+
+       return 0;
+}
+
+static void intel_th_pci_remove(struct pci_dev *pdev)
+{
+       struct intel_th *th = pci_get_drvdata(pdev);
+
+       intel_th_free(th);
+}
+
+static const struct pci_device_id intel_th_pci_id_table[] = {
+       {
+               PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x9d26),
+               .driver_data = (kernel_ulong_t)0,
+       },
+       {
+               PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xa126),
+               .driver_data = (kernel_ulong_t)0,
+       },
+       { 0 },
+};
+
+MODULE_DEVICE_TABLE(pci, intel_th_pci_id_table);
+
+static struct pci_driver intel_th_pci_driver = {
+       .name           = DRIVER_NAME,
+       .id_table       = intel_th_pci_id_table,
+       .probe          = intel_th_pci_probe,
+       .remove         = intel_th_pci_remove,
+};
+
+module_pci_driver(intel_th_pci_driver);
+
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("Intel(R) Trace Hub PCI controller driver");
+MODULE_AUTHOR("Alexander Shishkin <alexander.shishkin@intel.com>");