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.7 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=unavailable 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 C8A21C4742C for ; Mon, 16 Nov 2020 17:10:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8A7992224F for ; Mon, 16 Nov 2020 17:10:40 +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="zGq4R32C" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732572AbgKPRKd (ORCPT ); Mon, 16 Nov 2020 12:10:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41502 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729841AbgKPRKd (ORCPT ); Mon, 16 Nov 2020 12:10:33 -0500 Received: from mail-qt1-x843.google.com (mail-qt1-x843.google.com [IPv6:2607:f8b0:4864:20::843]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E2419C0613CF for ; Mon, 16 Nov 2020 09:10:32 -0800 (PST) Received: by mail-qt1-x843.google.com with SMTP id g15so13357621qtq.13 for ; Mon, 16 Nov 2020 09:10:32 -0800 (PST) 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:content-transfer-encoding; bh=x72RPnvcZQrq4B1bODPljxMr+0GZzaGWEw6swyrl9Wk=; b=zGq4R32CvDspJZ028Zj0Uh4j9cx+kgs6/j/Fnvn6ifCfz8cmDKZDlMvu15Dlh6o0MO p1FhmaRxZofqzbqw3C9rsTOSFljfou6jqgNp71Wc0u2LjXwayZ6jGBCR/9SEuTAIik+1 cj/uEIYHSjnjebNplDNICFwPO4EGke9tKhmQ2G0ZC9jwrZ0D8mg4aXoG3xJx4gdIoSkz hyEyXoxWCkdwVtJ22KCrWLCfHDgB+vCoit/BoKp+FvS2PVn/QWVupdb9OR/i1yuirqZw lBUGWrP+wNz6IexMjv/125n6jU6YkV9RpAeirYFEZE40AsuY4BOmxhQDkuVgkVn3yyQR kypg== 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:content-transfer-encoding; bh=x72RPnvcZQrq4B1bODPljxMr+0GZzaGWEw6swyrl9Wk=; b=BujdXZgKBJ4XKMfv0Fq5n2Tmq1ZvMbypU7F9yJ7ypPMS6E8LK3+usE2Ix62EOvm50P JmSUyTEreNARhpCzxrRVvTPaxI9e6df8ngsapiI6fvdbG/N1/lDN70zS3rbPCxeN8kBl zEnsCeEwGBzX4ZKAsAyxXd1kopU+IBXgE7aD2LjqirbG/1pKe0mATyNkOF+xPHEwhJxO vPhn8N/y1W9LOX6qzouHvn8SyagEQ4Kd4RdNLnv8vM1yz63UvIdKTBjGGSt+FgYlmPX5 cbJEaSZJ1aeoAq4mvYdE3ddiKKmYGo7O3Ql4pIbpdsP7y04Ot/1f0rZf2W8l8CcZj447 kA5g== X-Gm-Message-State: AOAM531Kep8MxrZpjI9zN+jfnoNnLaqFcm9l4NVPZeOv0hrxGFcxWp10 /4DTA+52t59vrLpMiKdyUiX8ew== X-Google-Smtp-Source: ABdhPJz5CyKQHXsmSQHjq5fTsnlBef8Fon2OcyViVRMVHrBOVIHsi49nThD+kCb+Zjp33aVbIsOCLw== X-Received: by 2002:ac8:5ccc:: with SMTP id s12mr14807102qta.309.1605546632041; Mon, 16 Nov 2020 09:10:32 -0800 (PST) Received: from [192.168.1.100] (c-24-20-148-49.hsd1.or.comcast.net. [24.20.148.49]) by smtp.gmail.com with ESMTPSA id q32sm8068247qtb.71.2020.11.16.09.10.29 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Nov 2020 09:10:31 -0800 (PST) From: "Sean V Kelley" To: "Bjorn Helgaas" Cc: bhelgaas@google.com, Jonathan.Cameron@huawei.com, xerces.zhao@gmail.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 V3] AER: aer_root_reset() non-native handling Date: Mon, 16 Nov 2020 09:10:28 -0800 X-Mailer: MailMate (1.13.2r5673) Message-ID: <43FBC4C0-BAC1-468A-AE59-173C8447F630@intel.com> In-Reply-To: <20201114153718.GA1170994@bjorn-Precision-5520> References: <20201114153718.GA1170994@bjorn-Precision-5520> MIME-Version: 1.0 Content-Type: text/plain; format=flowed Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 14 Nov 2020, at 7:37, Bjorn Helgaas wrote: > On Wed, Nov 04, 2020 at 03:22:44PM -0800, Sean V Kelley wrote: >> If an OS has not been granted AER control via _OSC, then >> the OS should not make changes to PCI_ERR_ROOT_COMMAND and >> PCI_ERR_ROOT_STATUS related registers. Per section 4.5.1 of >> the System Firmware Intermediary (SFI) _OSC and DPC Updates >> ECN [1], this bit also covers these aspects of the PCI >> Express Advanced Error Reporting. Based on the above and >> earlier discussion [2], make the following changes: >> >> Add a check for the native case (i.e., AER control via _OSC) >> >> Note that the current "clear, reset, enable" order suggests that the >> reset might cause errors that we should ignore. Lacking historical >> context, these will be retained. >> >> [1] System Firmware Intermediary (SFI) _OSC and DPC Updates ECN, Feb = >> 24, >> 2020, affecting PCI Firmware Specification, Rev. 3.2 >> https://members.pcisig.com/wg/PCI-SIG/document/14076 >> [2] = >> https://lore.kernel.org/linux-pci/20201020162820.GA370938@bjorn-Precis= ion-5520/ >> >> Signed-off-by: Sean V Kelley > > What do I do with this patch in combination with "[PATCH v10 00/16] > Add RCEC handling to PCI/AER"? I tried applying this and the RCEC > series on top, but they conflict. > > I was thinking it would be easiest to include this as the first patch > in the series so I wouldn't have to resolve the conflicts, but maybe > you had something else in mind? It originally did rebase but the last minute %s/root/dev changes may = have broke the rebase. Will fix and submit as the first patch in the RCEC series. > >> --- >> Changes since V2 : >> >> Fixed an unfortunate copy/paste error. >> >> Changes since V1 [1]: >> >> Noted lack of historical context on isolation of both the >> pci_bus_error_reset() and the clearing of Root Error Status. In fact, >> the call to aer_enable_rootport() likewise disables system error = >> generation >> in response to error messages around the clearing of the error = >> status. So >> retained the wrapping of the "clear, reset, enable". >> >> [1] = >> https://lore.kernel.org/linux-pci/20201030223443.165783-1-sean.v.kelle= y@intel.com/ >> >> Thanks, >> >> Sean >> --- >> drivers/pci/pcie/aer.c | 31 +++++++++++++++++-------------- >> 1 file changed, 17 insertions(+), 14 deletions(-) >> >> diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c >> index 65dff5f3457a..4ab379fa1506 100644 >> --- a/drivers/pci/pcie/aer.c >> +++ b/drivers/pci/pcie/aer.c >> @@ -1358,26 +1358,29 @@ static int aer_probe(struct pcie_device *dev) >> static pci_ers_result_t aer_root_reset(struct pci_dev *dev) >> { >> int aer =3D dev->aer_cap; >> + int rc =3D 0; > > Unnecessary init, I think. Will remove init. Thanks, Sean > >> u32 reg32; >> - int rc; >> - >> >> - /* Disable Root's interrupt in response to error messages */ >> - pci_read_config_dword(dev, aer + PCI_ERR_ROOT_COMMAND, ®32); >> - reg32 &=3D ~ROOT_PORT_INTR_ON_MESG_MASK; >> - pci_write_config_dword(dev, aer + PCI_ERR_ROOT_COMMAND, reg32); >> + if (pcie_aer_is_native(dev)) { >> + /* Disable Root's interrupt in response to error messages */ >> + pci_read_config_dword(dev, aer + PCI_ERR_ROOT_COMMAND, ®32); >> + reg32 &=3D ~ROOT_PORT_INTR_ON_MESG_MASK; >> + pci_write_config_dword(dev, aer + PCI_ERR_ROOT_COMMAND, reg32); >> + } >> >> rc =3D pci_bus_error_reset(dev); >> - pci_info(dev, "Root Port link has been reset\n"); >> + pci_info(dev, "Root Port link has been reset (%d)\n", rc); >> >> - /* Clear Root Error Status */ >> - pci_read_config_dword(dev, aer + PCI_ERR_ROOT_STATUS, ®32); >> - pci_write_config_dword(dev, aer + PCI_ERR_ROOT_STATUS, reg32); >> + if (pcie_aer_is_native(dev)) { >> + /* Clear Root Error Status */ >> + pci_read_config_dword(dev, aer + PCI_ERR_ROOT_STATUS, ®32); >> + pci_write_config_dword(dev, aer + PCI_ERR_ROOT_STATUS, reg32); >> >> - /* Enable Root Port's interrupt in response to error messages */ >> - pci_read_config_dword(dev, aer + PCI_ERR_ROOT_COMMAND, ®32); >> - reg32 |=3D ROOT_PORT_INTR_ON_MESG_MASK; >> - pci_write_config_dword(dev, aer + PCI_ERR_ROOT_COMMAND, reg32); >> + /* Enable Root Port's interrupt in response to error messages */ >> + pci_read_config_dword(dev, aer + PCI_ERR_ROOT_COMMAND, ®32); >> + reg32 |=3D ROOT_PORT_INTR_ON_MESG_MASK; >> + pci_write_config_dword(dev, aer + PCI_ERR_ROOT_COMMAND, reg32); >> + } >> >> return rc ? PCI_ERS_RESULT_DISCONNECT : PCI_ERS_RESULT_RECOVERED; >> } >> -- >> 2.29.2 >>