diff options
| -rw-r--r-- | src/drivers/intel/ish/ish.c | 12 | ||||
| -rw-r--r-- | src/soc/intel/common/block/cse/cse_lite.c | 12 |
2 files changed, 14 insertions, 10 deletions
diff --git a/src/drivers/intel/ish/ish.c b/src/drivers/intel/ish/ish.c index a84be5b120..d1b85f570e 100644 --- a/src/drivers/intel/ish/ish.c +++ b/src/drivers/intel/ish/ish.c @@ -50,15 +50,15 @@ static void intel_ish_enable(struct device *dev) static void intel_ish_get_version(void) { - struct cse_fw_partition_info *version = cbmem_find(CBMEM_ID_CSE_PARTITION_VERSION); - if (version == NULL) + struct cse_specific_info *info = cbmem_find(CBMEM_ID_CSE_INFO); + if (info == NULL) 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); + info->cse_fwp_version.ish_partition_info.cur_ish_fw_version.major, + info->cse_fwp_version.ish_partition_info.cur_ish_fw_version.minor, + info->cse_fwp_version.ish_partition_info.cur_ish_fw_version.hotfix, + info->cse_fwp_version.ish_partition_info.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 908b5de1fe..937f1be3e2 100644 --- a/src/soc/intel/common/block/cse/cse_lite.c +++ b/src/soc/intel/common/block/cse/cse_lite.c @@ -1333,12 +1333,13 @@ static void store_ish_version(void) if (vboot_recovery_mode_enabled()) return; - struct cse_fw_partition_info *version; - size_t size = sizeof(struct fw_version); - version = cbmem_find(CBMEM_ID_CSE_PARTITION_VERSION); - if (version == NULL) + struct cse_specific_info *info = cbmem_find(CBMEM_ID_CSE_INFO); + if (info == NULL) return; + struct cse_fw_partition_info *version = &(info->cse_fwp_version); + size_t size = sizeof(struct fw_version); + /* * Compare if stored cse version (from the previous boot) is same as current * running cse version. @@ -1360,6 +1361,9 @@ static void store_ish_version(void) /* Since cse version has been updated, ish version needs to be updated. */ memcpy(&(version->ish_partition_info.cur_ish_fw_version), &(resp.manifest_data.version), size); + + /* Update the CRC */ + cbmem_store_cse_info_crc(info); } } } |