From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6E0F713C67C; Wed, 6 Nov 2024 16:39:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730911175; cv=none; b=hGUDRqulQ0UKNepwbUNXfnCs3m7oCzQ5bqhf618SYiPDTJPlTBYh6wUqa4i8Vk0swkzyhQBk0sjf9ztFN6wG/B9INJrUEQrSql25iscEzkTxoBxToqhWKIbv0a5WyH6CKBcTgF+T+niN97Ydyk4ejdk/BQtJiEspPCTCJ70J+P8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730911175; c=relaxed/simple; bh=qgyfwsgI0NGyv3rTn5MDG6QtmrGNHZk4smbSHtOhvkU=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=l6tLL4pKre6LGLV3Jjfy8DjWlAR/+wU0EKAuNbq7Uj9GFGTulw7ty1A7BvW0oesA37pXEJ13N6s8HjQ4p9jKSQMuMaulEsB8Ar3skDIcWErh3wxt63uzHKnBWDcKdqY42HVDSGoWk7DCCY9hTIahl8nW/Q1YC290SJlmXVCa3zA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LhGoVNcM; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="LhGoVNcM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AABC1C4CEC6; Wed, 6 Nov 2024 16:39:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1730911175; bh=qgyfwsgI0NGyv3rTn5MDG6QtmrGNHZk4smbSHtOhvkU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=LhGoVNcMYeHEA4ME2kQFjw1bmyNAIEA2RYwH55JxP901y/PHC72sdYajCH6JQjjtO zyApsTGwQYYdBNjLScNkKrFHAH8m6c6jDBOijF36PL/NewB3xFe21DIajIWk22hIVE S+RjiJ0b9/FSGt8IkgN1KjVpPFdw3C2+o3wbfAXFrLMvY4MvAJ3lbcU1+ldUZQuppL 9CJHiGk3BUEZDi+kNQlMpZheWyKV+kj5LR07o644tWRMARQDHYdQqQu9cjsazEaFxv njgVulySb9zQBHq+ZwkrRal5sl5/m6I6ybq54vN5dcWq/G4joas37wisZ6X3ykhmIB xkwBtrZpi1vKQ== Date: Wed, 6 Nov 2024 09:39:32 -0700 From: Keith Busch To: Shuai Xue Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, bhelgaas@google.com, mahesh@linux.ibm.com, oohall@gmail.com, sathyanarayanan.kuppuswamy@linux.intel.com Subject: Re: [RFC PATCH v1 2/2] PCI/AER: report fatal errors of RCiEP and EP if link recoverd Message-ID: References: <20241106090339.24920-1-xueshuai@linux.alibaba.com> <20241106090339.24920-3-xueshuai@linux.alibaba.com> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20241106090339.24920-3-xueshuai@linux.alibaba.com> On Wed, Nov 06, 2024 at 05:03:39PM +0800, Shuai Xue wrote: > +int aer_get_device_fatal_error_info(struct pci_dev *dev, struct aer_err_info *info) > +{ > + int type = pci_pcie_type(dev); > + int aer = dev->aer_cap; > + u32 aercc; > + > + pci_info(dev, "type :%d\n", type); > + > + /* Must reset in this function */ > + info->status = 0; > + info->tlp_header_valid = 0; > + info->severity = AER_FATAL; > + > + /* The device might not support AER */ > + if (!aer) > + return 0; > + > + > + if (type == PCI_EXP_TYPE_ENDPOINT || type == PCI_EXP_TYPE_RC_END) { > + /* Link is healthy for IO reads now */ > + pci_read_config_dword(dev, aer + PCI_ERR_UNCOR_STATUS, > + &info->status); > + pci_read_config_dword(dev, aer + PCI_ERR_UNCOR_MASK, > + &info->mask); > + if (!(info->status & ~info->mask)) > + return 0; > + > + /* Get First Error Pointer */ > + pci_read_config_dword(dev, aer + PCI_ERR_CAP, &aercc); > + info->first_error = PCI_ERR_CAP_FEP(aercc); > + > + if (info->status & AER_LOG_TLP_MASKS) { > + info->tlp_header_valid = 1; > + pcie_read_tlp_log(dev, aer + PCI_ERR_HEADER_LOG, &info->tlp); > + } This matches the uncorrectable handling in aer_get_device_error_info, so perhaps a helper to reduce duplication. > + } > + > + return 1; > +} Returning '1' even if type is root or downstream port? > static inline void aer_process_err_devices(struct aer_err_info *e_info) > { > int i; > diff --git a/drivers/pci/pcie/err.c b/drivers/pci/pcie/err.c > index 31090770fffc..a74ae6a55064 100644 > --- a/drivers/pci/pcie/err.c > +++ b/drivers/pci/pcie/err.c > @@ -196,6 +196,7 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev *dev, > struct pci_dev *bridge; > pci_ers_result_t status = PCI_ERS_RESULT_CAN_RECOVER; > struct pci_host_bridge *host = pci_find_host_bridge(dev->bus); > + struct aer_err_info info; > > /* > * If the error was detected by a Root Port, Downstream Port, RCEC, > @@ -223,6 +224,10 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev *dev, > pci_warn(bridge, "subordinate device reset failed\n"); > goto failed; > } > + > + /* Link recovered, report fatal errors on RCiEP or EP */ > + if (aer_get_device_fatal_error_info(dev, &info)) > + aer_print_error(dev, &info); This will always print the error info even for root and downstream ports, but you initialize "info" status and mask only if it's an EP or RCiEP.