From: "tip-bot2 for Ilpo Järvinen" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: ilpo.jarvinen@linux.intel.com,
"Borislav Petkov (AMD)" <bp@alien8.de>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/misc] x86/pci/intel_mid_pci: Fix PCIBIOS_* return code handling
Date: Mon, 24 Jun 2024 17:47:40 -0000 [thread overview]
Message-ID: <171925126055.10875.9999726721914543171.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20240527125538.13620-2-ilpo.jarvinen@linux.intel.com>
The following commit has been merged into the x86/misc branch of tip:
Commit-ID: 724852059e97c48557151b3aa4af424614819752
Gitweb: https://git.kernel.org/tip/724852059e97c48557151b3aa4af424614819752
Author: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
AuthorDate: Mon, 27 May 2024 15:55:36 +03:00
Committer: Borislav Petkov (AMD) <bp@alien8.de>
CommitterDate: Mon, 24 Jun 2024 19:19:55 +02:00
x86/pci/intel_mid_pci: Fix PCIBIOS_* return code handling
intel_mid_pci_irq_enable() uses pci_read_config_byte() that returns
PCIBIOS_* codes. The error handling, however, assumes the codes are
normal errnos because it checks for < 0.
intel_mid_pci_irq_enable() also returns the PCIBIOS_* code back to the
caller but the function is used as the (*pcibios_enable_irq) function
which should return normal errnos.
Convert the error check to plain non-zero check which works for
PCIBIOS_* return codes and convert the PCIBIOS_* return code using
pcibios_err_to_errno() into normal errno before returning it.
Fixes: 5b395e2be6c4 ("x86/platform/intel-mid: Make IRQ allocation a bit more flexible")
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20240527125538.13620-2-ilpo.jarvinen@linux.intel.com
---
arch/x86/pci/intel_mid_pci.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/pci/intel_mid_pci.c b/arch/x86/pci/intel_mid_pci.c
index 8edd622..722a33b 100644
--- a/arch/x86/pci/intel_mid_pci.c
+++ b/arch/x86/pci/intel_mid_pci.c
@@ -233,9 +233,9 @@ static int intel_mid_pci_irq_enable(struct pci_dev *dev)
return 0;
ret = pci_read_config_byte(dev, PCI_INTERRUPT_LINE, &gsi);
- if (ret < 0) {
+ if (ret) {
dev_warn(&dev->dev, "Failed to read interrupt line: %d\n", ret);
- return ret;
+ return pcibios_err_to_errno(ret);
}
id = x86_match_cpu(intel_mid_cpu_ids);
next prev parent reply other threads:[~2024-06-24 17:47 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-27 12:55 [PATCH 1/4] x86/of: Return consistent error type from x86_of_pci_irq_enable() Ilpo Järvinen
2024-05-27 12:55 ` [PATCH 2/4] x86/pci/intel_mid_pci: Fix PCIBIOS_* return code handling Ilpo Järvinen
2024-05-27 16:14 ` Andy Shevchenko
2024-06-24 17:47 ` tip-bot2 for Ilpo Järvinen [this message]
2024-05-27 12:55 ` [PATCH 3/4] x86/pci/xen: " Ilpo Järvinen
2024-05-28 12:56 ` Jürgen Groß
2024-06-24 17:47 ` [tip: x86/misc] " tip-bot2 for Ilpo Järvinen
2024-05-27 12:55 ` [PATCH 4/4] x86/platform/iosf_mbi: Convert PCIBIOS_* return codes to errnos Ilpo Järvinen
2024-06-24 17:47 ` [tip: x86/misc] " tip-bot2 for Ilpo Järvinen
2024-06-21 14:15 ` [PATCH 1/4] x86/of: Return consistent error type from x86_of_pci_irq_enable() Borislav Petkov
2024-06-23 17:27 ` Ilpo Järvinen
2024-06-24 17:47 ` [tip: x86/misc] " tip-bot2 for Ilpo Järvinen
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=171925126055.10875.9999726721914543171.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=andriy.shevchenko@linux.intel.com \
--cc=bp@alien8.de \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--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®