From: "Marek Behún" <kabel@kernel.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sasha Levin <sashal@kernel.org>
Cc: pali@kernel.org, stable@vger.kernel.org,
"Bjorn Helgaas" <helgaas@kernel.org>,
"Lorenzo Pieralisi" <lorenzo.pieralisi@arm.com>,
"Marek Behún" <kabel@kernel.org>
Subject: [PATCH 4.19 07/20] PCI: aardvark: Indicate error in 'val' when config read fails
Date: Thu, 25 Nov 2021 00:04:47 +0100 [thread overview]
Message-ID: <20211124230500.27109-8-kabel@kernel.org> (raw)
In-Reply-To: <20211124230500.27109-1-kabel@kernel.org>
From: Pali Rohár <pali@kernel.org>
commit b1bd5714472cc72e14409f5659b154c765a76c65 upstream.
Most callers of config read do not check for return value. But most of the
ones that do, checks for error indication in 'val' variable.
This patch updates error handling in advk_pcie_rd_conf() function. If PIO
transfer fails then 'val' variable is set to 0xffffffff which indicates
failture.
Link: https://lore.kernel.org/r/20200528162604.GA323482@bjorn-Precision-5520
Link: https://lore.kernel.org/r/20200601130315.18895-1-pali@kernel.org
Reported-by: Bjorn Helgaas <helgaas@kernel.org>
Signed-off-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Marek Behún <kabel@kernel.org>
---
drivers/pci/controller/pci-aardvark.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c
index aaeb1c78076c..5837fff32f8e 100644
--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
@@ -596,8 +596,10 @@ static int advk_pcie_rd_conf(struct pci_bus *bus, u32 devfn,
advk_writel(pcie, 1, PIO_START);
ret = advk_pcie_wait_pio(pcie);
- if (ret < 0)
+ if (ret < 0) {
+ *val = 0xffffffff;
return PCIBIOS_SET_FAILED;
+ }
/* Check PIO status and get the read result */
ret = advk_pcie_check_pio_status(pcie, val);
--
2.32.0
next prev parent reply other threads:[~2021-11-24 23:05 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-24 23:04 [PATCH 4.19 00/20] Armada 3720 PCIe fixes for 4.19 Marek Behún
2021-11-24 23:04 ` [PATCH 4.19 01/20] PCI: aardvark: Fix a leaked reference by adding missing of_node_put() Marek Behún
2021-11-24 23:04 ` [PATCH 4.19 02/20] PCI: aardvark: Wait for endpoint to be ready before training link Marek Behún
2021-11-24 23:04 ` [PATCH 4.19 03/20] PCI: aardvark: Train link immediately after enabling training Marek Behún
2021-11-24 23:04 ` [PATCH 4.19 04/20] PCI: aardvark: Improve link training Marek Behún
2021-11-24 23:04 ` [PATCH 4.19 05/20] PCI: aardvark: Issue PERST via GPIO Marek Behún
2021-11-24 23:04 ` [PATCH 4.19 06/20] PCI: aardvark: Replace custom macros by standard linux/pci_regs.h macros Marek Behún
2021-11-24 23:04 ` Marek Behún [this message]
2021-11-24 23:04 ` [PATCH 4.19 08/20] PCI: aardvark: Don't touch PCIe registers if no card connected Marek Behún
2021-11-24 23:04 ` [PATCH 4.19 09/20] PCI: aardvark: Fix compilation on s390 Marek Behún
2021-11-24 23:04 ` [PATCH 4.19 10/20] PCI: aardvark: Move PCIe reset card code to advk_pcie_train_link() Marek Behún
2021-11-24 23:04 ` [PATCH 4.19 11/20] PCI: aardvark: Update comment about disabling link training Marek Behún
2021-11-24 23:04 ` [PATCH 4.19 12/20] PCI: aardvark: Configure PCIe resources from 'ranges' DT property Marek Behún
2021-11-24 23:04 ` [PATCH 4.19 13/20] PCI: aardvark: Fix PCIe Max Payload Size setting Marek Behún
2021-11-24 23:04 ` [PATCH 4.19 14/20] PCI: aardvark: Fix link training Marek Behún
2021-11-24 23:04 ` [PATCH 4.19 15/20] PCI: aardvark: Fix checking for link up via LTSSM state Marek Behún
2021-11-24 23:04 ` [PATCH 4.19 16/20] pinctrl: armada-37xx: Correct mpp definitions Marek Behún
2021-11-24 23:04 ` [PATCH 4.19 17/20] pinctrl: armada-37xx: add missing pin: PCIe1 Wakeup Marek Behún
2021-11-24 23:04 ` [PATCH 4.19 18/20] pinctrl: armada-37xx: Correct PWM pins definitions Marek Behún
2021-11-24 23:04 ` [PATCH 4.19 19/20] arm64: dts: marvell: armada-37xx: declare PCIe reset pin Marek Behún
2021-11-24 23:05 ` [PATCH 4.19 20/20] arm64: dts: marvell: armada-37xx: Set pcie_reset_pin to gpio function Marek Behún
2021-11-28 14:16 ` [PATCH 4.19 00/20] Armada 3720 PCIe fixes for 4.19 Greg Kroah-Hartman
2021-11-28 14:16 ` Greg Kroah-Hartman
2021-11-28 14:22 ` Pali Rohár
2021-11-28 14:36 ` Greg Kroah-Hartman
2021-11-28 16:33 ` Pali Rohár
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=20211124230500.27109-8-kabel@kernel.org \
--to=kabel@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=helgaas@kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=pali@kernel.org \
--cc=sashal@kernel.org \
--cc=stable@vger.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;
as well as URLs for NNTP newsgroup(s).