summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
authorMarshall Dawson <marshall.dawson@amd.corp-partner.google.com>2020-01-19 17:16:01 -0700
committerFelix Held <felix-coreboot@felixheld.de>2020-04-02 16:11:47 +0000
commit3c57819005af59064ea0397e8b1ed59fab5a8f7c (patch)
tree14bc20c3908e4a1295dbd10b89de2f799757f0c3 /src/soc
parentdba3229b90c7762e9f101cdcd036ca48c76f56bf (diff)
downloadcoreboot-3c57819005af59064ea0397e8b1ed59fab5a8f7c.tar.xz
soc/amd/common/psp: Move definitions into a private file
Declutter psp.h by removing internal details the caller doesn't need to know. BUG=b:130660285 TEST: Verify PSP functionality on google/grunt Change-Id: I2fb0ed1d2697c313fb8475e3f00482899e729130 Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com> Reviewed-on: https://chromium-review.googlesource.com/2020366 Tested-by: Eric Peers <epeers@google.com> Reviewed-by: Eric Peers <epeers@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/40015 Reviewed-by: Raul Rangel <rrangel@chromium.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/amd/common/block/include/amdblocks/psp.h63
-rw-r--r--src/soc/amd/common/block/psp/psp.c1
-rw-r--r--src/soc/amd/common/block/psp/psp_def.h73
3 files changed, 75 insertions, 62 deletions
diff --git a/src/soc/amd/common/block/include/amdblocks/psp.h b/src/soc/amd/common/block/include/amdblocks/psp.h
index 42c802d51b..d7f6169411 100644
--- a/src/soc/amd/common/block/include/amdblocks/psp.h
+++ b/src/soc/amd/common/block/include/amdblocks/psp.h
@@ -18,63 +18,7 @@
/* Get the mailbox base address - specific to family of device. */
struct psp_mbox *soc_get_mbox_address(void);
-/* x86 to PSP commands */
-#define MBOX_BIOS_CMD_DRAM_INFO 0x01
-#define MBOX_BIOS_CMD_SMM_INFO 0x02
-#define MBOX_BIOS_CMD_SX_INFO 0x03
-#define MBOX_BIOS_CMD_RSM_INFO 0x04
-#define MBOX_BIOS_CMD_PSP_QUERY 0x05
-#define MBOX_BIOS_CMD_BOOT_DONE 0x06
-#define MBOX_BIOS_CMD_CLEAR_S3_STS 0x07
-#define MBOX_BIOS_CMD_S3_DATA_INFO 0x08
-#define MBOX_BIOS_CMD_NOP 0x09
-#define MBOX_BIOS_CMD_SMU_FW 0x19
-#define MBOX_BIOS_CMD_SMU_FW2 0x1a
-#define MBOX_BIOS_CMD_ABORT 0xfe
-
-/* generic PSP interface status */
-#define STATUS_INITIALIZED 0x1
-#define STATUS_ERROR 0x2
-#define STATUS_TERMINATED 0x4
-#define STATUS_HALT 0x8
-#define STATUS_RECOVERY 0x10
-
-/* psp_mbox consists of hardware registers beginning at PSPx000070
- * mbox_command: BIOS->PSP command, cleared by PSP when complete
- * mbox_status: BIOS->PSP interface status
- * cmd_response: pointer to command/response buffer
- */
-struct psp_mbox {
- u32 mbox_command;
- u32 mbox_status;
- u64 cmd_response; /* definition conflicts w/BKDG but matches agesa */
-} __packed;
-
-/* command/response format, BIOS builds this in memory
- * mbox_buffer_header: generic header
- * mbox_buffer: command-specific buffer format
- *
- * AMD reference code aligns and pads all buffers to 32 bytes.
- */
-struct mbox_buffer_header {
- u32 size; /* total size of buffer */
- u32 status; /* command status, filled by PSP if applicable */
-} __packed;
-
-/*
- * command-specific buffer definitions: see NDA document #54267
- * The following commands need a buffer definition if they are to be used.
- * All other commands will work with the default buffer.
- * MBOX_BIOS_CMD_SMM_INFO MBOX_BIOS_CMD_PSP_QUERY
- * MBOX_BIOS_CMD_SX_INFO MBOX_BIOS_CMD_S3_DATA_INFO
- * MBOX_BIOS_CMD_RSM_INFO
- */
-
-struct mbox_default_buffer { /* command-response buffer unused by command */
- struct mbox_buffer_header header;
-} __attribute__((packed, aligned(32)));
-
-/* send_psp_command() error codes */
+/* BIOS-to-PSP functions return 0 if successful, else negative value */
#define PSPSTS_SUCCESS 0
#define PSPSTS_NOBASE 1
#define PSPSTS_HALTED 2
@@ -87,11 +31,6 @@ struct mbox_default_buffer { /* command-response buffer unused by command */
#define PSPSTS_INVALID_NAME 8
#define PSPSTS_INVALID_BLOB 9
-#define PSP_INIT_TIMEOUT 10000 /* 10 seconds */
-#define PSP_CMD_TIMEOUT 1000 /* 1 second */
-
-/* BIOS-to-PSP functions return 0 if successful, else negative value */
-
int psp_notify_dram(void);
/*
diff --git a/src/soc/amd/common/block/psp/psp.c b/src/soc/amd/common/block/psp/psp.c
index 7ec8d7b0c9..c580803829 100644
--- a/src/soc/amd/common/block/psp/psp.c
+++ b/src/soc/amd/common/block/psp/psp.c
@@ -24,6 +24,7 @@
#include <amdblocks/psp.h>
#include <soc/iomap.h>
#include <soc/northbridge.h>
+#include "psp_def.h"
static const char *psp_status_nobase = "error: PSP BAR3 not assigned";
static const char *psp_status_halted = "error: PSP in halted state";
diff --git a/src/soc/amd/common/block/psp/psp_def.h b/src/soc/amd/common/block/psp/psp_def.h
new file mode 100644
index 0000000000..4b3ca6a352
--- /dev/null
+++ b/src/soc/amd/common/block/psp/psp_def.h
@@ -0,0 +1,73 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/* This file is part of the coreboot project. */
+
+#ifndef __AMD_PSP_DEF_H__
+#define __AMD_PSP_DEF_H__
+
+#include <types.h>
+
+/* x86 to PSP commands */
+#define MBOX_BIOS_CMD_DRAM_INFO 0x01
+#define MBOX_BIOS_CMD_SMM_INFO 0x02
+#define MBOX_BIOS_CMD_SX_INFO 0x03
+#define MBOX_BIOS_CMD_RSM_INFO 0x04
+#define MBOX_BIOS_CMD_PSP_QUERY 0x05
+#define MBOX_BIOS_CMD_BOOT_DONE 0x06
+#define MBOX_BIOS_CMD_CLEAR_S3_STS 0x07
+#define MBOX_BIOS_CMD_S3_DATA_INFO 0x08
+#define MBOX_BIOS_CMD_NOP 0x09
+#define MBOX_BIOS_CMD_SMU_FW 0x19
+#define MBOX_BIOS_CMD_SMU_FW2 0x1a
+#define MBOX_BIOS_CMD_ABORT 0xfe
+
+/* generic PSP interface status */
+#define STATUS_INITIALIZED 0x1
+#define STATUS_ERROR 0x2
+#define STATUS_TERMINATED 0x4
+#define STATUS_HALT 0x8
+#define STATUS_RECOVERY 0x10
+
+/* psp_mbox consists of hardware registers beginning at PSPx000070
+ * mbox_command: BIOS->PSP command, cleared by PSP when complete
+ * mbox_status: BIOS->PSP interface status
+ * cmd_response: pointer to command/response buffer
+ */
+struct psp_mbox {
+ u32 mbox_command;
+ u32 mbox_status;
+ u64 cmd_response; /* definition conflicts w/BKDG but matches agesa */
+} __packed;
+
+/* command/response format, BIOS builds this in memory
+ * mbox_buffer_header: generic header
+ * mbox_buffer: command-specific buffer format
+ *
+ * AMD reference code aligns and pads all buffers to 32 bytes.
+ */
+struct mbox_buffer_header {
+ u32 size; /* total size of buffer */
+ u32 status; /* command status, filled by PSP if applicable */
+} __packed;
+
+/*
+ * command-specific buffer definitions: see NDA document #54267
+ * The following commands need a buffer definition if they are to be used.
+ * All other commands will work with the default buffer.
+ * MBOX_BIOS_CMD_SMM_INFO MBOX_BIOS_CMD_PSP_QUERY
+ * MBOX_BIOS_CMD_SX_INFO MBOX_BIOS_CMD_S3_DATA_INFO
+ * MBOX_BIOS_CMD_RSM_INFO
+ */
+
+struct mbox_default_buffer { /* command-response buffer unused by command */
+ struct mbox_buffer_header header;
+} __attribute__((packed, aligned(32)));
+
+struct mbox_cmd_sx_info_buffer {
+ struct mbox_buffer_header header;
+ u8 sleep_type;
+} __attribute__((packed, aligned(32)));
+
+#define PSP_INIT_TIMEOUT 10000 /* 10 seconds */
+#define PSP_CMD_TIMEOUT 1000 /* 1 second */
+
+#endif /* __AMD_PSP_DEF_H__ */