From patchwork Tue Mar 4 07:07:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?5a2Z5Yip5paMX0Rpbw==?= X-Patchwork-Id: 14001372 X-Patchwork-Delegate: bhelgaas@google.com Received: from CHN02-BJS-obe.outbound.protection.partner.outlook.cn (mail-bjschn02on2101.outbound.protection.partner.outlook.cn [139.219.17.101]) (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 A75761E8329; Tue, 4 Mar 2025 20:44:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=139.219.17.101 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741121084; cv=fail; b=Vlj+jyCmlZ/qX+jE9bB9fXbe3IJdkaoSSlR75KR8oD98QZvw5WGHqQrkHDb9BhNh0DE/DF78PDwgc30VcyXzzvPNPCynfVUqoyKktsqiglvNK6XzxXG3UX1V+/6fFRe58Oz8ADYuQbgIklVNw4F6ikhwENHIgnOETXjUhNP37uk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741121084; c=relaxed/simple; bh=WAHC7QID1LIft4Ndg0HNki/KHcSw8p6UggfSTkspDHM=; h=From:To:CC:Subject:Date:Message-ID:Content-Type:MIME-Version; b=fpZ0Vbdn4LhheIE7UK3PyjgOvC69R3Y+crZNBOvslvjTAwVg7DxfhqTXZKhytvVJqc2q/G5/8lsWDXJYdXPLqdZ1XW36YDO6yFVbibjTHocDhHKMaH/baUvJR13IrzbOgb122XIsQ7msebTmvrL4w6itj/tzEd0QidIZBtEuWLc= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=enflame-tech.com; spf=pass smtp.mailfrom=enflame-tech.com; dkim=pass (1024-bit key) header.d=Enflame.partner.onmschina.cn header.i=@Enflame.partner.onmschina.cn header.b=Raa+L0IP; arc=fail smtp.client-ip=139.219.17.101 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=enflame-tech.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=enflame-tech.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=Enflame.partner.onmschina.cn header.i=@Enflame.partner.onmschina.cn header.b="Raa+L0IP" Received: from BJXPR01MB0839.CHNPR01.prod.partner.outlook.cn (10.43.36.140) by SH0PR01MB0844.CHNPR01.prod.partner.outlook.cn (10.43.106.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.15; Tue, 4 Mar 2025 18:11:34 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DmwmqHZk6PPD+KS3e1ivy1Zu4E/Lga7053bBCVFxRsYFeCbHygGTU/Cjb2l/jV4LM9NvxhD71pVST0nieI7qn/9W/uDnTGmn+WT0VbrlkAqzsUHIrvgYMtWBydEvci0ZC3gG1gUP24S6oQmG5fGvcQXKH1YezWsGMcoLRZfi/SsPWdlyyXT4EZX+RP28UPhavrHYx0lcAnCyccG8515lUS4QSoZna2QGAG2pgDnmaC948gO9kDbDqnm2oozBOIFlgqguWptD2uui18gegz1J9i7G76hhHzIfmNzQqmWv4GGM6TRDGFjLddxHnLApcM9NY8LTMROPD4Ge95RSgFCO/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Crv9CQ4Ux9sMJKasrKodGTKeVvSHxTIJp+VaSJowfdI=; b=DwPNT5jfX0tKtigZoOcKnRWa1ZvRdweAhjHnSom7kKP510N/PMm+xJE/4bQbpp5uDohyuYiilps0IJWHd/2/c1GKS4X9ufk1CmHzWj4X5LVT08lzsOkMwQjNTKXkiXZrBNcuxFt3VQkYkxDo3tZ4cnfzQk5s3qaKGowCFxeW1XdwCxOZvMJvGtcygVpe3+iH7CrZr3YCNVWC5Fa1K8IP5zwzhl7o5wCEcE8NKYdTaaxyH9Ybr5Yl2X6aPRkZ9xkDutP5e/g8xPndPKT1i6GXt8WLTE/kqJ2p1ymsAGqZNZ00BrpSe9KlYS86ih19E+DNS3FfRWuBuGRUlCn0kXesug== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=enflame-tech.com; dmarc=pass action=none header.from=enflame-tech.com; dkim=pass header.d=enflame-tech.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Enflame.partner.onmschina.cn; s=selector1-Enflame-partner-onmschina-cn; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Crv9CQ4Ux9sMJKasrKodGTKeVvSHxTIJp+VaSJowfdI=; b=Raa+L0IPMI5MUapjQ3nzfhFP8jI+MKHrT3aaNuUDbVEMr+hziu6ej7qg8R+Tbea/4rRs7f00YU2A2TjedLm3KPtCVfCYwy8HjgiUMMBGqQWAISm9Tarmet75R/mBV9uhGV/tWRS3TIOA8xPWakRn1QMdBT3G1yLbJ4pFJegYNGg= Received: from BJXPR01MB0614.CHNPR01.prod.partner.outlook.cn (2406:e500:c211:14::23) by BJXPR01MB0839.CHNPR01.prod.partner.outlook.cn (2406:e500:c211:1a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11; Tue, 4 Mar 2025 07:07:05 +0000 Received: from BJXPR01MB0614.CHNPR01.prod.partner.outlook.cn ([fe80::5b17:45cb:d82e:e7b9]) by BJXPR01MB0614.CHNPR01.prod.partner.outlook.cn ([fe80::5b17:45cb:d82e:e7b9%6]) with mapi id 15.20.8489.028; Tue, 4 Mar 2025 07:07:05 +0000 From: =?eucgb2312_cn?b?y+/A+7HzX0Rpbw==?= To: "mahesh@linux.ibm.com" , "oohall@gmail.com" , "bhelgaas@google.com" , "linuxppc-dev@lists.ozlabs.org" , "linux-pci@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: =?eucgb2312_cn?b?wt6wsl9Bbg==?= , =?eucgb2312_cn?b?uvq7tF9GZXJuYW5kbw==?= , =?eucgb2312_cn?b?zuLwqe6jX0JpbGw=?= , =?eucgb2312_cn?b?zfX2zl9YaW4=?= Subject: [PATCH] AER: PCIE CTO recovery handle fix Thread-Topic: [PATCH] AER: PCIE CTO recovery handle fix Thread-Index: AduM0OzqFOcTufgFSYi2gnnVja5sWw== Date: Tue, 4 Mar 2025 07:07:05 +0000 Message-ID: Accept-Language: en-US Content-Language: zh-CN X-MS-Has-Attach: yes X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=enflame-tech.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: BJXPR01MB0614:EE_|BJXPR01MB0839:EE_|SH0PR01MB0844:EE_ x-ms-office365-filtering-correlation-id: 0cc6d9d8-3a93-4b91-5979-08dd5aeb2b96 x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0;ARA:13230040|1800799024|41320700013|366016|38070700018|4053099003; x-microsoft-antispam-message-info: U+IbM/Jpfaz3k1AvqHODlJGb4V5DJXxhQVmZ7Ezf26QHLNzAVZuSv16hiuraGKERf/JKetm2+3VRY5OEB8as78SlkW2q0sb985FMpadveC0VRgSGy13PKEV3mKfLni7ObYug4nEeBODCOr8ZAqrRFtq/Znq2GTFJIoDD1ny6zqgJemYN5qbJwJ1AO7+4iXIiPimeUyhe4Qf7/H5qqBb+xValYDLvIYZnXqERKHIsMLoSQtYvpdfFR06hO+sg/TUWRKfI1IyT2E+97t7Xo62ggXCCVqnNhaTrmBBbO4WonGglWv6alzyweuhaMOe+dr+vMQKMq3QWKuzQWzOIKHxkr6FkBCMURjLcMzXWAHWxu76t12PjqXAr1qr1cBACgml76NZCHNMfRJFYa+m2LOEdZqs0cbNCNXkFsmohnXcyGsq7+GuKVQgGGFsohSPANP/jxZEcl4htXorhBpPi/drjaMPbX4w50hab5tMxueB3B2FqIBmismbnpEforzixOv9CDJwodNIKa3wTYFD+Uamhoi1EuiEOH8S3nsTraWsTl/ttGXknGRtIGtpHmBPW7sEbGeBsmifCL2Oja8g+/t6cZQ== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:zh-cn;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BJXPR01MB0614.CHNPR01.prod.partner.outlook.cn;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(41320700013)(366016)(38070700018)(4053099003);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?eucgb2312_cn?b?KzFScVBhREtma1FBRlZBemx6?= =?eucgb2312_cn?b?NzVPSzhuRnFvditKcGxQLzQ4NjRLUWxRdDRJS3MveWd4ZTNQZWxncStOdU93SnRV?= =?eucgb2312_cn?b?L0xncVpiRDhXL2M0Mjd2aGpaVmFnTmNLc2JXdGkzTTJqcXRldEFWWndYUTBCM0hp?= =?eucgb2312_cn?b?RUh6LzVyczdPTWFlaWZoeWVjV1FseWx1MFRHNmIyNFJrK1M4OGNoRkZMUWJWTmhq?= =?eucgb2312_cn?b?dytKVTZjWEo3UzNOWjBsdUVmSVdwRCtObzJjcjE0RWdhVDhWTnZXcmpSMEVRQkFX?= =?eucgb2312_cn?b?MkxPL2VacmNOZXNiUTVVTEt6QVFjTE0wUlZMK1lOOXRmVzEybTVaY3RVdlFJR3pp?= =?eucgb2312_cn?b?VzZlOFdzY3ZvMG1nYkNCbXg0RWUwUU5jbWx6UE9maHpnSUVjbHE2NVdkOGxVMnVW?= =?eucgb2312_cn?b?YWhlc01Pd1FiTDk3T09xWHFveWJTZnUxOUptTWpzYjlHaWZHOVM4bWVPTVVvZHpI?= =?eucgb2312_cn?b?NFAzZ3BXRFBVY3R2UWkxeTV6MlBjMU5Qa3JGSVdXdERQRUpXRkMyZm05eWdoUlpY?= =?eucgb2312_cn?b?RDAxaStNUzgwT0xMNGZ1UzU3REgrby9EYjB5cThqU0JCVVEwUmxGclFHMHRqemtq?= =?eucgb2312_cn?b?OUxsTGhlL0YxZG9qTXB6TWFvcWFna3pEZFJNVUNqUTZuUEJBaVZUdG1hTzJkMVQz?= =?eucgb2312_cn?b?K3c2SUdwMWZxeW10MzBQS1VzWUluWkorNk0vazRhNnRVZVl2Zm1BYk9wbktUWllJ?= =?eucgb2312_cn?b?WGZkbFN5Q3YyNHFrN0w2K2lMTXYrR2Jtb1VTZXI3T2hBMGppbmRFVkhGNjNyZjdy?= =?eucgb2312_cn?b?Z0h3SnlZME84VnJvbGJRc1BZZkljY3pMR3RJbUhDS2RCZXRXM1JHRnpUY0pJeE5P?= =?eucgb2312_cn?b?TDMyRjJTNlQybStSZVg5NFIrTm5VY1NOenNacGZXL09nVllTUlJEK1dVM0pFSy9F?= =?eucgb2312_cn?b?Vkd1WS9TNkl5elRGTlY2YXVVRzI3UHJFQ1pUa0lTRjQ2Q3pOMmdVdGM4WDBIaE1h?= =?eucgb2312_cn?b?QWMrdERQNFpadnNORzVQK2FlZkZCdnZrUlBLTlFMa2JJZDZzVFZ0VzhNYnZkZjBT?= =?eucgb2312_cn?b?YUwvR1hCN0czSFFXVXdqNStlUWswdWUzUDhRV2ZRUGp0ZTFtd2daWjR3RE5SMmFG?= =?eucgb2312_cn?b?WkE5NkFEZjE5bWxMcUs4NkMrTEhUdkc0bTFWeUY3aTUrMEZSQmthNnhvdG1maUh5?= =?eucgb2312_cn?b?T25XLzM2NTZnVnlPUXRYTUZvdTNZbkk3U0xqcVBpNFRaT3pLbXF5b0J4RFB4bktZ?= =?eucgb2312_cn?b?VmllN2dxZ2lmVVR5WUpwWXBIUmlkYXpUY2xoRi9rMkl6TkkxTVppZUU3dEYzblZu?= =?eucgb2312_cn?b?L0F6Q1p4aHJib0NKVUhyaHVwK3B4Y3d6L2hUV3NQMW9wOXZzMnR0SndINlV1Ukpx?= =?eucgb2312_cn?b?MkFNQ3JCeWh4dExTNE5YdmsxVElXKzQ4cDhqSzlVa3d4MEFXbWZWQ1UvaWVhdERU?= =?eucgb2312_cn?b?VnFMYUlNT0VVZ2ltd3gwb0U1bzBxd0dnZ2dpZVhtcXprdG1STGNOMVNEcmk5ZytS?= =?eucgb2312_cn?b?YWhiM2o3V2wza2ZOdlJhZHBXNWtBL0FjcG5SSEJNcEQvS3ZrQWdHMGthYjJJRDdM?= =?eucgb2312_cn?b?Tk5PUWhqbkJnc0doVXFEL2xScDdyNUIzN1RicnM4VUJacFJ3a24rSVdCcVY1aWRY?= =?eucgb2312_cn?b?LytaQ2tRYUw4dEhtK05TZ2hURmlSOFFxNGxtSC9ZRnhSdFQwQ2piUTU2QVI2V2o1?= =?eucgb2312_cn?b?YkZjK1JHSlBxOUplZ3VjS3dJcXIvdFQvQ3p5djhyOHhDakVuZEpnTjN0TlZRRkhH?= =?eucgb2312_cn?b?YTdFTkh1V09RSkt5N1pUdU5ha1NLMDErK1JUbzBHUHV6VHNFWG52Vmo0cStYNU9V?= =?eucgb2312_cn?b?SEdWQzFTVDV4UTkzOXNBekxuU1R6RnB3WWNJaDRaMzQ4Z0RnNHVpa2ZseXZMc2Rm?= =?eucgb2312_cn?b?MU0zU2RhSHV0c2gvZFFlS3dGeG53MDlGZWwwK3pqMGxjZi9Jb1NUakVKVEhqYmVT?= =?eucgb2312_cn?b?YnhkQUdUL1drSFIydi9FTGg5S1laaUpJY2JoVkJkT3VySTRCRndkMnZBL0VxbXFC?= =?eucgb2312_cn?b?Y1VtR2FoYlEra1hQMEU1QUo3ZHNjdCt2YkZHNjc3S0JYTDNDaFJkRDZ2dE5PVHFX?= =?eucgb2312_cn?b?bUljYTJiR0N5QWhoME9RWDY2RjVwc292WHZGdHJOWUE0akVRYnAweFpBYVdRMA==?= Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BJXPR01MB0614.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-Network-Message-Id: 0cc6d9d8-3a93-4b91-5979-08dd5aeb2b96 X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Mar 2025 07:07:05.1547 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 39d6d270-c813-4e78-90db-1de0de08f579 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: hrQlK+uEmGpSwK4sVzsbdrgIlgkCu20h9sRQAQEvRfLMi+QApQsuQF++ZH9y+rfVS5bXXqGuv+kf9wb0425070AiWujvVQK9HZfaueZ1/rw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BJXPR01MB0839 X-OriginatorOrg: enflame-tech.com [EXTERNAL EMAIL] From 5fc7b1a9e0f0bcfa14068c6358019ed1e3ffc6c6 Mon Sep 17 00:00:00 2001 From: "dio.sun" Date: Wed, 26 Feb 2025 08:54:49 +0000 Subject: [PATCH] AER: PCIE CTO recovery handle fix - Non-fatal PCIe CTO is reportted to PCIE RC and it will be convertted to AdvNonFatalErr automatically - according to PCIE SPEC 6.2.3.2.4.4 Requester with Completion Timeout( If the severity of the CTO is non-fatal, and the Requester elects to attempt recovery by issuing a new request, the Requester must first handle the currecnt error case as an Advisory Non-Fatal Error.). - Current Kernel code does nothing when receiving an AdvNonFatalErr( Correctable Error) and the device driver has no chance to handle this error. - Under this situation, sometimes system will hang when more AdvNonFatalErr coming. Signed-off-by: dio.sun --- drivers/pci/pcie/aer.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) -- 2.37.3 diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c index 508474e17183..5ddc990c6f42 100644 --- a/drivers/pci/pcie/aer.c +++ b/drivers/pci/pcie/aer.c @@ -1154,7 +1154,21 @@ static void aer_recover_work_func(struct work_struct *work) ghes_estatus_pool_region_free((unsigned long)entry.regs, sizeof(struct aer_capability_regs)); - if (entry.severity == AER_NONFATAL) + if (entry.severity == AER_CORRECTABLE) { + if (entry.regs->cor_status & PCI_ERR_COR_ADV_NFAT) { + pci_err(pdev, "%04x:%02x:%02x:%x advisory non-fatal error\n", + entry.domain, entry.bus, PCI_SLOT(entry.devfn), + PCI_FUNC(entry.devfn)); + if (entry.regs->uncor_status & PCI_ERR_UNC_COMP_TIME) { + pci_err(pdev, "%04x:%02x:%02x:%x completion timeout\n", + entry.domain, entry.bus, + PCI_SLOT(entry.devfn), + PCI_FUNC(entry.devfn)); + pcie_do_recovery(pdev, pci_channel_io_frozen, + aer_root_reset); + } + } + } else if (entry.severity == AER_NONFATAL) pcie_do_recovery(pdev, pci_channel_io_normal, aer_root_reset); else if (entry.severity == AER_FATAL)