two small PCI MSI cleanups V2
Now with even more dead code removal thanks to the review from Thomas!
PATCH 1/2 PCI/msi: remove unused default PCI IRQ domain code
pci_msi_create_default_irq_domain is never called in the whole tree, so remove it as well as all the supporting code for a default PCI MSI domain.
--- drivers/pci/msi.c | 50 ++------------------------------------------------ include/linux/msi.h | 3 --- 2 files changed, 2 insertions(+), 51 deletions(-)
drivers/pci/msi.c +2 -48
@@ -32,30 +32,11 @@ int pci_msi_ignore_mask;#define msix_table_size (flags) ((flags & PCI_MSIX_FLAGS_QSIZE) + 1)#ifdef CONFIG_PCI_MSI_IRQ_DOMAIN -static struct irq_domain *pci_msi_default_domain; -static DEFINE_MUTEX (pci_msi_domain_lock); - -struct irq_domain *__weak arch_get_pci_msi_domain (struct pci_dev *dev) -{ -return pci_msi_default_domain; -} - -static struct irq_domain *pci_msi_get_domain (struct pci_dev *dev) -{ -struct irq_domain *domain; - - domain =dev_get_msi_domain (&dev->dev); -if (domain) -return domain; - -return arch_get_pci_msi_domain (dev); -} -static int pci_msi_setup_msi_irqs (struct pci_dev *dev,int nvec,int type) {struct irq_domain *domain; - domain =pci_msi_get_domain (dev); + domain =dev_get_msi_domain (&dev->dev);if (domain &&irq_domain_is_hierarchy (domain))return pci_msi_domain_alloc_irqs (domain, dev, nvec, type);
@@ -66,7 +47,7 @@ static void pci_msi_teardown_msi_irqs(struct pci_dev *dev) {struct irq_domain *domain; - domain =pci_msi_get_domain (dev); + domain =dev_get_msi_domain (&dev->dev);if (domain &&irq_domain_is_hierarchy (domain))pci_msi_domain_free_irqs (domain, dev);else
@@ -1507,33 +1488,6 @@ void pci_msi_domain_free_irqs(struct irq_domain *domain, struct pci_dev *dev)msi_domain_free_irqs (domain, &dev->dev); } -/** -* pci_msi_create_default_irq_domain - Create a default MSI interrupt domain -* @fwnode: Optional fwnode of the interrupt controller -* @info: MSI domain info -* @parent: Parent irq domain -* -* Returns: A domain pointer or NULL in case of failure. If successful -* the default PCI/MSI irqdomain pointer is updated. -*/ -struct irq_domain *pci_msi_create_default_irq_domain (struct fwnode_handle *fwnode, -struct msi_domain_info *info,struct irq_domain *parent) -{ -struct irq_domain *domain; - -mutex_lock (&pci_msi_domain_lock); -if (pci_msi_default_domain) { -pr_err ("PCI: default irq domain for PCI MSI has already been created.\n" ); - domain =NULL ; - }else { - domain =pci_msi_create_irq_domain (fwnode, info, parent); - pci_msi_default_domain = domain; - } -mutex_unlock (&pci_msi_domain_lock); - -return domain; -} -static int get_msi_id_cb (struct pci_dev *pdev,u16 alias,void *data) {u32 *pa = data;
include/linux/msi.h +0 -3
@@ -319,9 +319,6 @@ struct irq_domain *pci_msi_create_irq_domain(struct fwnode_handle *fwnode,int pci_msi_domain_alloc_irqs (struct irq_domain *domain,struct pci_dev *dev,int nvec,int type);void pci_msi_domain_free_irqs (struct irq_domain *domain,struct pci_dev *dev); -struct irq_domain *pci_msi_create_default_irq_domain (struct fwnode_handle *fwnode, -struct msi_domain_info *info,struct irq_domain *parent); -irq_hw_number_t pci_msi_domain_calc_hwirq (struct pci_dev *dev,struct msi_desc *desc); int pci_msi_domain_check_cap(struct irq_domain *domain,
Signature · 1 line
2.11.0
Re: [PATCH 1/2] PCI/msi: remove unused default PCI IRQ domain code
Quoted 4 lines · Christoph Hellwig
pci_msi_create_default_irq_domainis never called in the whole tree, so remove it as well as all the supporting code for a default PCI MSI domain.Signed-off-by Christoph Hellwig <[email protected]>
PATCH 2/2 PCI/msi: remove pci_msi_domain_{alloc,free}_irqs
In reply to Christoph HellwigJust call the msi_* version directly instead of having trivial wrappers for one or two callsites.
--- arch/x86/kernel/apic/msi.c | 2 +- drivers/pci/msi.c | 30 ++---------------------------- include/linux/msi.h | 3 --- 3 files changed, 3 insertions(+), 32 deletions(-)
arch/x86/kernel/apic/msi.c +1 -1
@@ -82,7 +82,7 @@ int native_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)if (domain ==NULL )return -ENOSYS ; -return pci_msi_domain_alloc_irqs (domain, dev, nvec, type); +return msi_domain_alloc_irqs (domain, &dev->dev, nvec); }void native_teardown_msi_irq (unsigned int irq)
drivers/pci/msi.c +2 -28
@@ -38,7 +38,7 @@ static int pci_msi_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) domain =dev_get_msi_domain (&dev->dev);if (domain &&irq_domain_is_hierarchy (domain)) -return pci_msi_domain_alloc_irqs (domain, dev, nvec, type); +return msi_domain_alloc_irqs (domain, &dev->dev, nvec);return arch_setup_msi_irqs (dev, nvec, type); }
@@ -49,7 +49,7 @@ static void pci_msi_teardown_msi_irqs(struct pci_dev *dev) domain =dev_get_msi_domain (&dev->dev);if (domain &&irq_domain_is_hierarchy (domain)) -pci_msi_domain_free_irqs (domain, dev); +msi_domain_free_irqs (domain, &dev->dev);else arch_teardown_msi_irqs (dev); }
@@ -1462,32 +1462,6 @@ struct irq_domain *pci_msi_create_irq_domain(struct fwnode_handle *fwnode, }EXPORT_SYMBOL_GPL (pci_msi_create_irq_domain); -/** -* pci_msi_domain_alloc_irqs - Allocate interrupts for @dev in @domain -* @domain: The interrupt domain to allocate from -* @dev: The device for which to allocate -* @nvec: The number of interrupts to allocate -* @type: Unused to allow simpler migration from the arch_XXX interfaces -* -* Returns: -* A virtual interrupt number or an error code in case of failure -*/ -int pci_msi_domain_alloc_irqs (struct irq_domain *domain,struct pci_dev *dev, -int nvec,int type) -{ -return msi_domain_alloc_irqs (domain, &dev->dev, nvec); -} - -/** -* pci_msi_domain_free_irqs - Free interrupts for @dev in @domain -* @domain: The interrupt domain -* @dev: The device for which to free interrupts -*/ -void pci_msi_domain_free_irqs (struct irq_domain *domain,struct pci_dev *dev) -{ -msi_domain_free_irqs (domain, &dev->dev); -} -static int get_msi_id_cb (struct pci_dev *pdev,u16 alias,void *data) {u32 *pa = data;
include/linux/msi.h +0 -3
@@ -316,9 +316,6 @@ void pci_msi_domain_write_msg(struct irq_data *irq_data, struct msi_msg *msg);struct irq_domain *pci_msi_create_irq_domain (struct fwnode_handle *fwnode,struct msi_domain_info *info,struct irq_domain *parent); -int pci_msi_domain_alloc_irqs (struct irq_domain *domain,struct pci_dev *dev, -int nvec,int type); -void pci_msi_domain_free_irqs (struct irq_domain *domain,struct pci_dev *dev);irq_hw_number_t pci_msi_domain_calc_hwirq (struct pci_dev *dev,struct msi_desc *desc); int pci_msi_domain_check_cap(struct irq_domain *domain,
Signature · 1 line
2.11.0
Re: [PATCH 2/2] PCI/msi: remove pci_msi_domain_{alloc,free}_irqs
Quoted 4 lines · Christoph Hellwig
Just call the msi_* version directly instead of having trivial wrappers for one or two callsites.
Signed-off-by Christoph Hellwig <[email protected]>
Quoted 1 line · Christoph Hellwig
Now with even more dead code removal thanks to the review from Thomas!
Both applied with Thomas' acks to pci/msi for v4.11, thanks!