genirq/MSI: Move msi_list from struct pci_dev to struct device

Move msi_list from struct pci_dev into struct device, so we can
support non-PCI-device based generic MSI interrupts.

msi_list is now conditional under CONFIG_GENERIC_MSI_IRQ, which is
selected from CONFIG_PCI_MSI, so no functional change for PCI MSI
users.

Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Reviewed-by: Yijing Wang <wangyijing@huawei.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: Grant Likely <grant.likely@linaro.org>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Stuart Yoder <stuart.yoder@freescale.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Joe Perches <joe@perches.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Luis R. Rodriguez <mcgrof@suse.com>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Joerg Roedel <jroedel@suse.de>
Cc: Alexander Gordeev <agordeev@redhat.com>
Link: http://lkml.kernel.org/r/1436428847-8886-10-git-send-email-jiang.liu@linux.intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/drivers/base/core.c b/drivers/base/core.c
index dafae6d2f7ace1fd2941fcbc26ca50fa6450b0f9..18e2a89aa138945cf1154cfa1c1c2c71546a89b0 100644 (file)
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -662,6 +662,9 @@ void device_initialize(struct device *dev)
        INIT_LIST_HEAD(&dev->devres_head);
        device_pm_init(dev);
        set_dev_node(dev, -1);
+#ifdef CONFIG_GENERIC_MSI_IRQ
+       INIT_LIST_HEAD(&dev->msi_list);
+#endif
 }
 EXPORT_SYMBOL_GPL(device_initialize);
 

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index f0714c3fd31597e94436f53718ebdb1913ec5c41..4ef5021a084d1984c3827bf5186438eb2573fcef 100644 (file)
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -900,7 +900,7 @@ void pci_msi_shutdown(struct pci_dev *dev)
                return;
 
        BUG_ON(list_empty(dev_to_msi_list(&dev->dev)));
-       desc = first_msi_entry(dev);
+       desc = first_pci_msi_entry(dev);
 
        pci_msi_set_enable(dev, 0);
        pci_intx_for_msi(dev, 1);
@@ -1044,7 +1044,6 @@ EXPORT_SYMBOL(pci_msi_enabled);
 
 void pci_msi_init_pci_dev(struct pci_dev *dev)
 {
-       INIT_LIST_HEAD(&dev->msi_list);
 }
 
 /**

diff --git a/include/linux/device.h b/include/linux/device.h
index 5a31bf3a40243e1faff078fdc509361568143f01..22227e7fe4634948d15fbb1ee175cd58a644af65 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -713,6 +713,7 @@ struct device_dma_parameters {
  *             along with subsystem-level and driver-level callbacks.
  * @pins:      For device pin management.
  *             See Documentation/pinctrl.txt for details.
+ * @msi_list:  Hosts MSI descriptors
  * @numa_node: NUMA node this device is close to.
  * @dma_mask:  Dma mask (if dma'ble device).
  * @coherent_dma_mask: Like dma_mask, but for alloc_coherent mapping as not all
@@ -776,6 +777,9 @@ struct device {
 #ifdef CONFIG_PINCTRL
        struct dev_pin_info     *pins;
 #endif
+#ifdef CONFIG_GENERIC_MSI_IRQ
+       struct list_head        msi_list;
+#endif
 
 #ifdef CONFIG_NUMA
        int             numa_node;      /* NUMA node this device is close to */

diff --git a/include/linux/msi.h b/include/linux/msi.h
index cfbd2afeaf64da4c6925e00bf00d7c4f931e366b..57fe766a14bf5fd5c8aa31a7cf87c818fcbd4bc5 100644 (file)
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@ -45,7 +45,7 @@ struct msi_desc {
 
 /* Helpers to hide struct msi_desc implementation details */
 #define msi_desc_to_dev(desc)          (&(desc)->dev.dev)
-#define dev_to_msi_list(dev)           (&to_pci_dev((dev))->msi_list)
+#define dev_to_msi_list(dev)           (&(dev)->msi_list)
 #define first_msi_entry(dev)           \
        list_first_entry(dev_to_msi_list((dev)), struct msi_desc, list)
 #define for_each_msi_entry(desc, dev)  \

diff --git a/include/linux/pci.h b/include/linux/pci.h
index 8a0321a8fb595892c5e80910d5c914c89ded63de..fbf245f5eba78535ab4151ee131065dbbfe3c845 100644 (file)
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -366,7 +366,6 @@ struct pci_dev {
        struct bin_attribute *res_attr[DEVICE_COUNT_RESOURCE]; /* sysfs file for resources */
        struct bin_attribute *res_attr_wc[DEVICE_COUNT_RESOURCE]; /* sysfs file for WC mapping of resources */
 #ifdef CONFIG_PCI_MSI
-       struct list_head msi_list;
        const struct attribute_group **msi_irq_groups;
 #endif
        struct pci_vpd *vpd;