Commit cd119b09 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

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: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Link: https://lore.kernel.org/r/20211206210224.925241961@linutronix.de
parent 85aa607e

drivers/base/core.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

drivers/pci/msi/msi.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

drivers/pci/probe.c

+3 −1
Original line number Diff line number Diff line
@@ -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);

include/linux/device.h

+0 −2
Original line number Diff line number Diff line
@@ -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

include/linux/pci.h

+1 −0
Original line number Diff line number Diff line
@@ -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;