[coreboot-gerrit] Change in coreboot[master]: soc/amd/common/block/psp: factor out soc_get_psp_base_address

[Martin Roth (Code Review)]

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

Change subject: soc/amd/common/block/psp: factor out soc_get_psp_base_address
......................................................................

soc/amd/common/block/psp: factor out soc_get_psp_base_address

Signed-off-by: Felix Held 
Change-Id: Ib73ac92e69f1be5852a1406ba714acb6a8a04989
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50447
Tested-by: build bot (Jenkins) 
Reviewed-by: Raul Rangel 
---
M src/soc/amd/common/block/psp/psp_gen2.c
1 file changed, 10 insertions(+), 7 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Raul Rangel: Looks good to me, approved

diff --git a/src/soc/amd/common/block/psp/psp_gen2.c b/src/soc/amd/common/block/psp/psp_gen2.c
index ef71d5b..0972131 100644
--- a/src/soc/amd/common/block/psp/psp_gen2.c
+++ b/src/soc/amd/common/block/psp/psp_gen2.c
@@ -10,16 +10,19 @@

#define PSP_MAILBOX_OFFSET		0x10570

+static uintptr_t soc_get_psp_base_address(void)
+{
+	uintptr_t psp_mmio = rdmsr(MSR_PSP_ADDR).lo;
+	if (!psp_mmio)
+		printk(BIOS_WARNING, "PSP: MSR_PSP_ADDR uninitialized\n");
+	return psp_mmio;
+}
+
 void *soc_get_mbox_address(void)
 {
-	uintptr_t psp_mmio;
-
-	psp_mmio = rdmsr(MSR_PSP_ADDR).lo;
-	if (!psp_mmio) {
-		printk(BIOS_WARNING, "PSP: MSR_PSP_ADDR uninitialized\n");
+	uintptr_t psp_mmio = soc_get_psp_base_address();
+	if (!psp_mmio)
    	return 0;
-	}
-
    return (void *)(psp_mmio + PSP_MAILBOX_OFFSET);
 }