From: Thomas Gleixner <tglx@linutronix.de> To: LKML <linux-kernel@vger.kernel.org> Cc: Alex Williamson <alex.williamson@redhat.com>, "Raj, Ashok" <ashok.raj@intel.com>, "David S. Miller" <davem@davemloft.net>, Bjorn Helgaas <bhelgaas@google.com>, linux-pci@vger.kernel.org, Kevin Tian <kevin.tian@intel.com>, Marc Zyngier <maz@kernel.org>, Ingo Molnar <mingo@kernel.org>, x86@kernel.org, linux-s390@vger.kernel.org, Niklas Schnelle <schnelle@linux.ibm.com>, Gerald Schaefer <gerald.schaefer@linux.ibm.com>, Heiko Carstens <hca@linux.ibm.com>, Christian Borntraeger <borntraeger@de.ibm.com> Subject: [patch V2 15/19] PCI/MSI: Consolidate error handling in msi_capability_init() Date: Thu, 29 Jul 2021 23:51:54 +0200 [thread overview] Message-ID: <20210729222543.098828720@linutronix.de> (raw) In-Reply-To: <20210729215139.889204656@linutronix.de> Three error exits doing exactly the same ask for a common error exit point. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- V2: New patch --- drivers/pci/msi.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -659,25 +659,16 @@ static int msi_capability_init(struct pc /* Configure MSI capability structure */ ret = pci_msi_setup_msi_irqs(dev, nvec, PCI_CAP_ID_MSI); - if (ret) { - msi_mask_irq(entry, mask, 0); - free_msi_irqs(dev); - return ret; - } + if (ret) + goto err; ret = msi_verify_entries(dev); - if (ret) { - msi_mask_irq(entry, mask, 0); - free_msi_irqs(dev); - return ret; - } + if (ret) + goto err; ret = populate_msi_sysfs(dev); - if (ret) { - msi_mask_irq(entry, mask, 0); - free_msi_irqs(dev); - return ret; - } + if (ret) + goto err; /* Set MSI enabled bits */ pci_intx_for_msi(dev, 0); @@ -687,6 +678,11 @@ static int msi_capability_init(struct pc pcibios_free_irq(dev); dev->irq = entry->irq; return 0; + +err: + msi_mask_irq(entry, mask, 0); + free_msi_irqs(dev); + return ret; } static void __iomem *msix_map_region(struct pci_dev *dev, unsigned nr_entries)
next prev parent reply other threads:[~2021-07-29 22:35 UTC|newest] Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-29 21:51 [patch V2 00/19] PCI/MSI, x86: Cure a couple of inconsistencies Thomas Gleixner 2021-07-29 21:51 ` [patch V2 01/19] PCI/MSI: Enable and mask MSI-X early Thomas Gleixner 2021-08-10 9:07 ` [tip: irq/core] " tip-bot2 for Thomas Gleixner 2021-07-29 21:51 ` [patch V2 02/19] PCI/MSI: Mask all unused MSI-X entries Thomas Gleixner 2021-08-10 9:07 ` [tip: irq/core] " tip-bot2 for Thomas Gleixner 2021-07-29 21:51 ` [patch V2 03/19] PCI/MSI: Enforce that MSI-X table entry is masked for update Thomas Gleixner 2021-08-10 9:07 ` [tip: irq/core] " tip-bot2 for Thomas Gleixner 2021-07-29 21:51 ` [patch V2 04/19] PCI/MSI: Enforce MSI[X] entry updates to be visible Thomas Gleixner 2021-08-10 9:07 ` [tip: irq/core] " tip-bot2 for Thomas Gleixner 2021-07-29 21:51 ` [patch V2 05/19] PCI/MSI: Do not set invalid bits in MSI mask Thomas Gleixner 2021-08-10 9:07 ` [tip: irq/core] " tip-bot2 for Thomas Gleixner 2021-07-29 21:51 ` [patch V2 06/19] PCI/MSI: Correct misleading comments Thomas Gleixner 2021-08-10 9:07 ` [tip: irq/core] " tip-bot2 for Thomas Gleixner 2021-07-29 21:51 ` [patch V2 07/19] PCI/MSI: Use msi_mask_irq() in pci_msi_shutdown() Thomas Gleixner 2021-08-10 9:07 ` [tip: irq/core] " tip-bot2 for Thomas Gleixner 2021-07-29 21:51 ` [patch V2 08/19] PCI/MSI: Protect msi_desc::masked for multi-MSI Thomas Gleixner 2021-08-10 9:07 ` [tip: irq/core] " tip-bot2 for Thomas Gleixner 2021-07-29 21:51 ` [patch V2 09/19] genirq: Provide IRQCHIP_AFFINITY_PRE_STARTUP Thomas Gleixner 2021-08-10 9:07 ` [tip: irq/core] " tip-bot2 for Thomas Gleixner 2021-07-29 21:51 ` [patch V2 10/19] x86/ioapic: Force affinity setup before startup Thomas Gleixner 2021-08-10 9:07 ` [tip: irq/core] " tip-bot2 for Thomas Gleixner 2021-07-29 21:51 ` [patch V2 11/19] x86/msi: " Thomas Gleixner 2021-08-10 9:07 ` [tip: irq/core] " tip-bot2 for Thomas Gleixner 2021-07-29 21:51 ` [patch V2 12/19] s390/pci: Do not mask MSI[-X] entries on teardown Thomas Gleixner 2021-08-03 12:48 ` Niklas Schnelle 2021-08-10 9:07 ` [tip: irq/core] " tip-bot2 for Thomas Gleixner 2021-07-29 21:51 ` [patch V2 13/19] PCI/MSI: Simplify msi_verify_entries() Thomas Gleixner 2021-08-10 9:07 ` [tip: irq/core] " tip-bot2 for Thomas Gleixner 2021-07-29 21:51 ` [patch V2 14/19] PCI/MSI: Rename msi_desc::masked Thomas Gleixner 2021-08-10 9:07 ` [tip: irq/core] " tip-bot2 for Thomas Gleixner 2021-07-29 21:51 ` Thomas Gleixner [this message] 2021-08-10 9:07 ` [tip: irq/core] PCI/MSI: Consolidate error handling in msi_capability_init() tip-bot2 for Thomas Gleixner 2021-07-29 21:51 ` [patch V2 16/19] PCI/MSI: Deobfuscate virtual MSI-X Thomas Gleixner 2021-08-10 9:07 ` [tip: irq/core] " tip-bot2 for Thomas Gleixner 2021-07-29 21:51 ` [patch V2 17/19] PCI/MSI: Cleanup msi_mask() Thomas Gleixner 2021-08-10 9:07 ` [tip: irq/core] " tip-bot2 for Thomas Gleixner 2021-07-29 21:51 ` [patch V2 18/19] PCI/MSI: Provide a new set of mask and unmask functions Thomas Gleixner [not found] ` <87r1f6bpt7.wl-maz@kernel.org> 2021-08-09 18:56 ` Thomas Gleixner 2021-08-09 19:08 ` [patch V3 " Thomas Gleixner 2021-08-10 9:07 ` [tip: irq/core] " tip-bot2 for Thomas Gleixner 2021-07-29 21:51 ` [patch V2 19/19] PCI/MSI: Use new mask/unmask functions Thomas Gleixner 2021-08-10 9:07 ` [tip: irq/core] " tip-bot2 for Thomas Gleixner 2021-08-10 7:49 ` [patch V2 00/19] PCI/MSI, x86: Cure a couple of inconsistencies Marc Zyngier
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=20210729222543.098828720@linutronix.de \ --to=tglx@linutronix.de \ --cc=alex.williamson@redhat.com \ --cc=ashok.raj@intel.com \ --cc=bhelgaas@google.com \ --cc=borntraeger@de.ibm.com \ --cc=davem@davemloft.net \ --cc=gerald.schaefer@linux.ibm.com \ --cc=hca@linux.ibm.com \ --cc=kevin.tian@intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pci@vger.kernel.org \ --cc=linux-s390@vger.kernel.org \ --cc=maz@kernel.org \ --cc=mingo@kernel.org \ --cc=schnelle@linux.ibm.com \ --cc=x86@kernel.org \ --subject='Re: [patch V2 15/19] PCI/MSI: Consolidate error handling in msi_capability_init()' \ /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: link
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.