[coreboot-gerrit] Change in coreboot[master]: Revert "soc/amd/common/vboot: Remove parameter to replay_transfer_buf...

[Joey Madafferi (Code Review)]

Attention is currently required from: Jason Glenesk, Raul Rangel, Marshall Dawson, Fred Reitberger, Rob Barnes, Karthik Ramasubramanian, Felix Held.
Hello build bot (Jenkins), Jason Glenesk, Raul Rangel, Marshall Dawson, Rob Barnes, Fred Reitberger, Karthik Ramasubramanian, Felix Held,

I'd like you to do a code review. Please visit

https://review.coreboot.org/c/coreboot/+/62532

to review the following change.

Change subject: Revert "soc/amd/common/vboot: Remove parameter to replay_transfer_buffer_cbmemc"
......................................................................

Revert "soc/amd/common/vboot: Remove parameter to replay_transfer_buffer_cbmemc"

This reverts commit 08de3e3bd805dbacdf7c5176cb1b070014544361.

Reason for revert: <INSERT REASONING HERE>
Not running

Change-Id: I8e5fe4b13cd8a96df3dd524565f5256790b5cf86
---
M src/soc/amd/cezanne/include/soc/psp_transfer.h
M src/soc/amd/common/vboot/transfer_buffer.c
M src/soc/amd/common/vboot/vboot_bootblock.c
M src/soc/amd/picasso/include/soc/psp_transfer.h
M src/soc/amd/sabrina/include/soc/psp_transfer.h
5 files changed, 5 insertions(+), 10 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/32/62532/1

diff --git a/src/soc/amd/cezanne/include/soc/psp_transfer.h b/src/soc/amd/cezanne/include/soc/psp_transfer.h
index f81785e..afa6a58 100644
--- a/src/soc/amd/cezanne/include/soc/psp_transfer.h
+++ b/src/soc/amd/cezanne/include/soc/psp_transfer.h
@@ -54,7 +54,7 @@
 /* Display the transfer block's PSP_info data */
 void show_psp_transfer_info(void);
 /* Replays the pre-x86 cbmem console into the x86 cbmem console */
-void replay_transfer_buffer_cbmemc(void);
+void replay_transfer_buffer_cbmemc(const struct transfer_info_struct *info);
 /* Called by bootblock_c_entry in the VBOOT_STARTS_BEFORE_BOOTBLOCK case */
 void boot_with_psp_timestamp(uint64_t base_timestamp);

diff --git a/src/soc/amd/common/vboot/transfer_buffer.c b/src/soc/amd/common/vboot/transfer_buffer.c
index 63b4f8e..06e564a 100644
--- a/src/soc/amd/common/vboot/transfer_buffer.c
+++ b/src/soc/amd/common/vboot/transfer_buffer.c
@@ -61,17 +61,12 @@
    }
 }

-void replay_transfer_buffer_cbmemc(void)
+void replay_transfer_buffer_cbmemc(const struct transfer_info_struct *info)
 {
-	const struct transfer_info_struct *info = (const struct transfer_info_struct *)
-		(void *)(uintptr_t)_transfer_buffer;

void *cbmemc;
    size_t cbmemc_size;

-	if (!transfer_buffer_valid(info))
-		return;
-
    if (info->console_offset < sizeof(*info))
    	return;

diff --git a/src/soc/amd/common/vboot/vboot_bootblock.c b/src/soc/amd/common/vboot/vboot_bootblock.c
index 1375e98..7264836 100644
--- a/src/soc/amd/common/vboot/vboot_bootblock.c
+++ b/src/soc/amd/common/vboot/vboot_bootblock.c
@@ -14,7 +14,7 @@
    if (!transfer_buffer_valid(info) || info->timestamp == 0)
    	return;

-	replay_transfer_buffer_cbmemc();
+	replay_transfer_buffer_cbmemc(info);

/*
     * info->timestamp is PSP's timestamp (in microseconds)
diff --git a/src/soc/amd/picasso/include/soc/psp_transfer.h b/src/soc/amd/picasso/include/soc/psp_transfer.h
index 5b51691..6b10ad2 100644
--- a/src/soc/amd/picasso/include/soc/psp_transfer.h
+++ b/src/soc/amd/picasso/include/soc/psp_transfer.h
@@ -54,7 +54,7 @@
 /* Display the transfer block's PSP_info data */
 void show_psp_transfer_info(void);
 /* Replays the pre-x86 cbmem console into the x86 cbmem console */
-void replay_transfer_buffer_cbmemc(void);
+void replay_transfer_buffer_cbmemc(const struct transfer_info_struct *info);
 /* Called by bootblock_c_entry in the VBOOT_STARTS_BEFORE_BOOTBLOCK case */
 void boot_with_psp_timestamp(uint64_t base_timestamp);

diff --git a/src/soc/amd/sabrina/include/soc/psp_transfer.h b/src/soc/amd/sabrina/include/soc/psp_transfer.h
index 6e3faaf..0fe204d 100644
--- a/src/soc/amd/sabrina/include/soc/psp_transfer.h
+++ b/src/soc/amd/sabrina/include/soc/psp_transfer.h
@@ -56,7 +56,7 @@
 /* Display the transfer block's PSP_info data */
 void show_psp_transfer_info(void);
 /* Replays the pre-x86 cbmem console into the x86 cbmem console */
-void replay_transfer_buffer_cbmemc(void);
+void replay_transfer_buffer_cbmemc(const struct transfer_info_struct *info);
 /* Called by bootblock_c_entry in the VBOOT_STARTS_BEFORE_BOOTBLOCK case */
 void boot_with_psp_timestamp(uint64_t base_timestamp);