[coreboot-gerrit] [S] Change in coreboot[master]: {driver, soc}: Remove unused CBMEM structure members for fw versions

[Dinesh Gehlot (Code Review)]

Dinesh Gehlot has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/75890?usp=email )

Change subject: {driver, soc}: Remove unused CBMEM structure members for fw versions
......................................................................

{driver, soc}: Remove unused CBMEM structure members for fw versions

This patch removes unused CBMEM structure members that were used to
store a copy of data for CSE and ISH versions before CMOS backup was
implemented.

BUG=b:280722061
Test=Verified the changes on nissa board.

Signed-off-by: Dinesh Gehlot 
Change-Id: I3824b6429d2c665dd84da9b69ae4bd82ddde10b2
---
M src/drivers/intel/ish/ish.c
M src/soc/intel/common/block/cse/cse_lite.c
M src/soc/intel/common/block/include/intelblocks/cse.h
3 files changed, 8 insertions(+), 16 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/90/75890/1

diff --git a/src/drivers/intel/ish/ish.c b/src/drivers/intel/ish/ish.c
index a84be5b..dfde505 100644
--- a/src/drivers/intel/ish/ish.c
+++ b/src/drivers/intel/ish/ish.c
@@ -55,10 +55,10 @@
    	return;

printk(BIOS_DEBUG, "ISH version: %d.%d.%d.%d\n",
-		version->ish_partition_info.cur_ish_fw_version.major,
-		version->ish_partition_info.cur_ish_fw_version.minor,
-		version->ish_partition_info.cur_ish_fw_version.hotfix,
-		version->ish_partition_info.cur_ish_fw_version.build);
+		version->cur_ish_fw_version.major,
+		version->cur_ish_fw_version.minor,
+		version->cur_ish_fw_version.hotfix,
+		version->cur_ish_fw_version.build);
 }

static void intel_ish_final(struct device *dev)
diff --git a/src/soc/intel/common/block/cse/cse_lite.c b/src/soc/intel/common/block/cse/cse_lite.c
index dfa08dd..bd1c859 100644
--- a/src/soc/intel/common/block/cse/cse_lite.c
+++ b/src/soc/intel/common/block/cse/cse_lite.c
@@ -1304,8 +1304,7 @@
    	struct fw_version_resp resp;
    	if (cse_get_fpt_partition_info(FPT_PARTITION_NAME_ISHC, &resp) == CB_SUCCESS) {
    		set_cmos_ish_version(&(resp.manifest_data.version));
-			memcpy(&(version->ish_partition_info.cur_ish_fw_version),
-				&(resp.manifest_data.version), size);
+			memcpy(&(version->cur_ish_fw_version), &(resp.manifest_data.version), size);
    	}
    } else if (is_cold_boot) {
    	/*
@@ -1314,8 +1313,7 @@
    	 */
    	struct fw_version cmos_ish_version;
    	get_cmos_ish_version(&cmos_ish_version);
-		memcpy(&(version->ish_partition_info.cur_ish_fw_version),
-			&cmos_ish_version, size);
+		memcpy(&(version->cur_ish_fw_version), &cmos_ish_version, size);
    }
 }

diff --git a/src/soc/intel/common/block/include/intelblocks/cse.h b/src/soc/intel/common/block/include/intelblocks/cse.h
index 636b1f4..caabacd 100644
--- a/src/soc/intel/common/block/include/intelblocks/cse.h
+++ b/src/soc/intel/common/block/include/intelblocks/cse.h
@@ -148,16 +148,10 @@
    struct flash_partition_data manifest_data;
 };

-/* ISHC version */
-struct cse_fw_ish_version_info {
-	struct fw_version prev_cse_fw_version;
-	struct fw_version cur_ish_fw_version;
-};
-
-/* CSE and ISHC version */
+/* CSE and ISH version */
 struct cse_fw_partition_info {
    struct fw_version cur_cse_fw_version;
-	struct cse_fw_ish_version_info ish_partition_info;
+	struct fw_version cur_ish_fw_version;
 };

/* CSE RX and TX error status */