PCI/MSI: Move msi_lock to struct pci_dev

It's only required for PCI/MSI. So no point in having it in every struct
device.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Link: https://lore.kernel.org/r/20211206210224.925241961@linutronix.de

diff --git a/drivers/base/core.c b/drivers/base/core.c
index fd034d7..f26c668 100644 (file)
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -2875,7 +2875,6 @@ void device_initialize(struct device *dev)
        device_pm_init(dev);
        set_dev_node(dev, NUMA_NO_NODE);
 #ifdef CONFIG_GENERIC_MSI_IRQ
-       raw_spin_lock_init(&dev->msi_lock);
        INIT_LIST_HEAD(&dev->msi_list);
 #endif
        INIT_LIST_HEAD(&dev->links.consumers);

diff --git a/drivers/pci/msi/msi.c b/drivers/pci/msi/msi.c
index 465fe9e..443a16c 100644 (file)
--- a/drivers/pci/msi/msi.c
+++ b/drivers/pci/msi/msi.c
@@ -18,7 +18,7 @@ int pci_msi_ignore_mask;
 
 static noinline void pci_msi_update_mask(struct msi_desc *desc, u32 clear, u32 set)
 {
-       raw_spinlock_t *lock = &desc->dev->msi_lock;
+       raw_spinlock_t *lock = &to_pci_dev(desc->dev)->msi_lock;
        unsigned long flags;
 
        if (!desc->pci.msi_attrib.can_mask)

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 087d365..443efb0 100644 (file)
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -2311,7 +2311,9 @@ struct pci_dev *pci_alloc_dev(struct pci_bus *bus)
        INIT_LIST_HEAD(&dev->bus_list);
        dev->dev.type = &pci_dev_type;
        dev->bus = pci_bus_get(bus);
-
+#ifdef CONFIG_PCI_MSI
+       raw_spin_lock_init(&dev->msi_lock);
+#endif
        return dev;
 }
 EXPORT_SYMBOL(pci_alloc_dev);

diff --git a/include/linux/device.h b/include/linux/device.h
index e270cb7..2a22875 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -407,7 +407,6 @@ struct dev_links_info {
  * @em_pd:     device's energy model performance domain
  * @pins:      For device pin management.
  *             See Documentation/driver-api/pin-control.rst for details.
- * @msi_lock:  Lock to protect MSI mask cache and mask register
  * @msi_list:  Hosts MSI descriptors
  * @msi_domain: The generic MSI domain this device is using.
  * @numa_node: NUMA node this device is close to.
@@ -508,7 +507,6 @@ struct device {
        struct dev_pin_info     *pins;
 #endif
 #ifdef CONFIG_GENERIC_MSI_IRQ
-       raw_spinlock_t          msi_lock;
        struct list_head        msi_list;
 #endif
 #ifdef CONFIG_DMA_OPS

diff --git a/include/linux/pci.h b/include/linux/pci.h
index 8cb1036..5cc46ba 100644 (file)
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -474,6 +474,7 @@ struct pci_dev {
 #endif
 #ifdef CONFIG_PCI_MSI
        void __iomem    *msix_base;
+       raw_spinlock_t  msi_lock;
        const struct attribute_group **msi_irq_groups;
 #endif
        struct pci_vpd  vpd;