From: "tip-bot2 for Thomas Gleixner" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>,
Bjorn Helgaas <bhelgaas@google.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: irq/msi] PCI/MSI: Set pci_dev:: Msi_enabled late
Date: Wed, 09 Apr 2025 18:54:31 -0000 [thread overview]
Message-ID: <174422487199.31282.4119273968175959176.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20250319105506.383222333@linutronix.de>
The following commit has been merged into the irq/msi branch of tip:
Commit-ID: b0c44a5ec3552f89c47dac9903d99c22d796d87f
Gitweb: https://git.kernel.org/tip/b0c44a5ec3552f89c47dac9903d99c22d796d87f
Author: Thomas Gleixner <tglx@linutronix.de>
AuthorDate: Wed, 19 Mar 2025 11:56:49 +01:00
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Wed, 09 Apr 2025 20:47:29 +02:00
PCI/MSI: Set pci_dev:: Msi_enabled late
The comment claiming that pci_dev::msi_enabled has to be set across setup
is a leftover from ancient code versions. Nothing in the setup code
requires the flag to be set anymore.
Set it in the success path and remove the extra goto label.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Link: https://lore.kernel.org/all/20250319105506.383222333@linutronix.de
---
drivers/pci/msi/msi.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/drivers/pci/msi/msi.c b/drivers/pci/msi/msi.c
index 3283baa..c26e516 100644
--- a/drivers/pci/msi/msi.c
+++ b/drivers/pci/msi/msi.c
@@ -358,12 +358,8 @@ static int msi_capability_init(struct pci_dev *dev, int nvec,
if (nvec > 1 && !pci_msi_domain_supports(dev, MSI_FLAG_MULTI_PCI_MSI, ALLOW_LEGACY))
return 1;
- /*
- * Disable MSI during setup in the hardware, but mark it enabled
- * so that setup code can evaluate it.
- */
+ /* Disable MSI during setup in the hardware to erase stale state */
pci_msi_set_enable(dev, 0);
- dev->msi_enabled = 1;
if (affd)
masks = irq_create_affinity_masks(nvec, affd);
@@ -371,7 +367,7 @@ static int msi_capability_init(struct pci_dev *dev, int nvec,
msi_lock_descs(&dev->dev);
ret = msi_setup_msi_desc(dev, nvec, masks);
if (ret)
- goto fail;
+ goto unlock;
/* All MSIs are unmasked by default; mask them all */
entry = msi_first_desc(&dev->dev, MSI_DESC_ALL);
@@ -393,6 +389,7 @@ static int msi_capability_init(struct pci_dev *dev, int nvec,
goto err;
/* Set MSI enabled bits */
+ dev->msi_enabled = 1;
pci_intx_for_msi(dev, 0);
pci_msi_set_enable(dev, 1);
@@ -403,8 +400,6 @@ static int msi_capability_init(struct pci_dev *dev, int nvec,
err:
pci_msi_unmask(&desc, msi_multi_mask(&desc));
pci_free_msi_irqs(dev);
-fail:
- dev->msi_enabled = 0;
unlock:
msi_unlock_descs(&dev->dev);
kfree(masks);
next prev parent reply other threads:[~2025-04-09 18:54 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-19 10:56 [patch V4 00/14] genirq/msi: Spring cleaning Thomas Gleixner
2025-03-19 10:56 ` [patch V4 01/14] cleanup: Provide retain_ptr() Thomas Gleixner
2025-03-19 20:15 ` James Bottomley
2025-04-07 14:31 ` [tip: irq/msi] " tip-bot2 for Thomas Gleixner
2025-04-09 18:54 ` [tip: irq/msi] cleanup: Provide retain_and_null_ptr() tip-bot2 for Thomas Gleixner
2025-03-19 10:56 ` [patch V4 02/14] genirq/msi: Use lock guards for MSI descriptor locking Thomas Gleixner
2025-04-07 14:31 ` [tip: irq/msi] " tip-bot2 for Thomas Gleixner
2025-04-09 18:54 ` tip-bot2 for Thomas Gleixner
2025-03-19 10:56 ` [patch V4 03/14] soc: ti: ti_sci_inta_msi: Switch MSI descriptor locking to guard() Thomas Gleixner
2025-04-07 14:31 ` [tip: irq/msi] " tip-bot2 for Thomas Gleixner
2025-04-09 18:54 ` tip-bot2 for Thomas Gleixner
2025-03-19 10:56 ` [patch V4 04/14] NTB/msi: Switch MSI descriptor locking to lock guard() Thomas Gleixner
2025-04-07 14:31 ` [tip: irq/msi] " tip-bot2 for Thomas Gleixner
2025-04-09 18:54 ` tip-bot2 for Thomas Gleixner
2025-03-19 10:56 ` [patch V4 05/14] PCI/MSI: Use guard(msi_desc_lock) where applicable Thomas Gleixner
2025-03-19 17:08 ` Bjorn Helgaas
2025-04-07 14:31 ` [tip: irq/msi] " tip-bot2 for Thomas Gleixner
2025-04-09 18:54 ` tip-bot2 for Thomas Gleixner
2025-03-19 10:56 ` [patch V4 06/14] PCI/MSI: Set pci_dev::msi_enabled late Thomas Gleixner
2025-03-19 17:08 ` Bjorn Helgaas
2025-04-07 14:31 ` [tip: irq/msi] PCI/MSI: Set pci_dev:: Msi_enabled late tip-bot2 for Thomas Gleixner
2025-04-09 18:54 ` tip-bot2 for Thomas Gleixner [this message]
2025-03-19 10:56 ` [patch V4 07/14] PCI/MSI: Use __free() for affinity masks Thomas Gleixner
2025-03-19 17:09 ` Bjorn Helgaas
2025-04-07 14:31 ` [tip: irq/msi] " tip-bot2 for Thomas Gleixner
2025-04-09 18:54 ` tip-bot2 for Thomas Gleixner
2025-03-19 10:56 ` [patch V4 08/14] PCI/MSI: Switch msi_capability_init() to guard(msi_desc_lock) Thomas Gleixner
2025-03-19 17:09 ` Bjorn Helgaas
2025-04-07 14:31 ` [tip: irq/msi] " tip-bot2 for Thomas Gleixner
2025-04-09 18:54 ` tip-bot2 for Thomas Gleixner
2025-03-19 10:56 ` [patch V4 09/14] PCI/MSI: Switch msix_capability_init() " Thomas Gleixner
2025-03-19 17:09 ` Bjorn Helgaas
2025-04-07 14:31 ` [tip: irq/msi] " tip-bot2 for Thomas Gleixner
2025-04-08 12:04 ` commit 7b025f3f85ed causes NULL pointer dereference Bert Karwatzki
2025-04-08 15:09 ` Thomas Gleixner
2025-04-08 15:29 ` Thomas Gleixner
2025-04-08 16:20 ` Bert Karwatzki
2025-04-08 20:22 ` Klara Modin
2025-04-08 20:46 ` Thomas Gleixner
2025-04-09 11:44 ` Aithal, Srikanth
2025-04-09 11:49 ` Andy Shevchenko
2025-04-09 12:49 ` James Bottomley
2025-04-09 18:38 ` Thomas Gleixner
2025-04-09 15:22 ` Venkat Rao Bagalkote
2025-04-09 18:29 ` Borislav Petkov
2025-04-09 18:54 ` [tip: irq/msi] PCI/MSI: Switch msix_capability_init() to guard(msi_desc_lock) tip-bot2 for Thomas Gleixner
2025-03-19 10:56 ` [patch V4 10/14] PCI: hv: Switch MSI descriptor locking to guard() Thomas Gleixner
2025-04-07 14:31 ` [tip: irq/msi] " tip-bot2 for Thomas Gleixner
2025-04-09 18:54 ` tip-bot2 for Thomas Gleixner
2025-03-19 10:56 ` [patch V4 11/14] PCI/MSI: Provide a sane mechanism for TPH Thomas Gleixner
2025-04-07 14:31 ` [tip: irq/msi] " tip-bot2 for Thomas Gleixner
2025-04-09 18:54 ` tip-bot2 for Thomas Gleixner
2025-06-17 23:22 ` [patch V4 11/14] " Bjorn Helgaas
2025-06-17 23:25 ` Bjorn Helgaas
2025-03-19 10:56 ` [patch V4 12/14] PCI/TPH: Replace the broken MSI-X control word update Thomas Gleixner
2025-04-07 14:31 ` [tip: irq/msi] " tip-bot2 for Thomas Gleixner
2025-04-09 18:54 ` tip-bot2 for Thomas Gleixner
2025-03-19 10:57 ` [patch V4 13/14] scsi: ufs: qcom: Remove the MSI descriptor abuse Thomas Gleixner
2025-03-19 20:40 ` James Bottomley
2025-04-07 14:31 ` [tip: irq/msi] " tip-bot2 for Thomas Gleixner
2025-04-09 18:54 ` tip-bot2 for Thomas Gleixner
2025-03-19 10:57 ` [patch V4 14/14] genirq/msi: Rename msi_[un]lock_descs() Thomas Gleixner
2025-04-07 14:31 ` [tip: irq/msi] " tip-bot2 for Thomas Gleixner
2025-04-09 18:54 ` tip-bot2 for Thomas Gleixner
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=174422487199.31282.4119273968175959176.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bhelgaas@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.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: link
Be 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
all inboxes | Powered by JetHome®