From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E1AFEC4727E for ; Fri, 25 Sep 2020 22:54:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A4304208B6 for ; Fri, 25 Sep 2020 22:54:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=intel-com.20150623.gappssmtp.com header.i=@intel-com.20150623.gappssmtp.com header.b="ZSR2acP+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729178AbgIYWyX (ORCPT ); Fri, 25 Sep 2020 18:54:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47800 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727067AbgIYWyX (ORCPT ); Fri, 25 Sep 2020 18:54:23 -0400 Received: from mail-pj1-x1042.google.com (mail-pj1-x1042.google.com [IPv6:2607:f8b0:4864:20::1042]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 17BC3C0613CE for ; Fri, 25 Sep 2020 15:54:23 -0700 (PDT) Received: by mail-pj1-x1042.google.com with SMTP id bw23so240069pjb.2 for ; Fri, 25 Sep 2020 15:54:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version; bh=RoKnACgaWS5LzdU+6sscBou6/I159ovfqzEP7aVaDzw=; b=ZSR2acP+CjWXpmgSTWJ0R4K9ppi11L/dMv8tich8Ohu20GiJQ4yFSl/qE6v97cTogY 9/JdhN3ybLiVotWGiDvBIDzMQJJWONX/JgBXJKRuGTJ+y5XUjqKJ0fcDhTC70uFUbksj zQLs0q5qZDoVkuOwwO6xFHC7iyX1+iLU6H/qOy8y9QlpMBuZIayrU9H7KvT0YWfFWvy9 eyp6tLlV3dsVlLkwR/2gpx3Y4R6cGjk+52UkXqOLPhF8XsWiY+HdtMhwGFvO26oLH7Qn mtlmLcYp2LDv5twvxEEAtgH9EaxWIlqhu9epX6FgVti34KE5cPC1Ik4rwbao3JMfJD8c CbdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version; bh=RoKnACgaWS5LzdU+6sscBou6/I159ovfqzEP7aVaDzw=; b=gDlmH+gy8m2GeyyKDfHEhDvv4lIwNajtWEoNdCELeyylLGkw6qu3hGBZDI/4oRFQqo aiBZQYF680qdopVwX4sVkCZ8dtze+5l9ft3MLTz5S+7ZhkL7nxQimFRpWre18Sjicuss 6Z0UzUXC7ibeG78sScJkBT3BiTKLTkRKt0ZyEVJCKNnCpNPZ42uLnYDXqQiQF2zxjlNz ET6JWrXBx0v7lgF9hJXCO1gVy1+7n1TtIU0Gd+sMGEu1H4oRifErUjiUau60/jyPJc3x wd+alWRzCz/HTi0HRP783G4xuL5hYGeb4B5B9mgJR/57vjTEPpwkTMqVTyGuuTKVK5q/ fGZA== X-Gm-Message-State: AOAM533TPwIsWCWKlahvb3+RwlpA1eqVtW/rdn9V3zvz1Yt+T+Q1xp4b qL8kyV1sxLPaU9UNd4OzFj8ncA== X-Google-Smtp-Source: ABdhPJxmkfAHo35d3Rc3VorQdYYJb5d61Taw5jSIa2vfo+izYhZie5MHIXq8d6TH7Qt7XXJovJkprw== X-Received: by 2002:a17:90b:80a:: with SMTP id bk10mr688415pjb.53.1601074462667; Fri, 25 Sep 2020 15:54:22 -0700 (PDT) Received: from [10.212.51.97] ([192.55.54.42]) by smtp.gmail.com with ESMTPSA id c1sm3653798pfj.219.2020.09.25.15.54.20 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Sep 2020 15:54:21 -0700 (PDT) From: "Sean V Kelley" To: "Bjorn Helgaas" Cc: "Sean V Kelley" , 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 X-Mailer: MailMate (1.13.2r5673) Message-ID: In-Reply-To: <20200925215854.GA2460270@bjorn-Precision-5520> References: <20200925215854.GA2460270@bjorn-Precision-5520> MIME-Version: 1.0 Content-Type: text/plain; format=flowed Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 >> >> Attempt to do function level reset for an RCiEP associated with an >> RCEC device on fatal error. >> >> Signed-off-by: Qiuxu Zhuo >> --- >> 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 >>