diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-03-28 11:22:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-03-28 11:22:54 -0700 |
| commit | 112e43e9fd3b999513b1914e2bf523ae509f4c7d (patch) | |
| tree | 6f2ede50b4d57e31b00e2d23e24b096dce0aeede /drivers/pci/controller/pci-hyperv.c | |
| parent | acb4f33713b9f6cadb6143f211714c343465411c (diff) | |
Revert "Merge tag 'irq-msi-2025-03-23' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip"
This reverts commit 36f5f026df6c1cd8a20373adc4388d2b3401ce91, reversing
changes made to 43a7eec035a5b64546c8adefdc9cf96a116da14b.
Thomas says:
"I just noticed that for some incomprehensible reason, probably sheer
incompetemce when trying to utilize b4, I managed to merge an outdated
_and_ buggy version of that series.
Can you please revert that merge completely?"
Done.
Requested-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/pci/controller/pci-hyperv.c')
| -rw-r--r-- | drivers/pci/controller/pci-hyperv.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c index 178da6b9fc33..44d7f4339306 100644 --- a/drivers/pci/controller/pci-hyperv.c +++ b/drivers/pci/controller/pci-hyperv.c @@ -3975,18 +3975,24 @@ static int hv_pci_restore_msi_msg(struct pci_dev *pdev, void *arg) { struct irq_data *irq_data; struct msi_desc *entry; + int ret = 0; if (!pdev->msi_enabled && !pdev->msix_enabled) return 0; - guard(msi_descs_lock)(&pdev->dev); + msi_lock_descs(&pdev->dev); msi_for_each_desc(entry, &pdev->dev, MSI_DESC_ASSOCIATED) { irq_data = irq_get_irq_data(entry->irq); - if (WARN_ON_ONCE(!irq_data)) - return -EINVAL; + if (WARN_ON_ONCE(!irq_data)) { + ret = -EINVAL; + break; + } + hv_compose_msi_msg(irq_data, &entry->msg); } - return 0; + msi_unlock_descs(&pdev->dev); + + return ret; } /* |