Prepare a following patch by renaming/exporting some ghes internal
functions to extlog.c. Namely:
- Rename ghes_mem_err_min_len() to acpi_extlog_mem_err_min_len()
- cxl_cper_post_event() ghes_severity() are not static anymore.

No functional change intended.

Signed-off-by: Pierre Gondois <[email protected]>
---
 drivers/acpi/apei/apei-internal.h |  5 +++++
 drivers/acpi/apei/extlog.c        | 22 ++++++++++++++++++++++
 drivers/acpi/apei/ghes.c          | 31 ++++---------------------------
 3 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/drivers/acpi/apei/apei-internal.h 
b/drivers/acpi/apei/apei-internal.h
index a7c70adf91478..f7f0ab8e5ed7f 100644
--- a/drivers/acpi/apei/apei-internal.h
+++ b/drivers/acpi/apei/apei-internal.h
@@ -8,7 +8,12 @@
 #define APEI_INTERNAL_H
 
 #include <linux/acpi.h>
+#include <cxl/event.h>
 
+int ghes_severity(int severity);
+void cxl_cper_post_event(enum cxl_event_type event_type,
+                        struct cxl_cper_event_rec *rec, u32 len);
+u32 acpi_extlog_mem_err_min_len(u64 validation_bits);
 void acpi_extlog_report(const struct acpi_hest_generic_status *estatus);
 
 struct apei_exec_context;
diff --git a/drivers/acpi/apei/extlog.c b/drivers/acpi/apei/extlog.c
index 8eef33a4326a7..8d9b91a764902 100644
--- a/drivers/acpi/apei/extlog.c
+++ b/drivers/acpi/apei/extlog.c
@@ -55,6 +55,28 @@ static void extlog_print_pcie(struct acpi_hest_generic_data 
*gdata)
 #endif
 }
 
+/*
+ * The fields from "extended" on are absent from the 73-byte UEFI 2.1/2.2
+ * layout that older firmware still emits. Return the length needed for the
+ * fields the validation bits claim, so over-claiming is rejected without
+ * rejecting an honest short record.
+ */
+u32 acpi_extlog_mem_err_min_len(u64 validation_bits)
+{
+       u32 len = sizeof(struct cper_sec_mem_err_old);
+
+       if (validation_bits & (CPER_MEM_VALID_ROW_EXT | CPER_MEM_VALID_CHIP_ID))
+               len = offsetof(struct cper_sec_mem_err, rank);
+       if (validation_bits & CPER_MEM_VALID_RANK_NUMBER)
+               len = offsetof(struct cper_sec_mem_err, mem_array_handle);
+       if (validation_bits & CPER_MEM_VALID_CARD_HANDLE)
+               len = offsetof(struct cper_sec_mem_err, mem_dev_handle);
+       if (validation_bits & CPER_MEM_VALID_MODULE_HANDLE)
+               len = sizeof(struct cper_sec_mem_err);
+
+       return len;
+}
+
 /**
  * acpi_extlog_mem_error - trace a validated CPER memory section
  * @gdata: section header followed by its payload
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index 49d40af791bbb..b51b621208ed1 100644
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -52,7 +52,6 @@
 #include <acpi/apei.h>
 #include <asm/fixmap.h>
 #include <asm/tlbflush.h>
-#include <cxl/event.h>
 #include <ras/ras_event.h>
 
 #include "apei-internal.h"
@@ -308,7 +307,7 @@ static void ghes_fini(struct ghes *ghes)
                unmap_gen_v2(ghes);
 }
 
-static inline int ghes_severity(int severity)
+int ghes_severity(int severity)
 {
        switch (severity) {
        case CPER_SEV_INFORMATIONAL:
@@ -824,8 +823,8 @@ DEFINE_KFIFO(cxl_cper_fifo, struct cxl_cper_work_data, 
CXL_CPER_FIFO_DEPTH);
 static DEFINE_RAW_SPINLOCK(cxl_cper_work_lock);
 struct work_struct *cxl_cper_work;
 
-static void cxl_cper_post_event(enum cxl_event_type event_type,
-                               struct cxl_cper_event_rec *rec, u32 len)
+void cxl_cper_post_event(enum cxl_event_type event_type,
+                        struct cxl_cper_event_rec *rec, u32 len)
 {
        struct cxl_cper_work_data wd;
 
@@ -931,28 +930,6 @@ static void ghes_log_hwerr(int sev, guid_t *sec_type)
        hwerr_log_error_type(HWERR_RECOV_OTHERS);
 }
 
-/*
- * The fields from "extended" on are absent from the 73-byte UEFI 2.1/2.2
- * layout that older firmware still emits. Return the length needed for the
- * fields the validation bits claim, so over-claiming is rejected without
- * rejecting an honest short record.
- */
-static u32 ghes_mem_err_min_len(u64 validation_bits)
-{
-       u32 len = sizeof(struct cper_sec_mem_err_old);
-
-       if (validation_bits & (CPER_MEM_VALID_ROW_EXT | CPER_MEM_VALID_CHIP_ID))
-               len = offsetof(struct cper_sec_mem_err, rank);
-       if (validation_bits & CPER_MEM_VALID_RANK_NUMBER)
-               len = offsetof(struct cper_sec_mem_err, mem_array_handle);
-       if (validation_bits & CPER_MEM_VALID_CARD_HANDLE)
-               len = offsetof(struct cper_sec_mem_err, mem_dev_handle);
-       if (validation_bits & CPER_MEM_VALID_MODULE_HANDLE)
-               len = sizeof(struct cper_sec_mem_err);
-
-       return len;
-}
-
 static void ghes_do_proc(struct ghes *ghes,
                         const struct acpi_hest_generic_status *estatus)
 {
@@ -994,7 +971,7 @@ static void ghes_do_proc(struct ghes *ghes,
 
                        /* Then require what the claimed fields actually need. 
*/
                        if (gdata->error_data_length <
-                           ghes_mem_err_min_len(mem_err->validation_bits)) {
+                           
acpi_extlog_mem_err_min_len(mem_err->validation_bits)) {
                                pr_warn_ratelimited(FW_WARN GHES_PFX
                                                    "memory error section too 
small (%u) for the fields it claims\n",
                                                    gdata->error_data_length);
-- 
2.43.0


Reply via email to