From: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
To: "Maciej W. Rozycki" <macro@orcam.me.uk>
Cc: Bjorn Helgaas <bhelgaas@google.com>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
linux-pci@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 2/2] PCI: Use an error code with PCIe failed link retraining
Date: Mon, 12 Feb 2024 14:11:32 +0200 (EET) [thread overview]
Message-ID: <855a5a56-75f2-2ce5-7f35-b761b62784e7@linux.intel.com> (raw)
In-Reply-To: <alpine.DEB.2.21.2402100048440.2376@angie.orcam.me.uk>
[-- Attachment #1: Type: text/plain, Size: 4327 bytes --]
On Sat, 10 Feb 2024, Maciej W. Rozycki wrote:
> Given how the call place in `pcie_wait_for_link_delay' got structured
> now, and that `pcie_retrain_link' returns a potentially useful error
> code, convert `pcie_failed_link_retrain' to return an error code rather
> than a boolean status, fixing handling at the call site mentioned.
> Update the other call site accordingly.
>
> Fixes: 1abb47390350 ("Merge branch 'pci/enumeration'")
> Reported-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
> Link: https://lore.kernel.org/r/aa2d1c4e-9961-d54a-00c7-ddf8e858a9b0@linux.intel.com/
> Signed-off-by: Maciej W. Rozycki <macro@orcam.me.uk>
> Cc: stable@vger.kernel.org # v6.5+
> ---
> drivers/pci/pci.c | 2 +-
> drivers/pci/pci.h | 6 +++---
> drivers/pci/quirks.c | 14 +++++++-------
> 3 files changed, 11 insertions(+), 11 deletions(-)
>
> linux-pcie-failed-link-retrain-status-int.diff
> Index: linux-macro/drivers/pci/pci.c
> ===================================================================
> --- linux-macro.orig/drivers/pci/pci.c
> +++ linux-macro/drivers/pci/pci.c
> @@ -1263,7 +1263,7 @@ static int pci_dev_wait(struct pci_dev *
> if (delay > PCI_RESET_WAIT) {
> if (retrain) {
> retrain = false;
> - if (pcie_failed_link_retrain(bridge)) {
> + if (pcie_failed_link_retrain(bridge) == 0) {
> delay = 1;
> continue;
> }
> Index: linux-macro/drivers/pci/pci.h
> ===================================================================
> --- linux-macro.orig/drivers/pci/pci.h
> +++ linux-macro/drivers/pci/pci.h
> @@ -540,7 +540,7 @@ void pci_acs_init(struct pci_dev *dev);
> int pci_dev_specific_acs_enabled(struct pci_dev *dev, u16 acs_flags);
> int pci_dev_specific_enable_acs(struct pci_dev *dev);
> int pci_dev_specific_disable_acs_redir(struct pci_dev *dev);
> -bool pcie_failed_link_retrain(struct pci_dev *dev);
> +int pcie_failed_link_retrain(struct pci_dev *dev);
> #else
> static inline int pci_dev_specific_acs_enabled(struct pci_dev *dev,
> u16 acs_flags)
> @@ -555,9 +555,9 @@ static inline int pci_dev_specific_disab
> {
> return -ENOTTY;
> }
> -static inline bool pcie_failed_link_retrain(struct pci_dev *dev)
> +static inline int pcie_failed_link_retrain(struct pci_dev *dev)
> {
> - return false;
> + return -ENOTTY;
> }
> #endif
>
> Index: linux-macro/drivers/pci/quirks.c
> ===================================================================
> --- linux-macro.orig/drivers/pci/quirks.c
> +++ linux-macro/drivers/pci/quirks.c
> @@ -74,17 +74,17 @@
> * firmware may have already arranged and lift it with ports that already
> * report their data link being up.
> *
> - * Return TRUE if the link has been successfully retrained, otherwise FALSE,
> + * Return 0 if the link has been successfully retrained, otherwise an error,
> * also when retraining was not needed in the first place.
> */
> -bool pcie_failed_link_retrain(struct pci_dev *dev)
> +int pcie_failed_link_retrain(struct pci_dev *dev)
> {
> static const struct pci_device_id ids[] = {
> { PCI_VDEVICE(ASMEDIA, 0x2824) }, /* ASMedia ASM2824 */
> {}
> };
> u16 lnksta, lnkctl2;
> - bool ret = false;
> + int ret = -ENOTTY;
>
> if (!pci_is_pcie(dev) || !pcie_downstream_port(dev) ||
> !pcie_cap_has_lnkctl2(dev) || !dev->link_active_reporting)
> @@ -100,8 +100,8 @@ bool pcie_failed_link_retrain(struct pci
> lnkctl2 |= PCI_EXP_LNKCTL2_TLS_2_5GT;
> pcie_capability_write_word(dev, PCI_EXP_LNKCTL2, lnkctl2);
>
> - ret = pcie_retrain_link(dev, false) == 0;
> - if (!ret) {
> + ret = pcie_retrain_link(dev, false);
> + if (ret) {
> pci_info(dev, "retraining failed\n");
> return ret;
> }
> @@ -120,8 +120,8 @@ bool pcie_failed_link_retrain(struct pci
> lnkctl2 |= lnkcap & PCI_EXP_LNKCAP_SLS;
> pcie_capability_write_word(dev, PCI_EXP_LNKCTL2, lnkctl2);
>
> - ret = pcie_retrain_link(dev, false) == 0;
> - if (!ret) {
> + ret = pcie_retrain_link(dev, false);
> + if (ret) {
> pci_info(dev, "retraining failed\n");
> return ret;
> }
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
I closed my patch from patchwork that is not need after this change.
--
i.
next prev parent reply other threads:[~2024-02-12 12:11 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-10 1:43 [PATCH 0/2] PCI: Rework error reporting with PCIe failed link retraining Maciej W. Rozycki
2024-02-10 1:43 ` [PATCH 1/2] PCI: Correct " Maciej W. Rozycki
2024-02-12 12:01 ` Ilpo Järvinen
2024-03-14 7:19 ` Pengfei Xu
2024-03-14 11:27 ` Ilpo Järvinen
2024-03-15 3:10 ` Pengfei Xu
2024-04-24 22:13 ` Bjorn Helgaas
2024-02-10 1:43 ` [PATCH 2/2] PCI: Use an error code " Maciej W. Rozycki
2024-02-12 12:11 ` Ilpo Järvinen [this message]
2024-02-26 12:55 ` [PATCH 0/2] PCI: Rework error reporting " Maciej W. Rozycki
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=855a5a56-75f2-2ce5-7f35-b761b62784e7@linux.intel.com \
--to=ilpo.jarvinen@linux.intel.com \
--cc=bhelgaas@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=macro@orcam.me.uk \
--cc=mika.westerberg@linux.intel.com \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).