EDAC/ghes: Remove intermediate buffer pvt->detail_location

detail_location[] is used to collect two location strings so they can
be passed as one to trace_mc_event(). Instead of having an extra copy
step, assemble the location string in other_detail[] from the
beginning.

Using other_detail[] to call trace_mc_event() is now the same as in
edac_mc.c and code can be unified.

Signed-off-by: Robert Richter <rrichter@marvell.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: James Morse <james.morse@arm.com>
Reviewed-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Cc: "linux-edac@vger.kernel.org" <linux-edac@vger.kernel.org>
Cc: Tony Luck <tony.luck@intel.com>
Link: https://lkml.kernel.org/r/20191106093239.25517-12-rrichter@marvell.com

diff --git a/drivers/edac/ghes_edac.c b/drivers/edac/ghes_edac.c
index e24fbbac555674425995f11323894f59c435bd80..1fd782c73a35658735829145b6ed6a4c09ebe6a0 100644 (file)
--- a/drivers/edac/ghes_edac.c
+++ b/drivers/edac/ghes_edac.c
@@ -21,8 +21,7 @@ struct ghes_edac_pvt {
        struct mem_ctl_info *mci;
 
        /* Buffers for the error handling routine */
-       char detail_location[240];
-       char other_detail[160];
+       char other_detail[400];
        char msg[80];
 };
 
@@ -369,6 +368,8 @@ void ghes_edac_report_mem_error(int sev, struct cper_sec_mem_err *mem_err)
 
        /* All other fields are mapped on e->other_detail */
        p = pvt->other_detail;
+       p += snprintf(p, sizeof(pvt->other_detail),
+               "APEI location: %s ", e->location);
        if (mem_err->validation_bits & CPER_MEM_VALID_ERROR_STATUS) {
                u64 status = mem_err->error_status;
 
@@ -449,12 +450,10 @@ void ghes_edac_report_mem_error(int sev, struct cper_sec_mem_err *mem_err)
        grain_bits = fls_long(e->grain - 1);
 
        /* Generate the trace event */
-       snprintf(pvt->detail_location, sizeof(pvt->detail_location),
-                "APEI location: %s %s", e->location, e->other_detail);
        trace_mc_event(type, e->msg, e->label, e->error_count,
                       mci->mc_idx, e->top_layer, e->mid_layer, e->low_layer,
                       (e->page_frame_number << PAGE_SHIFT) | e->offset_in_page,
-                      grain_bits, e->syndrome, pvt->detail_location);
+                      grain_bits, e->syndrome, e->other_detail);
 
        edac_raw_mc_handle_error(type, mci, e);