| Message ID | 20211206210224.925241961@linutronix.de (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
| Series | genirq/msi, PCI/MSI: Spring cleaning - Part 1 | expand |
On Mon, Dec 06, 2021 at 11:27:56PM +0100, Thomas Gleixner wrote: > 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> Yes!!! Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
On Mon, Dec 06, 2021 at 11:27:56PM +0100, Thomas Gleixner wrote: > 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> Acked-by: Bjorn Helgaas <bhelgaas@google.com> > --- > V2: New patch > --- > drivers/base/core.c | 1 - > drivers/pci/msi/msi.c | 2 +- > drivers/pci/probe.c | 4 +++- > include/linux/device.h | 2 -- > include/linux/pci.h | 1 + > 5 files changed, 5 insertions(+), 5 deletions(-) > > --- a/drivers/base/core.c > +++ b/drivers/base/core.c > @@ -2875,7 +2875,6 @@ void device_initialize(struct device *de > 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); > --- 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) > --- a/drivers/pci/probe.c > +++ b/drivers/pci/probe.c > @@ -2311,7 +2311,9 @@ struct pci_dev *pci_alloc_dev(struct pci > 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); > --- 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 > --- 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; >
On Mon, Dec 06, 2021 at 11:27:56PM +0100, Thomas Gleixner wrote: > 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> > --- > V2: New patch > --- > drivers/base/core.c | 1 - > drivers/pci/msi/msi.c | 2 +- > drivers/pci/probe.c | 4 +++- > include/linux/device.h | 2 -- > include/linux/pci.h | 1 + > 5 files changed, 5 insertions(+), 5 deletions(-) Reviewed-by: Jason Gunthorpe <jgg@nvidia.com> > --- a/drivers/base/core.c > +++ b/drivers/base/core.c > @@ -2875,7 +2875,6 @@ void device_initialize(struct device *de > 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); > --- 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) It looks like most of the time this is called by an irq_chip, except for a few special cases list pci_msi_shutdown() Is this something that should ideally go away someday and use some lock in the irq_chip - not unlike what we've thought is needed for IMS? Jason
On Wed, Dec 08 2021 at 11:29, Jason Gunthorpe wrote: > On Mon, Dec 06, 2021 at 11:27:56PM +0100, Thomas Gleixner wrote: >> if (!desc->pci.msi_attrib.can_mask) > > It looks like most of the time this is called by an irq_chip, except > for a few special cases list pci_msi_shutdown() > > Is this something that should ideally go away someday and use some > lock in the irq_chip - not unlike what we've thought is needed for > IMS? Some day we'll have that yes.
--- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -2875,7 +2875,6 @@ void device_initialize(struct device *de 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); --- 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) --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -2311,7 +2311,9 @@ struct pci_dev *pci_alloc_dev(struct pci 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); --- 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 --- 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;
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> --- V2: New patch --- drivers/base/core.c | 1 - drivers/pci/msi/msi.c | 2 +- drivers/pci/probe.c | 4 +++- include/linux/device.h | 2 -- include/linux/pci.h | 1 + 5 files changed, 5 insertions(+), 5 deletions(-)