From: Bjorn Helgaas <helgaas@kernel.org>
To: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
ashok.raj@intel.com, Keith Busch <keith.busch@intel.com>
Subject: Re: [PATCH v13 1/8] PCI/ERR: Update error status after reset_link()
Date: Wed, 5 Feb 2020 13:03:37 -0600 [thread overview]
Message-ID: <20200205190337.GA232001@google.com> (raw)
In-Reply-To: <20200205182800.GB112031@skuppusw-desk.amr.corp.intel.com>
On Wed, Feb 05, 2020 at 10:28:00AM -0800, Kuppuswamy Sathyanarayanan wrote:
> Hi Bjorn,
>
> On Sat, Jan 18, 2020 at 08:00:30PM -0800, sathyanarayanan.kuppuswamy@linux.intel.com wrote:
> > From: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
> >
> > Commit bdb5ac85777d ("PCI/ERR: Handle fatal error recovery") uses
> > reset_link() to recover from fatal errors. But during fatal error
> > recovery, if the initial value of error status is
> > PCI_ERS_RESULT_DISCONNECT or PCI_ERS_RESULT_NO_AER_DRIVER then
> > even after successful recovery (using reset_link()) pcie_do_recovery()
> > will report the recovery result as failure. So update the status of
> > error after reset_link().
>
> Since this patch has no dependency on EDR, can we merge it first?
We *could*, but I don't think there's any benefit. bdb5ac85777d
appeared in v4.20, so this wouldn't really be a candidate for v5.6.
I'm expecting (hoping, anyway) that we'll merge this whole series for
v5.7. For minor bugfixes like this one, we should add stable tags so
they'll get backported.
> > Fixes: bdb5ac85777d ("PCI/ERR: Handle fatal error recovery")
> > Cc: Ashok Raj <ashok.raj@intel.com>
> > Cc: Keith Busch <keith.busch@intel.com>
> > Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
> > Acked-by: Keith Busch <keith.busch@intel.com>
> > ---
> > drivers/pci/pcie/err.c | 8 +++++---
> > 1 file changed, 5 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/pci/pcie/err.c b/drivers/pci/pcie/err.c
> > index b0e6048a9208..71639055511e 100644
> > --- a/drivers/pci/pcie/err.c
> > +++ b/drivers/pci/pcie/err.c
> > @@ -204,9 +204,11 @@ void pcie_do_recovery(struct pci_dev *dev, enum pci_channel_state state,
> > else
> > pci_walk_bus(bus, report_normal_detected, &status);
> >
> > - if (state == pci_channel_io_frozen &&
> > - reset_link(dev, service) != PCI_ERS_RESULT_RECOVERED)
> > - goto failed;
> > + if (state == pci_channel_io_frozen) {
> > + status = reset_link(dev, service);
> > + if (status != PCI_ERS_RESULT_RECOVERED)
> > + goto failed;
> > + }
> >
> > if (status == PCI_ERS_RESULT_CAN_RECOVER) {
> > status = PCI_ERS_RESULT_RECOVERED;
> > --
> > 2.21.0
> >
>
> --
> Sathyanarayanan Kuppuswamy
> Linux kernel developer
next prev parent reply other threads:[~2020-02-05 19:03 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-19 4:00 [PATCH v13 0/8] Add Error Disconnect Recover (EDR) support sathyanarayanan.kuppuswamy
2020-01-19 4:00 ` [PATCH v13 1/8] PCI/ERR: Update error status after reset_link() sathyanarayanan.kuppuswamy
2020-02-05 18:28 ` Kuppuswamy Sathyanarayanan
2020-02-05 19:03 ` Bjorn Helgaas [this message]
2020-01-19 4:00 ` [PATCH v13 2/8] PCI/DPC: Allow dpc_probe() even if firmware first mode is enabled sathyanarayanan.kuppuswamy
2020-01-22 23:17 ` Bjorn Helgaas
2020-01-23 0:42 ` Kuppuswamy Sathyanarayanan
2020-01-23 3:10 ` Bjorn Helgaas
2020-01-23 18:04 ` Kuppuswamy Sathyanarayanan
2020-01-19 4:00 ` [PATCH v13 3/8] PCI/DPC: Add dpc_process_error() wrapper function sathyanarayanan.kuppuswamy
2020-01-19 4:00 ` [PATCH v13 4/8] PCI/DPC: Add Error Disconnect Recover (EDR) support sathyanarayanan.kuppuswamy
2020-01-24 15:04 ` Bjorn Helgaas
2020-01-25 23:25 ` Kuppuswamy Sathyanarayanan
2020-01-27 13:50 ` Bjorn Helgaas
2020-01-19 4:00 ` [PATCH v13 5/8] PCI/AER: Allow clearing Error Status Register in FF mode sathyanarayanan.kuppuswamy
2020-01-19 4:00 ` [PATCH v13 6/8] PCI/DPC: Update comments related to DPC recovery on NON_FATAL errors sathyanarayanan.kuppuswamy
2020-01-19 4:00 ` [PATCH v13 7/8] PCI/DPC: Clear AER registers in EDR mode sathyanarayanan.kuppuswamy
2020-01-19 4:00 ` [PATCH v13 8/8] PCI/ACPI: Enable EDR support sathyanarayanan.kuppuswamy
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=20200205190337.GA232001@google.com \
--to=helgaas@kernel.org \
--cc=ashok.raj@intel.com \
--cc=keith.busch@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=sathyanarayanan.kuppuswamy@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 NNTP newsgroup(s).