From: "Sean V Kelley" <sean.v.kelley@intel.com>
To: "Bjorn Helgaas" <helgaas@kernel.org>
Cc: "Sean V Kelley" <seanvk.dev@oregontracks.org>,
bhelgaas@google.com, Jonathan.Cameron@huawei.com,
rafael.j.wysocki@intel.com, ashok.raj@intel.com,
tony.luck@intel.com, sathyanarayanan.kuppuswamy@intel.com,
qiuxu.zhuo@intel.com, linux-pci@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v6 05/10] PCI/AER: Apply function level reset to RCiEP on fatal error
Date: Fri, 25 Sep 2020 15:54:19 -0700 [thread overview]
Message-ID: <E621EAEF-54F8-4820-BC58-ED6163C82086@intel.com> (raw)
In-Reply-To: <20200925215854.GA2460270@bjorn-Precision-5520>
On 25 Sep 2020, at 14:58, Bjorn Helgaas wrote:
> On Tue, Sep 22, 2020 at 02:38:54PM -0700, Sean V Kelley wrote:
>> From: Qiuxu Zhuo <qiuxu.zhuo@intel.com>
>>
>> Attempt to do function level reset for an RCiEP associated with an
>> RCEC device on fatal error.
>>
>> Signed-off-by: Qiuxu Zhuo <qiuxu.zhuo@intel.com>
>> ---
>> drivers/pci/pcie/err.c | 31 ++++++++++++++++++++++---------
>> 1 file changed, 22 insertions(+), 9 deletions(-)
>>
>> diff --git a/drivers/pci/pcie/err.c b/drivers/pci/pcie/err.c
>> index e575fa6cee63..5380ecc41506 100644
>> --- a/drivers/pci/pcie/err.c
>> +++ b/drivers/pci/pcie/err.c
>> @@ -169,6 +169,17 @@ static void pci_bridge_walk(struct pci_dev
>> *bridge, int (*cb)(struct pci_dev *,
>> cb(bridge, userdata);
>> }
>>
>> +static pci_ers_result_t flr_on_rciep(struct pci_dev *dev)
>> +{
>> + if (!pcie_has_flr(dev))
>> + return PCI_ERS_RESULT_NONE;
>> +
>> + if (pcie_flr(dev))
>> + return PCI_ERS_RESULT_DISCONNECT;
>> +
>> + return PCI_ERS_RESULT_RECOVERED;
>> +}
>
> Either we reset the device or we didn't; there is no third option.
>
> If I read it correctly, nothing in pcie_do_recovery() cares about the
> difference between PCI_ERS_RESULT_NONE and PCI_ERS_RESULT_DISCONNECT.
> The status does get returned, but only edr_handle_event() looks at it,
> and it doesn't care about the difference either.
>
> So I think this should just return PCI_ERS_RESULT_RECOVERED or
> PCI_ERS_RESULT_DISCONNECT.
You raise a good point. As currently implemented, the usage requires
either a reset or not result. Will change.
Thanks,
Sean
>
>> pci_ers_result_t pcie_do_recovery(struct pci_dev *dev,
>> pci_channel_state_t state,
>> pci_ers_result_t (*reset_subordinate_devices)(struct pci_dev
>> *pdev))
>> @@ -195,15 +206,17 @@ pci_ers_result_t pcie_do_recovery(struct
>> pci_dev *dev,
>> if (state == pci_channel_io_frozen) {
>> pci_bridge_walk(bridge, report_frozen_detected, &status);
>> if (type == PCI_EXP_TYPE_RC_END) {
>> - pci_warn(dev, "link reset not possible for RCiEP\n");
>> - status = PCI_ERS_RESULT_NONE;
>> - goto failed;
>> - }
>> -
>> - status = reset_subordinate_devices(bridge);
>> - if (status != PCI_ERS_RESULT_RECOVERED) {
>> - pci_warn(dev, "subordinate device reset failed\n");
>> - goto failed;
>> + status = flr_on_rciep(dev);
>> + if (status != PCI_ERS_RESULT_RECOVERED) {
>> + pci_warn(dev, "function level reset failed\n");
>> + goto failed;
>> + }
>> + } else {
>> + status = reset_subordinate_devices(bridge);
>> + if (status != PCI_ERS_RESULT_RECOVERED) {
>> + pci_warn(dev, "subordinate device reset failed\n");
>> + goto failed;
>> + }
>> }
>> } else {
>> pci_bridge_walk(bridge, report_normal_detected, &status);
>> --
>> 2.28.0
>>
next prev parent reply other threads:[~2020-09-25 22:54 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-22 21:38 [PATCH v6 00/10] Add RCEC handling to PCI/AER Sean V Kelley
2020-09-22 21:38 ` [PATCH v6 01/10] PCI/RCEC: Add RCEC class code and extended capability Sean V Kelley
2020-09-22 21:38 ` [PATCH v6 02/10] PCI/RCEC: Bind RCEC devices to the Root Port driver Sean V Kelley
2020-09-25 19:59 ` Bjorn Helgaas
2020-09-25 21:39 ` Sean V Kelley
2020-09-22 21:38 ` [PATCH v6 03/10] PCI/RCEC: Cache RCEC capabilities in pci_init_capabilities() Sean V Kelley
2020-09-25 20:13 ` Bjorn Helgaas
2020-09-25 21:49 ` Sean V Kelley
2020-09-22 21:38 ` [PATCH v6 04/10] PCI/AER: Extend AER error handling to RCECs Sean V Kelley
2020-09-25 21:14 ` Bjorn Helgaas
2020-09-25 22:08 ` Sean V Kelley
2020-09-22 21:38 ` [PATCH v6 05/10] PCI/AER: Apply function level reset to RCiEP on fatal error Sean V Kelley
2020-09-25 21:58 ` Bjorn Helgaas
2020-09-25 22:54 ` Sean V Kelley [this message]
2020-09-22 21:38 ` [PATCH v6 06/10] PCI/RCEC: Add pcie_link_rcec() to associate RCiEPs Sean V Kelley
2020-09-25 22:15 ` Bjorn Helgaas
2020-09-28 16:20 ` Sean V Kelley
2020-09-22 21:38 ` [PATCH v6 07/10] PCI/RCEC: Add RCiEP's linked RCEC to AER/ERR Sean V Kelley
2020-09-27 23:45 ` Bjorn Helgaas
2020-09-28 1:47 ` Bjorn Helgaas
2020-09-28 21:36 ` Sean V Kelley
2020-09-28 17:27 ` Sean V Kelley
2020-09-22 21:38 ` [PATCH v6 08/10] PCI/AER: Add pcie_walk_rcec() to RCEC AER handling Sean V Kelley
2020-09-22 21:38 ` [PATCH v6 09/10] PCI/PME: Add pcie_walk_rcec() to RCEC PME handling Sean V Kelley
2020-09-22 21:38 ` [PATCH v6 10/10] PCI/AER: Add RCEC AER error injection support Sean V Kelley
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=E621EAEF-54F8-4820-BC58-ED6163C82086@intel.com \
--to=sean.v.kelley@intel.com \
--cc=Jonathan.Cameron@huawei.com \
--cc=ashok.raj@intel.com \
--cc=bhelgaas@google.com \
--cc=helgaas@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=qiuxu.zhuo@intel.com \
--cc=rafael.j.wysocki@intel.com \
--cc=sathyanarayanan.kuppuswamy@intel.com \
--cc=seanvk.dev@oregontracks.org \
--cc=tony.luck@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).