GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/amd/common/block/psp/psp_gen2: use offsets to access mailbox 

Drop struct pspv2_mbox and access the PSP mailbox via their offsets into
PSP MMIO region.

Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: Ib665d7ae19deae07d6a69c11ba8cf44e45ea4e70
Reviewed-on: https://review.coreboot.org/c/coreboot/+/63966
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Reviewed-by: Fred Reitberger <reitbergerfred@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Felix Held 2022-04-29 19:22:33 +02:00
parent 8b4369e452
commit cc07fa5d0e
1 changed files with 20 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/soc/amd/common/block/psp/psp_gen2.c
View File

@ -10,12 +10,8 @@
#include <soc/iomap.h> #include <soc/iomap.h>
#include "psp_def.h" #include "psp_def.h"
#define PSP_MAILBOX_OFFSET 0x10570 #define PSP_MAILBOX_COMMAND_OFFSET 0x10570 /* 4 bytes */
#define PSP_MAILBOX_BUFFER_OFFSET 0x10574 /* 8 bytes */
struct pspv2_mbox {
u32 command;
u64 buffer;
} __packed;
union pspv2_mbox_command { union pspv2_mbox_command {
u32 val; u32 val;
@ -36,45 +32,37 @@ static uintptr_t soc_get_psp_base_address(void)
return psp_mmio; return psp_mmio;
} }
static void *soc_get_mbox_address(void) static u16 rd_mbox_sts(uintptr_t psp_mmio)
{
uintptr_t psp_mmio = soc_get_psp_base_address();
if (!psp_mmio)
return 0;
return (void *)(psp_mmio + PSP_MAILBOX_OFFSET);
}
static u16 rd_mbox_sts(struct pspv2_mbox *mbox)
{ {
union pspv2_mbox_command tmp = { .val = 0 }; union pspv2_mbox_command tmp = { .val = 0 };
tmp.val = read32(&mbox->command); tmp.val = read32p(psp_mmio + PSP_MAILBOX_COMMAND_OFFSET);
return tmp.fields.mbox_status; return tmp.fields.mbox_status;
} }
static void wr_mbox_cmd(struct pspv2_mbox *mbox, u8 cmd) static void wr_mbox_cmd(uintptr_t psp_mmio, u8 cmd)
{ {
union pspv2_mbox_command tmp = { .val = 0 }; union pspv2_mbox_command tmp = { .val = 0 };
/* Write entire 32-bit area to begin command execution */ /* Write entire 32-bit area to begin command execution */
tmp.fields.mbox_command = cmd; tmp.fields.mbox_command = cmd;
write32(&mbox->command, tmp.val); write32p(psp_mmio + PSP_MAILBOX_COMMAND_OFFSET, tmp.val);
} }
static u8 rd_mbox_recovery(struct pspv2_mbox *mbox) static u8 rd_mbox_recovery(uintptr_t psp_mmio)
{ {
union pspv2_mbox_command tmp = { .val = 0 }; union pspv2_mbox_command tmp = { .val = 0 };
tmp.val = read32(&mbox->command); tmp.val = read32p(psp_mmio + PSP_MAILBOX_COMMAND_OFFSET);
return !!tmp.fields.recovery; return !!tmp.fields.recovery;
} }
static void wr_mbox_buffer_ptr(struct pspv2_mbox *mbox, void *buffer) static void wr_mbox_buffer_ptr(uintptr_t psp_mmio, void *buffer)
{ {
write64(&mbox->buffer, (uintptr_t)buffer); write64p(psp_mmio + PSP_MAILBOX_BUFFER_OFFSET, (uintptr_t)buffer);
} }
static int wait_command(struct pspv2_mbox *mbox, bool wait_for_ready) static int wait_command(uintptr_t psp_mmio, bool wait_for_ready)
{ {
union pspv2_mbox_command and_mask = { .val = ~0 }; union pspv2_mbox_command and_mask = { .val = ~0 };
union pspv2_mbox_command expected = { .val = 0 }; union pspv2_mbox_command expected = { .val = 0 };
@ -92,7 +80,7 @@ static int wait_command(struct pspv2_mbox *mbox, bool wait_for_ready)
stopwatch_init_msecs_expire(&sw, PSP_CMD_TIMEOUT); stopwatch_init_msecs_expire(&sw, PSP_CMD_TIMEOUT);
do { do {
tmp = read32(&mbox->command); tmp = read32p(psp_mmio + PSP_MAILBOX_COMMAND_OFFSET);
tmp &= ~and_mask.val; tmp &= ~and_mask.val;
if (tmp == expected.val) if (tmp == expected.val)
return 0; return 0;
@ -103,27 +91,27 @@ static int wait_command(struct pspv2_mbox *mbox, bool wait_for_ready)
int send_psp_command(u32 command, void *buffer) int send_psp_command(u32 command, void *buffer)
{ {
struct pspv2_mbox *mbox = soc_get_mbox_address(); uintptr_t psp_mmio = soc_get_psp_base_address();
if (!mbox) if (!psp_mmio)
return -PSPSTS_NOBASE; return -PSPSTS_NOBASE;
if (rd_mbox_recovery(mbox)) if (rd_mbox_recovery(psp_mmio))
return -PSPSTS_RECOVERY; return -PSPSTS_RECOVERY;
if (wait_command(mbox, true)) if (wait_command(psp_mmio, true))
return -PSPSTS_CMD_TIMEOUT; return -PSPSTS_CMD_TIMEOUT;
/* set address of command-response buffer and write command register */ /* set address of command-response buffer and write command register */
wr_mbox_buffer_ptr(mbox, buffer); wr_mbox_buffer_ptr(psp_mmio, buffer);
wr_mbox_cmd(mbox, command); wr_mbox_cmd(psp_mmio, command);
/* PSP clears command register when complete. All commands except /* PSP clears command register when complete. All commands except
* SxInfo set the Ready bit. */ * SxInfo set the Ready bit. */
if (wait_command(mbox, command != MBOX_BIOS_CMD_SX_INFO)) if (wait_command(psp_mmio, command != MBOX_BIOS_CMD_SX_INFO))
return -PSPSTS_CMD_TIMEOUT; return -PSPSTS_CMD_TIMEOUT;
/* check delivery status */ /* check delivery status */
if (rd_mbox_sts(mbox)) if (rd_mbox_sts(psp_mmio))
return -PSPSTS_SEND_ERROR; return -PSPSTS_SEND_ERROR;
return 0; return 0;