Change in coreboot[master]: psp_verstage: differentiate bios entry

[Martin Roth (Code Review)]

Martin Roth has submitted this change. ( https://review.coreboot.org/c/coreboot/+/52964 )

Change subject: psp_verstage: differentiate bios entry
......................................................................

psp_verstage: differentiate bios entry

AMDFW tool stores bios dir entry to bios1_entry in picasso but
bios3_entry in cezanne. Separate getting bios_dir_addr into a function
and implement it on each platforms.

Signed-off-by: Kangheui Won 
Change-Id: Ie18ed7979a04319c074b9b251130d419dc7f22dc
Reviewed-on: https://review.coreboot.org/c/coreboot/+/52964
Reviewed-by: Martin Roth 
Tested-by: build bot (Jenkins) 
---
M src/soc/amd/cezanne/psp_verstage/chipset.c
M src/soc/amd/common/psp_verstage/include/psp_verstage.h
M src/soc/amd/common/psp_verstage/psp_verstage.c
M src/soc/amd/picasso/psp_verstage/chipset.c
4 files changed, 14 insertions(+), 1 deletion(-)

Approvals:
  build bot (Jenkins): Verified
  Martin Roth: Looks good to me, approved

diff --git a/src/soc/amd/cezanne/psp_verstage/chipset.c b/src/soc/amd/cezanne/psp_verstage/chipset.c
index 7f944eb..c0593bf 100644
--- a/src/soc/amd/cezanne/psp_verstage/chipset.c
+++ b/src/soc/amd/cezanne/psp_verstage/chipset.c
@@ -21,6 +21,11 @@
    return svc_save_uapp_data(address, size);
 }

+uint32_t get_bios_dir_addr(struct psp_ef_table *ef_table)
+{
+	return ef_table->bios3_entry;
+}
+

/* Functions below are stub functions for not-yet-implemented PSP features.
  * These functions should be replaced with proper implementations later.
diff --git a/src/soc/amd/common/psp_verstage/include/psp_verstage.h b/src/soc/amd/common/psp_verstage/include/psp_verstage.h
index 6589725..7bfc8b7 100644
--- a/src/soc/amd/common/psp_verstage/include/psp_verstage.h
+++ b/src/soc/amd/common/psp_verstage/include/psp_verstage.h
@@ -48,6 +48,8 @@
    uint32_t bios0_entry;
    uint32_t bios1_entry;
    uint32_t bios2_entry;
+	uint32_t reserved1;
+	uint32_t bios3_entry;
 } __attribute__((packed, aligned(16)));

void test_svc_calls(void);
@@ -59,5 +61,6 @@
 uint32_t get_max_workbuf_size(uint32_t *size);
 uint32_t update_psp_bios_dir(uint32_t *psp_dir_offset, uint32_t *bios_dir_offset);
 uint32_t save_uapp_data(void *address, uint32_t size);
+uint32_t get_bios_dir_addr(struct psp_ef_table *ef_table);

#endif /* PSP_VERSTAGE_H */
diff --git a/src/soc/amd/common/psp_verstage/psp_verstage.c b/src/soc/amd/common/psp_verstage/psp_verstage.c
index f6cc5e9..2265e17 100644
--- a/src/soc/amd/common/psp_verstage/psp_verstage.c
+++ b/src/soc/amd/common/psp_verstage/psp_verstage.c
@@ -107,7 +107,7 @@
    }

psp_dir_addr = ef_table->psp_table;
-	bios_dir_addr = ef_table->bios1_entry;
+	bios_dir_addr = get_bios_dir_addr(ef_table);
    psp_dir_in_spi = (uint32_t *)((psp_dir_addr & SPI_ADDR_MASK) +
    		(uint32_t)boot_dev.base);
    bios_dir_in_spi = (uint32_t *)((bios_dir_addr & SPI_ADDR_MASK) +
diff --git a/src/soc/amd/picasso/psp_verstage/chipset.c b/src/soc/amd/picasso/psp_verstage/chipset.c
index 57a2ff3..b7acbcd 100644
--- a/src/soc/amd/picasso/psp_verstage/chipset.c
+++ b/src/soc/amd/picasso/psp_verstage/chipset.c
@@ -18,3 +18,8 @@
 {
    return svc_get_max_workbuf_size(size);
 }
+
+uint32_t get_bios_dir_addr(struct psp_ef_table *ef_table)
+{
+	return ef_table->bios1_entry;
+}