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=-3.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no 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 416C5C3A589 for ; Fri, 16 Aug 2019 01:54:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 18D182064A for ; Fri, 16 Aug 2019 01:54:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726466AbfHPByt (ORCPT ); Thu, 15 Aug 2019 21:54:49 -0400 Received: from smtprelay0201.hostedemail.com ([216.40.44.201]:57239 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726441AbfHPByt (ORCPT ); Thu, 15 Aug 2019 21:54:49 -0400 Received: from filter.hostedemail.com (clb03-v110.bra.tucows.net [216.40.38.60]) by smtprelay03.hostedemail.com (Postfix) with ESMTP id E40F28368F04; Fri, 16 Aug 2019 01:54:47 +0000 (UTC) X-Session-Marker: 6A6F6540706572636865732E636F6D X-HE-Tag: rat37_46c176f4ee23b X-Filterd-Recvd-Size: 2840 Received: from XPS-9350.home (cpe-23-242-196-136.socal.res.rr.com [23.242.196.136]) (Authenticated sender: joe@perches.com) by omf05.hostedemail.com (Postfix) with ESMTPA; Fri, 16 Aug 2019 01:54:46 +0000 (UTC) Message-ID: <11b7c586136241512668b23656cbc2e088920117.camel@perches.com> Subject: Re: [PATCH v6 1/9] PCI/ERR: Update error status after reset_link() From: Joe Perches To: Bjorn Helgaas , sathyanarayanan.kuppuswamy@linux.intel.com Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, ashok.raj@intel.com, keith.busch@intel.com Date: Thu, 15 Aug 2019 18:54:44 -0700 In-Reply-To: <20190815221629.GI253360@google.com> References: <6be594215ae2ea0935d949537bfb84ff9e656a36.1564177080.git.sathyanarayanan.kuppuswamy@linux.intel.com> <20190815221629.GI253360@google.com> Content-Type: text/plain; charset="ISO-8859-1" User-Agent: Evolution 3.30.5-0ubuntu0.18.10.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org On Thu, 2019-08-15 at 17:16 -0500, Bjorn Helgaas wrote: > On Fri, Jul 26, 2019 at 02:43:11PM -0700, sathyanarayanan.kuppuswamy@linux.intel.com wrote: > > From: Kuppuswamy Sathyanarayanan > > > > Commit bdb5ac85777d ("PCI/ERR: Handle fatal error recovery") uses > > reset_link() to recover from fatal errors. But, if the reset is > > successful there is no need to continue the rest of the error recovery > > checks. Also, 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(). [] > > diff --git a/drivers/pci/pcie/err.c b/drivers/pci/pcie/err.c [] > > @@ -204,9 +204,13 @@ 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; > > + else > > + goto done; > > This will be easier to read without the negation, i.e., > > if (status == PCI_ERS_RESULT_RECOVERED) > goto done; > else > goto failed; bikeshed: I think it'd be easier to read without the else status = reset_link(dev, service); if (status != PCI_ERS_RESULT_RECOVERED) goto failed; goto done;