Received-SPF: pass (google.com: domain of linux-kernel+bounces-82284-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
From: Daniel Ferguson <danielf@os.amperecomputing.com>
Date: Mon, 26 Feb 2024 12:15:19 -0800
Subject: [PATCH v4 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: <20240226-b4-arm-ras-error-vendor-info-v4-rc3-v4-1-08e0f168fec1@os.amperecomputing.com>
References: <20240226-b4-arm-ras-error-vendor-info-v4-rc3-v4-0-08e0f168fec1@os.amperecomputing.com>
In-Reply-To: <20240226-b4-arm-ras-error-vendor-info-v4-rc3-v4-0-08e0f168fec1@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?U2x1OGhBTlN2M2hJSE40Q0pFb1U1UXM2eExvVXkvMEdFV1RYbGpBczE5Nmw1?=
 =?utf-8?B?NFB3VWJKc2FTbTBiN0FQdisrKysxSlpKV0NFVFVWUkQ1cFluSllqT2tSMTRJ?=
 =?utf-8?B?L1VwNEhnZXdNTFRlbmtrOU92eFVqbk5jN0N2OFdJVkRnWGIzWU4yUExSWVhL?=
 =?utf-8?B?cHdHenZhRkpmZStNRTBFTTQwRFVERFhLM2cxQkNqZ1Y4d2NOTmZaYmVnKzkw?=
 =?utf-8?B?RkJFQ0kweHRaZXJRWDd0bnpKd05wcXVSR2o5NEhNVjMySGFPUlBuQkFiQm9J?=
 =?utf-8?B?NWJ3d21uT2dxZ1F6ck5PQ2ZLVzY1WDVodlVWcWkyR1o0dnpNRWZJS2ZOeVZy?=
 =?utf-8?B?OFB5Y3dUMDdOc0pjbzQxMk54a1hHZ2NwU3lRMGpTMThYbzlhb01KMVA0UVN6?=
 =?utf-8?B?eExNRUhGYXpCUlowbnR1eWc1dVlqZy9HUGZidExxN05mVEpmNW5aQ1lrMzZN?=
 =?utf-8?B?WnJiek8wYURQeXVXRHYzcWN1MTQzS2QweGQ2c0diUGNENXpqWTVVTXF5NFgw?=
 =?utf-8?B?MFhTNXFMVWZZMmlvdHF4b0tvZ0JoR0lwUno1K1c1TnJLNnV0SjZacFIzenht?=
 =?utf-8?B?dGdtRnF2a3BJV1BHTFV4UWxZd0drQnNQK1JrMHVGWmZrOEJIbTJuYWtyNFRF?=
 =?utf-8?B?YzlQOUkzUERKdnV1eEs3UTg5RXhWSEtLb0JjN042cDFrR3A4VTRjcTllNWo3?=
 =?utf-8?B?UGRjZDNMUHd6Yk5sZjR4MjRzeUlSZzVyTzdjc1YvY2FKN2YzcUc0UmkzZ2FI?=
 =?utf-8?B?dHhPTGRDODUwUTdsa3d0dkplNlUwdlFYMTRiVzBGNGZlejEreXY3Z3VhYmY2?=
 =?utf-8?B?dEViTE1HTDRnR3pFRWZ1VDZUVGdvQ05tR1ZRRHpYTU96VFpyK0c4b2lrV3ZH?=
 =?utf-8?B?dkRDZG9WZXpqMlllbzJQbG1NTndnNVIvR3dTUDRpOVRsRFBvOGpPL1Jyc2Fa?=
 =?utf-8?B?b1laQ2Fwd3lnUTVGWDFEZExqUnlYK0xyU2I0TVNVMFpWdHZVU1BIbWprY0hK?=
 =?utf-8?B?bVhzVXQ3Y3RtczlVakVFZ1ovMWkvUE5uZnBLbEo2dU10cFpUTUxadUdUMkI3?=
 =?utf-8?B?SXgvaXJpWUFZMVVvbkUwc21vRGxrdkZkTG9ydjRrU1NHWWlzTHNtYXFhL082?=
 =?utf-8?B?TXgyTjVSTUs3T1c5ZjdEUHplL0EwMHo0V2tSY3FOeStCNTMyWTRqSmdnY2dM?=
 =?utf-8?B?YjFCNGQrSk5aUDJpZWxuc0VnT1RpUkVZYWI4UzdCWlFBa3N0K1haREtNMkZy?=
 =?utf-8?B?aVJRYXV6bm1HNDRrN2hIOExhSWttQW1uSnlKb0pJSnBuSlBQVG9aZkxTMDdP?=
 =?utf-8?B?cGVGdVZkaHYyRUo4bjNya1J5WHlFeG5hWnhrRkp1WTRyUVJmMHo1S3lsY215?=
 =?utf-8?B?aVEzWGFMcmRWWWE3Q3c4K1dCQVd0djdTQUdOSHBrWkZEcmxsL3BvUWc2Qzl4?=
 =?utf-8?B?Z29NalRnbWxKaDRvZ21EcDRJMytxMnZOcmNydkRCVG1IWExpbUtxWDZaOUlu?=
 =?utf-8?B?VEEwRm5sNHNmbkVPazl6ZXZBcm1MQzhUcG9nYzFGZDgyeURZVjN0OHFzc0hu?=
 =?utf-8?B?SzF5RFppdGl0bE1PWm5XNXppaEFiTWZveFFaNWVlazdQUzhOam1vdXYweW1G?=
 =?utf-8?B?aThDdkdHazhZSnY2amJURFYyZmZ5RGJtUHlTeHdoby9JemNrY3ZNcDhPaUx3?=
 =?utf-8?B?RjFrZjdMVjgxRlcvdGZOUzhUbUNkQ3FwbC9VcFJhTUM4ZGRZUmU3ekhNSWFS?=
 =?utf-8?B?Ym41aUEzcUNpVWJIN040N0Zoc0FJRGZWOGtNYVVhNGpXOUV6bWJNOGxpUlMy?=
 =?utf-8?B?NHA5MW84VWJzdTBCcmxZRmVaUGZlT0R0MGpubjQyYU5BNnYxL1ovN0k5SmVr?=
 =?utf-8?B?S0lNMm9aejhuZG0wMzBEY0lkMkEwK1hGMTJYVWFqMytzcXNBSFQ5bUkwWGtL?=
 =?utf-8?B?M2NyckgwL1FRcUczRXp0YzFGTHdMNk5tdUNsYXRHb0plMFdCOWtLSXhxSXdG?=
 =?utf-8?B?MkNvNExvdXZHMnYxTTJReUR0ZzFnamtZUnZxOHBmeDZXTGh4aW1oTm0ya2Rj?=
 =?utf-8?B?MGRncFFnekFoa2RrWHNoZXFKNnEvSkdBSnlhZjN0THRpdkRxemhuZDNSSGtM?=
 =?utf-8?B?ZFEwMHA4eXNhcEFLS25tNlpBNFFzOGI3Y1VJb1BHaThSZmFTZDlXYjd1VlNB?=
 =?utf-8?Q?oNkUL1oztjOsXxZIMg8vTUY=3D?=
X-OriginatorOrg: os.amperecomputing.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 34814eb1-6519-4c82-5777-08dc3707ca90
X-MS-Exchange-CrossTenant-AuthSource: CO1PR01MB7370.prod.exchangelabs.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2024 20:16:18.3048
 (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: j3lZcrY1Tir+/PGq4TPpXEqq6Rgga8KWB0qL9NdG1Gei0BSauQ1qtsFV04J2DG8qnNbWJpwb7DMIujd3eQO+yyVQCpg0vMFn+L7BceaZgB71qLzHjkGC7Tz32Ml+4fYT
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR01MB6629

Conditional compilation directives were added in some places to
prevent 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      | 4 ++++
 3 files changed, 10 insertions(+)

diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index fe825a432c5b..5980f70ca0e4 100644
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -526,6 +526,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)
 {
@@ -571,6 +572,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
@@ -751,9 +753,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 if (guid_equal(sec_type, &CPER_SEC_CXL_GEN_MEDIA_GUID)) {
 			struct cxl_cper_event_rec *rec =
 				acpi_hest_get_payload(gdata);
diff --git a/drivers/ras/ras.c b/drivers/ras/ras.c
index 95540ea8dd9d..355c0d78bd50 100644
--- a/drivers/ras/ras.c
+++ b/drivers/ras/ras.c
@@ -21,10 +21,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 1f4048bf2674..bded04044d33 100644
--- a/include/linux/ras.h
+++ b/include/linux/ras.h
@@ -24,15 +24,19 @@ 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
 
 #endif /* __RAS_H__ */

-- 
2.43.0