summaryrefslogtreecommitdiff
path: root/src/soc/amd/common/block
diff options
context:
space:
mode:
authorFelix Held <felix-coreboot@felixheld.de>2024-10-28 17:43:56 +0100
committerFelix Held <felix-coreboot@felixheld.de>2024-11-05 15:02:29 +0000
commit7571044f9d5cad945310254b20d2eab4f732d605 (patch)
tree9d740278bdd3f03e94d1594a7f5f9c863d3bf3b3 /src/soc/amd/common/block
parent5e580c79dfd43387e6d375c94c6d95c520189111 (diff)
soc/amd/common/psp_smi_flash: factor out get_flash_device
Since the RPMC-related functions will only need the spi_flash struct, but not the region_device struct of the store region corresponding to the 'target_nv_id', factor out 'get_flash_device' from 'find_psp_spi_flash_device_region'. Signed-off-by: Felix Held <felix-coreboot@felixheld.de> Change-Id: Ia99d3454df2c1c4182c193da7de1bbb4eef18313 Reviewed-on: https://review.coreboot.org/c/coreboot/+/84905 Reviewed-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Ana Carolina Cabral
Diffstat (limited to 'src/soc/amd/common/block')
-rw-r--r--src/soc/amd/common/block/psp/psp_smi_flash.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/soc/amd/common/block/psp/psp_smi_flash.c b/src/soc/amd/common/block/psp/psp_smi_flash.c
index d78db48ddc..ca595536c1 100644
--- a/src/soc/amd/common/block/psp/psp_smi_flash.c
+++ b/src/soc/amd/common/block/psp/psp_smi_flash.c
@@ -66,9 +66,7 @@ static int lookup_store(uint64_t target_nv_id, struct region_device *rstore)
return rdev_chain(rstore, rdev, 0, region_device_sz(rdev));
}
-static enum mbox_p2c_status find_psp_spi_flash_device_region(uint64_t target_nv_id,
- struct region_device *store,
- const struct spi_flash **flash)
+static enum mbox_p2c_status get_flash_device(const struct spi_flash **flash)
{
*flash = boot_device_spi_flash();
if (*flash == NULL) {
@@ -76,6 +74,16 @@ static enum mbox_p2c_status find_psp_spi_flash_device_region(uint64_t target_nv_
return MBOX_PSP_COMMAND_PROCESS_ERROR;
}
+ return MBOX_PSP_SUCCESS;
+}
+
+static enum mbox_p2c_status find_psp_spi_flash_device_region(uint64_t target_nv_id,
+ struct region_device *store,
+ const struct spi_flash **flash)
+{
+ if (get_flash_device(flash) != MBOX_PSP_SUCCESS)
+ return MBOX_PSP_COMMAND_PROCESS_ERROR;
+
if (lookup_store(target_nv_id, store) < 0) {
printk(BIOS_ERR, "PSP: Unable to find PSP SPI region\n");
return MBOX_PSP_COMMAND_PROCESS_ERROR;