[RFC PATCH 3/6] cper: extend cper_mem_err_compact struct

[Pierre Gondois <pierre.gondois@arm.com>]

Extend cper_mem_err_compact struct to prepare for:
- additional support of Memory Error Section 2
- widening the usage of cper_mem_err_compact struct for both
  Memory Error Section 2 and Memory Error Section (1)

Remove the extended field which contains Memory Error Section (1)
additional bits that can now fit in the larger (u32) fields.
Add fields that were previously not populated (physical_addr, ...)
to prepare for using this cper_mem_err_compact struct for both
Memory Error sections.

Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
---
 drivers/firmware/efi/cper.c | 21 ++++++++++++---------
 include/linux/cper.h        | 22 ++++++++++++++--------
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/drivers/firmware/efi/cper.c b/drivers/firmware/efi/cper.c
index 06b4fdb59917a..6285b67e8fcd9 100644
--- a/drivers/firmware/efi/cper.c
+++ b/drivers/firmware/efi/cper.c
@@ -325,12 +325,8 @@ int cper_mem_err_location(struct cper_mem_err_compact *mem, char *msg)
 			       mem->bank & CPER_MEM_BANK_ADDRESS_MASK);
 	if (mem->validation_bits & CPER_MEM_VALID_DEVICE)
 		n += scnprintf(msg + n, len - n, "device:%d ", mem->device);
-	if (mem->validation_bits & (CPER_MEM_VALID_ROW | CPER_MEM_VALID_ROW_EXT)) {
-		u32 row = mem->row;
-
-		row |= cper_get_mem_extension(mem->validation_bits, mem->extended);
-		n += scnprintf(msg + n, len - n, "row:%d ", row);
-	}
+	if (mem->validation_bits & (CPER_MEM_VALID_ROW | CPER_MEM_VALID_ROW_EXT))
+		n += scnprintf(msg + n, len - n, "row:%d ", mem->row);
 	if (mem->validation_bits & CPER_MEM_VALID_COLUMN)
 		n += scnprintf(msg + n, len - n, "column:%d ", mem->column);
 	if (mem->validation_bits & CPER_MEM_VALID_BIT_POSITION)
@@ -347,7 +343,7 @@ int cper_mem_err_location(struct cper_mem_err_compact *mem, char *msg)
 			       mem->target_id);
 	if (mem->validation_bits & CPER_MEM_VALID_CHIP_ID)
 		n += scnprintf(msg + n, len - n, "chip_id:%d ",
-			       mem->extended >> CPER_MEM_CHIP_ID_SHIFT);
+			       mem->chip_id);

 	return n;
 }
@@ -362,7 +358,7 @@ int cper_dimm_err_location(struct cper_mem_err_compact *mem, char *msg)
 		return 0;

 	len = CPER_REC_LEN;
-	dmi_memdev_name(mem->mem_dev_handle, &bank, &device);
+	dmi_memdev_name((u16)mem->mem_dev_handle, &bank, &device);
 	if (bank && device)
 		n = snprintf(msg, len, "DIMM location: %s %s ", bank, device);
 	else
@@ -377,6 +373,7 @@ EXPORT_SYMBOL_GPL(cper_dimm_err_location);
 void cper_mem_err_pack(const struct cper_sec_mem_err *mem,
 		       struct cper_mem_err_compact *cmem)
 {
+	memset(cmem, 0, sizeof(*cmem));
 	cmem->validation_bits = mem->validation_bits;
 	cmem->node = mem->node;
 	cmem->card = mem->card;
@@ -384,15 +381,21 @@ void cper_mem_err_pack(const struct cper_sec_mem_err *mem,
 	cmem->bank = mem->bank;
 	cmem->device = mem->device;
 	cmem->row = mem->row;
+	cmem->row |= cper_get_mem_extension(mem->validation_bits, mem->extended);
 	cmem->column = mem->column;
 	cmem->bit_pos = mem->bit_pos;
 	cmem->requestor_id = mem->requestor_id;
 	cmem->responder_id = mem->responder_id;
 	cmem->target_id = mem->target_id;
-	cmem->extended = mem->extended;
 	cmem->rank = mem->rank;
 	cmem->mem_array_handle = mem->mem_array_handle;
 	cmem->mem_dev_handle = mem->mem_dev_handle;
+	cmem->error_status = mem->error_status;
+	cmem->physical_addr = mem->physical_addr;
+	cmem->physical_addr_mask = mem->physical_addr_mask;
+	cmem->error_type = mem->error_type;
+	if (mem->validation_bits & CPER_MEM_VALID_CHIP_ID)
+		cmem->chip_id = mem->extended >> CPER_MEM_CHIP_ID_SHIFT;
 }
 EXPORT_SYMBOL_GPL(cper_mem_err_pack);

diff --git a/include/linux/cper.h b/include/linux/cper.h
index 170bb15f616d0..b5e2a0d115ca2 100644
--- a/include/linux/cper.h
+++ b/include/linux/cper.h
@@ -542,17 +542,23 @@ struct cper_mem_err_compact {
 	u16	card;
 	u16	module;
 	u16	bank;
-	u16	device;
-	u16	row;
-	u16	column;
-	u16	bit_pos;
+	u32	device;
+	u32	row;
+	u32	column;
+	u32	bit_pos;
 	u64	requestor_id;
 	u64	responder_id;
 	u64	target_id;
-	u16	rank;
-	u16	mem_array_handle;
-	u16	mem_dev_handle;
-	u8      extended;
+	u32	rank;
+	u32	mem_array_handle;
+	u32	mem_dev_handle;
+	u64	error_status;
+	u64	physical_addr;
+	u64	physical_addr_mask;
+	u8	chip_id;
+	u8	status;
+	u8	error_type;
+	u8	is_section2;
 };

 static inline u32 cper_get_mem_extension(u64 mem_valid, u8 mem_extended)
--
2.43.0