From: Thomas Gleixner <tglx@linutronix.de> To: LKML <linux-kernel@vger.kernel.org> Cc: Bjorn Helgaas <helgaas@kernel.org>, Marc Zygnier <maz@kernel.org>, Alex Williamson <alex.williamson@redhat.com>, Kevin Tian <kevin.tian@intel.com>, Jason Gunthorpe <jgg@nvidia.com>, Megha Dey <megha.dey@intel.com>, Ashok Raj <ashok.raj@intel.com>, linux-pci@vger.kernel.org, Thomas Bogendoerfer <tsbogend@alpha.franken.de>, linux-mips@vger.kernel.org, Michael Ellerman <mpe@ellerman.id.au>, Paul Mackerras <paulus@samba.org>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, linuxppc-dev@lists.ozlabs.org, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, sparclinux@vger.kernel.org, x86@kernel.org, xen-devel@lists.xenproject.org, ath11k@lists.infradead.org, Wei Liu <wei.liu@kernel.org>, linux-hyperv@vger.kernel.org, Juergen Gross <jgross@suse.com>, Christian Borntraeger <borntraeger@de.ibm.com>, Heiko Carstens <hca@linux.ibm.com> Subject: [patch 09/22] MIPS: Octeon: Use arch_setup_msi_irq() Date: Sat, 27 Nov 2021 02:18:48 +0100 (CET) [thread overview] Message-ID: <20211126223824.618089023@linutronix.de> (raw) In-Reply-To: 20211126222700.862407977@linutronix.de The core code provides the same loop code except for the MSI-X reject. Move that to arch_setup_msi_irq() and remove the duplicated code. No functional change. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Cc: linux-mips@vger.kernel.org --- arch/mips/pci/msi-octeon.c | 32 +++----------------------------- 1 file changed, 3 insertions(+), 29 deletions(-) --- a/arch/mips/pci/msi-octeon.c +++ b/arch/mips/pci/msi-octeon.c @@ -68,6 +68,9 @@ int arch_setup_msi_irq(struct pci_dev *d u64 search_mask; int index; + if (desc->pci.msi_attrib.is_msix) + return -EINVAL; + /* * Read the MSI config to figure out how many IRQs this device * wants. Most devices only want 1, which will give @@ -182,35 +185,6 @@ int arch_setup_msi_irq(struct pci_dev *d return 0; } -int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) -{ - struct msi_desc *entry; - int ret; - - /* - * MSI-X is not supported. - */ - if (type == PCI_CAP_ID_MSIX) - return -EINVAL; - - /* - * If an architecture wants to support multiple MSI, it needs to - * override arch_setup_msi_irqs() - */ - if (type == PCI_CAP_ID_MSI && nvec > 1) - return 1; - - for_each_pci_msi_entry(entry, dev) { - ret = arch_setup_msi_irq(dev, entry); - if (ret < 0) - return ret; - if (ret > 0) - return -ENOSPC; - } - - return 0; -} - /** * Called when a device no longer needs its MSI interrupts. All * MSI interrupts for the device are freed.
WARNING: multiple messages have this Message-ID (diff)
From: Thomas Gleixner <tglx@linutronix.de> To: LKML <linux-kernel@vger.kernel.org> Cc: Bjorn Helgaas <helgaas@kernel.org>, Marc Zygnier <maz@kernel.org>, Alex Williamson <alex.williamson@redhat.com>, Kevin Tian <kevin.tian@intel.com>, Jason Gunthorpe <jgg@nvidia.com>, Megha Dey <megha.dey@intel.com>, Ashok Raj <ashok.raj@intel.com>, linux-pci@vger.kernel.org, Thomas Bogendoerfer <tsbogend@alpha.franken.de>, linux-mips@vger.kernel.org, Michael Ellerman <mpe@ellerman.id.au>, Paul Mackerras <paulus@samba.org>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, linuxppc-dev@lists.ozlabs.org, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, sparclinux@vger.kernel.org, x86@kernel.org, xen-devel@lists.xenproject.org, ath11k@lists.infradead.org, Wei Liu <wei.liu@kernel.org>, linux-hyperv@vger.kernel.org, Juergen Gross <jgross@suse.com>, Christian Borntraeger <borntraeger@de.ibm.com>, Heiko Carstens <hca@linux.ibm.com> Subject: [patch 09/22] MIPS: Octeon: Use arch_setup_msi_irq() Date: Sat, 27 Nov 2021 02:19:34 +0100 (CET) [thread overview] Message-ID: <20211126223824.618089023@linutronix.de> (raw) Message-ID: <20211127011934.WCHS7fYYCWJv_JUh-ozuA3qVp--1fEkmDBUjl17IZHc@z> (raw) In-Reply-To: 20211126222700.862407977@linutronix.de The core code provides the same loop code except for the MSI-X reject. Move that to arch_setup_msi_irq() and remove the duplicated code. No functional change. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Cc: linux-mips@vger.kernel.org --- arch/mips/pci/msi-octeon.c | 32 +++----------------------------- 1 file changed, 3 insertions(+), 29 deletions(-) --- a/arch/mips/pci/msi-octeon.c +++ b/arch/mips/pci/msi-octeon.c @@ -68,6 +68,9 @@ int arch_setup_msi_irq(struct pci_dev *d u64 search_mask; int index; + if (desc->pci.msi_attrib.is_msix) + return -EINVAL; + /* * Read the MSI config to figure out how many IRQs this device * wants. Most devices only want 1, which will give @@ -182,35 +185,6 @@ int arch_setup_msi_irq(struct pci_dev *d return 0; } -int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) -{ - struct msi_desc *entry; - int ret; - - /* - * MSI-X is not supported. - */ - if (type == PCI_CAP_ID_MSIX) - return -EINVAL; - - /* - * If an architecture wants to support multiple MSI, it needs to - * override arch_setup_msi_irqs() - */ - if (type == PCI_CAP_ID_MSI && nvec > 1) - return 1; - - for_each_pci_msi_entry(entry, dev) { - ret = arch_setup_msi_irq(dev, entry); - if (ret < 0) - return ret; - if (ret > 0) - return -ENOSPC; - } - - return 0; -} - /** * Called when a device no longer needs its MSI interrupts. All * MSI interrupts for the device are freed.
next prev parent reply other threads:[~2021-11-27 1:20 UTC|newest] Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-11-27 1:18 [patch 00/22] genirq/msi, PCI/MSI: Spring cleaning - Part 1 Thomas Gleixner 2021-11-27 1:18 ` [patch 01/22] powerpc/4xx: Remove MSI support which never worked Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner 2021-11-27 1:18 ` [patch 02/22] PCI/MSI: Fix pci_irq_vector()/pci_irq_get_attinity() Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner 2021-11-27 1:18 ` [patch 03/22] genirq/msi: Guard sysfs code Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner 2021-11-27 1:18 ` [patch 04/22] genirq/msi: Remove unused domain callbacks Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner 2021-11-27 1:18 ` [patch 05/22] genirq/msi: Fixup includes Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner 2021-11-29 7:33 ` Cédric Le Goater 2021-11-29 21:38 ` Thomas Gleixner 2021-11-30 21:48 ` Cédric Le Goater 2021-11-30 22:10 ` Thomas Gleixner 2021-11-30 22:41 ` Thomas Gleixner 2021-12-01 7:14 ` Cédric Le Goater 2021-12-01 10:48 ` Thomas Gleixner 2021-11-27 1:18 ` [patch 06/22] PCI/MSI: Make pci_msi_domain_write_msg() static Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner 2021-11-27 1:18 ` [patch 07/22] PCI/MSI: Remove msi_desc_to_pci_sysdata() Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner 2021-11-27 1:18 ` [patch 08/22] PCI/sysfs: Use pci_irq_vector() Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner 2021-11-27 1:18 ` Thomas Gleixner [this message] 2021-11-27 1:19 ` [patch 09/22] MIPS: Octeon: Use arch_setup_msi_irq() Thomas Gleixner 2021-11-29 10:21 ` Thomas Bogendoerfer 2021-11-27 1:18 ` [patch 10/22] genirq/msi, treewide: Use a named struct for PCI/MSI attributes Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner 2021-11-29 9:29 ` Kalle Valo 2021-11-27 1:18 ` [patch 11/22] x86/hyperv: Refactor hv_msi_domain_free_irqs() Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner 2021-12-02 14:36 ` Wei Liu 2021-11-27 1:18 ` [patch 12/22] PCI/MSI: Make arch_restore_msi_irqs() less horrible Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner 2021-11-27 1:18 ` [patch 13/22] PCI/MSI: Cleanup include zoo Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner 2021-11-27 1:18 ` [patch 14/22] PCI/MSI: Make msix_update_entries() smarter Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner 2021-11-27 1:18 ` [patch 16/22] PCI/MSI: Split out CONFIG_PCI_MSI independent part Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner 2021-11-27 1:19 ` [patch 18/22] PCI/MSI: Split out irqdomain code Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner 2021-11-27 1:19 ` [patch 19/22] PCI/MSI: Sanitize MSIX table map handling Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner 2021-11-27 1:19 ` [patch 21/22] genirq/msi: Handle PCI/MSI allocation fail in core code Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner 2021-11-27 1:19 ` [patch 22/22] PCI/MSI: Move descriptor counting on allocation fail to the legacy code Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner 2021-11-27 1:19 ` [patch 00/22] genirq/msi, PCI/MSI: Spring cleaning - Part 1 Thomas Gleixner 2021-11-27 1:19 ` [patch 15/22] PCI/MSI: Move code into a separate directory Thomas Gleixner 2021-11-27 1:18 ` Thomas Gleixner 2021-11-27 1:19 ` [patch 17/22] PCI/MSI: Split out !IRQDOMAIN code Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner 2021-11-29 7:47 ` Cédric Le Goater 2021-11-29 7:51 ` Cédric Le Goater 2021-11-27 1:19 ` [patch 20/22] PCI/MSI: Make pci_msi_domain_check_cap() static Thomas Gleixner 2021-11-27 1:19 ` Thomas Gleixner 2021-11-28 0:08 ` [patch 00/22] genirq/msi, PCI/MSI: Spring cleaning - Part 1 Jason Gunthorpe 2021-11-28 11:15 ` Juergen Gross 2021-11-29 9:52 ` Cédric Le Goater
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20211126223824.618089023@linutronix.de \ --to=tglx@linutronix.de \ --cc=alex.williamson@redhat.com \ --cc=ashok.raj@intel.com \ --cc=ath11k@lists.infradead.org \ --cc=benh@kernel.crashing.org \ --cc=borntraeger@de.ibm.com \ --cc=gregkh@linuxfoundation.org \ --cc=hca@linux.ibm.com \ --cc=helgaas@kernel.org \ --cc=jgg@nvidia.com \ --cc=jgross@suse.com \ --cc=kevin.tian@intel.com \ --cc=linux-hyperv@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mips@vger.kernel.org \ --cc=linux-pci@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=maz@kernel.org \ --cc=megha.dey@intel.com \ --cc=mpe@ellerman.id.au \ --cc=paulus@samba.org \ --cc=sparclinux@vger.kernel.org \ --cc=tsbogend@alpha.franken.de \ --cc=wei.liu@kernel.org \ --cc=x86@kernel.org \ --cc=xen-devel@lists.xenproject.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).