Received-SPF: pass (google.com: domain of linux-kernel+bounces-110777-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: Daniel Ferguson <danielf@os.amperecomputing.com>
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.
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
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" <rafael@kernel.org>, Len Brown <lenb@kernel.org>, 
 James Morse <james.morse@arm.com>, Tony Luck <tony.luck@intel.com>, 
 Borislav Petkov <bp@alien8.de>
Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, 
 linux-edac@vger.kernel.org, 
 Daniel Ferguson <danielf@os.amperecomputing.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?eUVpNk00cW5lY0lyd0xBTGE3d3RpUTZMSlJyaXl6bktHVENaRzNXYmFKTDBR?=
 =?utf-8?B?YlZ3cG82elN3eGlVVDRNWGpHQ0xIeERvbkdqMHZzbDMxZmJZQ2dlWGVPTG00?=
 =?utf-8?B?c2lEb2Q5OEFIRnRrRDJWeDJsWUJwN3p5cTMxRG82VVA2TTdxb1d2OENqZVJk?=
 =?utf-8?B?YzZtaXBRbEdzRzFxTEh4QWlNYXVVd3ErNTJpOFdSeWp5TTBnRlBMSUtxZHE1?=
 =?utf-8?B?UzhBaFhab1NyUmpPcEJaeHdVZ3Zyd2JHSUt1MmJVQnp6WXlTY29sbTdJVUVy?=
 =?utf-8?B?RGRRaXJKaktSb2sxTk5HbGw5OG1BN2N1K2w2dmJHRXVTK3hkTDUzNWtpM3RU?=
 =?utf-8?B?VzNEUm9tT2tZVUFUcERNemgvdG9tdzVBUS9LNS9GZ2NnSFpjNzhRbXIxQnBl?=
 =?utf-8?B?NGtGd2Z0a1ZGWjFnSFg1MktKQkVGQnFwZU5wZ2tKTHErWFBGUjF6WHZ4eXZV?=
 =?utf-8?B?YW9rUXJ1dnhBc0JIT0lxY1ZyVjZBSFBBaTdpU2RCZmN6Y0lnU2xyblJLd1FO?=
 =?utf-8?B?b2NmMGlGSVZ2eStXRWdHNFhWSUZTdjcyZlc0dTF2SnliK0UvRWZ5WjJ0c0FP?=
 =?utf-8?B?WnRXcjl6QWdZWlBhUytxcTNTMk9HcWRaVDVTTEtIb0tmREl3OXJOSTVuWUU5?=
 =?utf-8?B?NjRSb3ZBT1RSQnFDcFQ3eUx1UVdkV2l5bnFQUE1nYUNOMjZaUS9PbXYrampD?=
 =?utf-8?B?MzFHakJNQ3JSRWJ0UWtQa21hVjhRdFk3ZnExUWlkU3F1K1l0UVFvRXdSekJp?=
 =?utf-8?B?NDcxV0QvYmZ3T1ZBb1VtbDg0QWZ1SXRsZG9VWEdFbVZTS1pXRzczNkttU3NR?=
 =?utf-8?B?Z1loUGl5Zm95WTN5cnRpcXpqL1BZNTFtdWYrbnIrQ3dXY0dxOUN2cGY4QVdI?=
 =?utf-8?B?MDNSbjJYVnpUS2lIajBjUEVMeGk3OE1KM0xkYlNIQ01KL2FIN3lCc2l3NzNW?=
 =?utf-8?B?a3NkUDVKbVMyRURkVndyblhUTHZFekZ3cFc3SGdpYkxhR0d6dnQzemR6Qit4?=
 =?utf-8?B?dytHdEQxR1ZNR3F3Y3Z6R00rVzVCeVRvWTVjQ3dkREhwM0xlcVA1TkUwK3dK?=
 =?utf-8?B?VTVTNXhFejVJWnlOWGRMODBDd3UvRkZVblZXZklHbExjcG5helNXMFY4TU11?=
 =?utf-8?B?ZW82NGpSYmlKd1ZDK2FWTURzL25Mc2RucWV0c0U1dWduczhFamJIYmVPWHZP?=
 =?utf-8?B?MWQ5amIydmF3RXBpTlpWamVvR2tpNWQ2VU8wY0xIS3QwdmliTUtQK0RyL2tz?=
 =?utf-8?B?dWVoZUhOUE5JM05TbTBqVFR2anlJUHN1d212bG9TWTZ1WW1vK205eHU0Qmt4?=
 =?utf-8?B?QTM1R3FxQ09Kc2tqSjBIN0tGazNZVWxJaXlkcjJlRjAxdUlyWnNWTUpQekpW?=
 =?utf-8?B?ZkhJSUVJaFNvditGaWZWcTJwcGFuLzNZL3JIYjhSNkFHOWdKTlVGY2JUUElv?=
 =?utf-8?B?TW1WdlBFQU5zbTNlMVEwSWNXZUVCNzZ6Sk5vWjFGS2Qvb0hsdVBYRDc3cjRi?=
 =?utf-8?B?RXpxa1lRbUdMRkk0c21FTDU2Q3RFVG9TUENpKzBkVnNOenhha3RETmw3bmd5?=
 =?utf-8?B?WVlBWkd3TWx0N3lKYnhuUlUzdEJhYmlWcXNkRkFQRUZlcmpnalRUbHJSOGxw?=
 =?utf-8?B?bTV6TmM3Q3VveFRkODhaRE54ZzhOa1FXbURhSzd0cUhtUlF0NTJ1QnhhdHJE?=
 =?utf-8?B?Q1JBZDhwNlNJZ2JyemhzNnVPOTZnbzArTHo5UDExcEdieHU5azh4RDk0Y043?=
 =?utf-8?B?ZnNKT1JIa2ovKytCMGlxWXJEWDU0bDJ2cUN2SndPdEhhVnM2cy9ESWtJTDE1?=
 =?utf-8?B?R2xUMUNIejNvSlNiK2NFdXNKei9vNXJWbitLWlZuRTI3Y1VoQUp0MFZ1Rkw4?=
 =?utf-8?B?UXlKQVJsbW5FRkNLVGN2ZXJsV1N6aEFTOEI1OGVLZGNHdjJ6RW1jdjhhcGlI?=
 =?utf-8?B?bHpoKytkb2daNC9YUGFCbkJtbGQ0NDkvekt2bTlJaHQxckhKSC9jdSs4YVVV?=
 =?utf-8?B?WC9DSmI3NDRPZHVza1hjMjFRWWtwd200eWtmaVhadTkxK0NOQ0tXd09EOWNV?=
 =?utf-8?B?VEp6ZUE4UmFjblgyWENMMXNqTXl0Zm8vT1huYkI2dEdEQjh5czJubmNDQzkw?=
 =?utf-8?B?Q05yd0VSNzFsMXdMRlBIVThMN2pSWFlZMm9FZFdzYncvbXE3blBvYllJQWNo?=
 =?utf-8?Q?bkqW1s2vxFrdd8z6IZFoybY=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 <danielf@os.amperecomputing.com>
---
 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;

-- 
2.43.0