From patchwork Thu Mar 21 22:55:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Ferguson X-Patchwork-Id: 13599458 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2100.outbound.protection.outlook.com [40.107.236.100]) (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 441116AAD; Thu, 21 Mar 2024 22:56:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.100 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711061787; cv=fail; b=tco6ETpfJUuNO86OTM3pq9nrQeq5buoX0w2GjUkzBOCzc6ExEGMYg5uum6MgHYDE2j36A1CoKVGXEb3Ayc3QZ3gNx3NAFb9D2OnG5lHKvzaS17vTXCc2ITEz6x0qq6d/PDUCSUYGUSsZA91oGDkIbESiYkSPCma6+UiQXEgQoFU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711061787; c=relaxed/simple; bh=0e+ZNND/1HLdervh6GawgcAM64IfHHntx8jjLawhw/E=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=tlmljQtKbTeKpqtPf0pI4mcUONwoYw9AMtewt9fkiXZpBNAs7jg3OiznteYD1PfJSZetnTDOeTR/gIrC7dad3lvBEKPc9vGU1F2PFahr45itiUOBp03121FG9LQV8HQsVMVzRpNtXRnfHZ8Cit+GysVLPttR9tstel413AAALWI= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=os.amperecomputing.com; spf=pass smtp.mailfrom=os.amperecomputing.com; dkim=pass (1024-bit key) header.d=os.amperecomputing.com header.i=@os.amperecomputing.com header.b=vddYI49s; arc=fail smtp.client-ip=40.107.236.100 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=os.amperecomputing.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=os.amperecomputing.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=os.amperecomputing.com header.i=@os.amperecomputing.com header.b="vddYI49s" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=T5teVtPRegGPN8RFYZx9V7Hns+rtujbAKK4wvxHK1gSL/nu1bjVYWEbWV195zd21clq1PvAKdv6QhO5kEIKtAh8YZ6IzEwralrDBBtI+FjhhTnGB6OCMpJLYLnUQL3ZCxQfVDe/Y1sZ85tQIzm0A8V44h16+G3MEcPL64b5cRMbYorBWn7rJ0Ix5Kk6I5Jy9rTKz7Q9Y2dJNxjTeeYqrlVwf45nxoZ3JGZ9MvYJds0mGdyIMKcxPGLafQ9gYTRyXeJEaZlF2KR564cfw6XJo9JwXqo2DkJqnbn6lfO0PEnsOtuLnboXKdCPe/hATGrwx3akUYnZEOvVnQj+sLPe0yw== 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=pUHQyhJ390/RWKvQ91KzEINJVU6IIWUHxxcWU3gYjyo=; b=dBNMuGIcdn2suiy0sXMs296i1WbhCwjWecjHNO0UBDPu7AlcwzHZULRXjaYszYocD/MOG4qrwQ1sn3XTRQqhaXnrhsoTkTW8oOotPO5uWcApZYb77ScXHuF8XoPcPco9yglAbTr2YZ+7wEthPPLCCOfjQLqCHosncC4WIaxAPuoGYD3UoUKDV49TWi65EYNu0tyH+juHzq8t2/R/ga8xHX+x2wQDw161TMOdCNgvI/NVzSuRPSIxMYfGbgCjicQtOnYlHTQ07bGMvlnnbaDbBLHT0fCsQ3qAdd2tIUFcnwnONtjkLDzSj8ooqU61fQcXwOVl5GXOhAvwhMzknRHS/w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=os.amperecomputing.com; dmarc=pass action=none header.from=os.amperecomputing.com; dkim=pass header.d=os.amperecomputing.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=os.amperecomputing.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pUHQyhJ390/RWKvQ91KzEINJVU6IIWUHxxcWU3gYjyo=; b=vddYI49s0X8+zFLtp5YCacCAhsFslx0t+wgE4hk8rp0LlvdaFUH5ezImBut31SEhHABNNTyWEpil9ZfMgOxWmCT5Axr+OaZtvvJ1cjheCRDa2r2HI8o/BsYpor1h+5qXIXc8r9cjQfD+G5jD1k2/kCHfDOZjaZY+B/gOR/7K5hc= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=os.amperecomputing.com; Received: from CO1PR01MB7370.prod.exchangelabs.com (2603:10b6:303:159::16) by PH7PR01MB8668.prod.exchangelabs.com (2603:10b6:510:2fe::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.31; Thu, 21 Mar 2024 22:56:22 +0000 Received: from CO1PR01MB7370.prod.exchangelabs.com ([fe80::994c:4200:8a4b:6882]) by CO1PR01MB7370.prod.exchangelabs.com ([fe80::994c:4200:8a4b:6882%6]) with mapi id 15.20.7386.025; Thu, 21 Mar 2024 22:56:22 +0000 From: Daniel Ferguson Date: Thu, 21 Mar 2024 15:55:53 -0700 Subject: [PATCH v5 1/2] RAS: ACPI: APEI: add conditional compilation to ARM specific error reporting routines. Message-Id: <20240321-b4-arm-ras-error-vendor-info-v5-rc3-v5-1-850f9bfb97a8@os.amperecomputing.com> References: <20240321-b4-arm-ras-error-vendor-info-v5-rc3-v5-0-850f9bfb97a8@os.amperecomputing.com> In-Reply-To: <20240321-b4-arm-ras-error-vendor-info-v5-rc3-v5-0-850f9bfb97a8@os.amperecomputing.com> To: "Rafael J. Wysocki" , Len Brown , James Morse , Tony Luck , Borislav Petkov Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-edac@vger.kernel.org, Daniel Ferguson X-Mailer: b4 0.13.0 X-ClientProxiedBy: CH0PR03CA0189.namprd03.prod.outlook.com (2603:10b6:610:e4::14) To CO1PR01MB7370.prod.exchangelabs.com (2603:10b6:303:159::16) Precedence: bulk X-Mailing-List: linux-edac@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PR01MB7370:EE_|PH7PR01MB8668:EE_ X-MS-Office365-Filtering-Correlation-Id: 914d5a46-e61d-4840-3850-08dc49fa20ee X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hhcb0FiuO/1y2DUywxvvQh61+maJpmsNQhgmOgKFtJ0pn6ETW/6lYdMDnuVATvxlr1hnnPt3p852PN8uz2SUGxY8nNCbr/lHMBs3ePvhswyxzUnLy2EqiCjJ09/cLXIMWPN6Hilj+muKejqhhkrf2UfGJ40NGGeeU3VHbJEltTTVfP8qGviI6Tz3bV//d0avR6OqmK5iRV0g0zdNHPwab1uGJLW9JNMWvk2MCJuksNf08RMXHjG+b/8r07qFTqMzFhusFVWjeV148rLpJPNqmCe3B2Q4YO+ygOxiGEMDQ+1EV9jJjTS6bDo7aJ/qTSzZ06JfEEjFzv9JpZWUAUOF9eo5ySjiLXc/jMX24MqHBJjeu06/tqhPBeT4Qufuyft6jOLFxjuA0KBhMmYGSnWl3/wGAIM5f3Iv3fxunN7O0nOoSs4eEDfBBhdTRMJnsWBHjnONyFQDQ7PqUNFcD5+bD+TRdmwnLI/x69MN9z5cBR9GVqtxtsT9d6msYo8nO8wurR2rGjMSkIcgsxi5wg648mXCF027mTzs5nYIbJHuNPamUmPJo9yj6+rLVeBZu65888qYEUB8deBzgiX2QB+J4pKpeWg6f2ICiptJhMg350ZMCY6VQziFAXmGQObkWYCRU7uJR1dOZzVfCPNXzXGnlhmW98CtRGgmQv3a/WRRaqbH6ZOhlDpv4FIcotZBvZHpM/hUi/LQEqdUNxPHp5T2/w== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR01MB7370.prod.exchangelabs.com;PTR:;CAT:NONE;SFS:(13230031)(366007)(1800799015)(52116005)(376005)(38350700005);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?yEi6M4qnecIrwLALa7wtiQ6LJRri?= =?utf-8?q?yznKGTCZG3WbaJL0QbVwpo6zSwxiUT4MXjGCLHxDonGj0vsl31fbYCgeXeOLm4siD?= =?utf-8?q?od98AHFtkD2Vx2lYBp7zyq31Do6UP6M7qoWv8CjeRdc6mipQlGsG1qLHxAiMauUwq?= =?utf-8?q?+52i8WRyjyM0gFPLIKqdq5S8AhXZoSrRjOpBZxwUgvrwbGIKu2bUBzzYyScolm7IU?= =?utf-8?q?ErDdQirJjKRok1NNGll98mA7cu+l6vbGEuS+xdL535ki3tTW3DRomOkYUATpDMzh/?= =?utf-8?q?tomw5AQ/K5/FgcgHZc78Qmr1Bpe4kFwftkVFZ1gHX52KJBEFBqpeNpgkJLq+XPFR1?= =?utf-8?q?zXvxyvUaokQruvxAsBHOIqcVrV6AHPAi7iSdBfczcIgSlrnRKwQNocf0iFIVvy+WE?= =?utf-8?q?gG4XVIFSv72fW4u1vJyb+E/EfyZ2tsAOZtWr9zAgYZPaS+qq3S2OGqdZT5SLKHoKf?= =?utf-8?q?DIw9rNI5nYE964RovAOTRBqCpT7yLuQWdWiynqPPMgaCN26ZQ/Omv+jjC31GjBMCr?= =?utf-8?q?REbtQkPkmaV8QtY7fq1QidSqu+YtQQoEwRzBi471WD/bfwOVAoUml84AfuItldoUX?= =?utf-8?q?GEmVSKZWG736KmSsQgYhPiyfoyY3yrtiqzj/PY51muf+nr+CwWcGq9Cvpf8AWH03R?= =?utf-8?q?n2XVzTKiHj0cPELxi78MJ3LdbSHCMJ/aH7yBsiw73VksdP5JmS2EDdVwrnXTLvEzF?= =?utf-8?q?wpW7HgibLaGGzvt3zdzB+xw+GtD1GVMGqwcvzGM+W5ByToY5cCwdDHp3LeqP5NE0+?= =?utf-8?q?wJU5S5xEz5IZyNXdL80Cwu/FFUnVWfIGlLcpnazSW0V8MMueo64jRbiJwVC+aVMDs?= =?utf-8?q?/nLsdnqetsE5ugns8EjbHbeOXvO1d9jb2vawEpiNZVjeoGki5d6UO0cLHKt0vibMK?= =?utf-8?q?P+Dr/ksueheHNPNI3NSm0jTTvjyIPsuwmvloSY6uYmo+m9xu4BkxA35GqqCOJskjJ?= =?utf-8?q?0H7KFk3YUlIiydr2eF01uIrZsVMJPzJVfHIIEIhSov+FifVq2ppan/3Y/rHb8R6AG?= =?utf-8?q?9gJNUFcbTPIoMmVvPEANsm3e1Q0IcWeEB76zJNoZ1FKd/oHluPXD77r4bEzqkYQmG?= =?utf-8?q?LFI4smEL56CtEToSPCi+0dVsNzxaktDNl7ngyYYAZGwMlt7yJbxnRU3tBabiVqsdF?= =?utf-8?q?APEFerjgjTTlrR8lpm5zNc7CuoxTd88ZDNxg8NkQWmDaK7tqHmRQt52uBxatrDCRA?= =?utf-8?q?d8p6SIgbrzhs6uO96go0+Lz9P11pGbxu9k8xD94cN7fsJORHkj/++B0iqYrDX54l2?= =?utf-8?q?vqCvJwOtHaVs6s/DIkIL15GlT1CHz3oJSb+cEusJz/o5rVn+KZVnE27cUhAJt0VuF?= =?utf-8?q?L8QyJARlmnEFCKTcverlWSzhAS8B58eKdcGv2zEmcv8apiHlzh++dogZ4/XPaBnBm?= =?utf-8?q?ld449/zKvm9Iht1rHJH/cu+8aUUX/CJb744OduskXc21QYkpwm4ykfiXZu91+CNCK?= =?utf-8?q?WwOD9cUTJzeA8RacnX2XCL1sjMytfo/OXnbB6tGDB8ys2nncCC90CNrwER71l1wLF?= =?utf-8?q?PHU8L7jRXYY2oEdWsbw/mq7nPobYIAchbkqW1s2vxFrdd8z6IZFoybY=3D?= X-OriginatorOrg: os.amperecomputing.com X-MS-Exchange-CrossTenant-Network-Message-Id: 914d5a46-e61d-4840-3850-08dc49fa20ee X-MS-Exchange-CrossTenant-AuthSource: CO1PR01MB7370.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Mar 2024 22:56:22.3814 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3bc2b170-fd94-476d-b0ce-4229bdc904a7 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: gvJlpVudPaQIb7v8PAgBVY+6M+uC35FOTXP2mb46nQ9eXycBxDpOhj9gge1c+ISzy1GSRRbDgPGAIPY0rtPJzgRnsBF+FPtAvcUJ/YTy8B3Hp0FSr6Ao48ATrqtygwKi X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR01MB8668 This prevents the unnecessary inclusion of ARM specific RAS error handling routines in non-ARM platforms. Signed-off-by: Daniel Ferguson --- drivers/acpi/apei/ghes.c | 4 ++++ drivers/ras/ras.c | 2 ++ include/linux/ras.h | 5 ++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c index 512067cac170..58014558b8e0 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c @@ -525,6 +525,7 @@ static bool ghes_handle_memory_failure(struct acpi_hest_generic_data *gdata, return false; } +#if defined(CONFIG_ARM) || defined (CONFIG_ARM64) static bool ghes_handle_arm_hw_error(struct acpi_hest_generic_data *gdata, int sev, bool sync) { @@ -570,6 +571,7 @@ static bool ghes_handle_arm_hw_error(struct acpi_hest_generic_data *gdata, return queued; } +#endif /* * PCIe AER errors need to be sent to the AER driver for reporting and @@ -704,9 +706,11 @@ static bool ghes_do_proc(struct ghes *ghes, } else if (guid_equal(sec_type, &CPER_SEC_PCIE)) { ghes_handle_aer(gdata); +#if defined(CONFIG_ARM) || defined (CONFIG_ARM64) } else if (guid_equal(sec_type, &CPER_SEC_PROC_ARM)) { queued = ghes_handle_arm_hw_error(gdata, sev, sync); +#endif } else { void *err = acpi_hest_get_payload(gdata); diff --git a/drivers/ras/ras.c b/drivers/ras/ras.c index a6e4792a1b2e..249dce21a738 100644 --- a/drivers/ras/ras.c +++ b/drivers/ras/ras.c @@ -52,10 +52,12 @@ void log_non_standard_event(const guid_t *sec_type, const guid_t *fru_id, trace_non_standard_event(sec_type, fru_id, fru_text, sev, err, len); } +#if defined(CONFIG_ARM) || defined(CONFIG_ARM64) void log_arm_hw_error(struct cper_sec_proc_arm *err) { trace_arm_event(err); } +#endif static int __init ras_init(void) { diff --git a/include/linux/ras.h b/include/linux/ras.h index a64182bc72ad..811feb9d8160 100644 --- a/include/linux/ras.h +++ b/include/linux/ras.h @@ -24,17 +24,20 @@ int __init parse_cec_param(char *str); void log_non_standard_event(const guid_t *sec_type, const guid_t *fru_id, const char *fru_text, const u8 sev, const u8 *err, const u32 len); +#if defined(CONFIG_ARM) || defined(CONFIG_ARM64) void log_arm_hw_error(struct cper_sec_proc_arm *err); - +#endif #else static inline void log_non_standard_event(const guid_t *sec_type, const guid_t *fru_id, const char *fru_text, const u8 sev, const u8 *err, const u32 len) { return; } +#if defined(CONFIG_ARM) || defined(CONFIG_ARM64) static inline void log_arm_hw_error(struct cper_sec_proc_arm *err) { return; } #endif +#endif struct atl_err { u64 addr;