4 files changed, 112 insertions, 0 deletions
diff --git a/src/soc/amd/common/block/include/amdblocks/smu.h b/src/soc/amd/common/block/include/amdblocks/smu.h
new file mode 100644
index 0000000000..57ef3b324e
--- /dev/null
+++ b/src/soc/amd/common/block/include/amdblocks/smu.h
@@ -0,0 +1,26 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef __AMD_BLOCK_SMU_H__
+#define __AMD_BLOCK_SMU_H__
+
+#include <types.h>
+#include <soc/smu.h> /* SoC-dependent definitions for SMU access */
+
+/* SMU registers accessed indirectly using an index/data pair in D0F00 config space */
+#define SMU_INDEX_ADDR		0xb8 /* 32 bit */
+#define SMU_DATA_ADDR		0xbc /* 32 bit */
+
+/* Arguments indexed locations are contiguous; the number is SoC-dependent */
+#define REG_ADDR_MESG_ARG(x)	(REG_ADDR_MESG_ARGS_BASE + ((x) * sizeof(uint32_t)))
+
+struct smu_payload {
+	uint32_t msg[SMU_NUM_ARGS];
+};
+
+/*
+ * Send a message and bi-directional payload to the SMU. The SMU's response, if any, is
+ * returned via *arg. Returns CB_SUCCESS if success or CB_ERR on failure.
+ */
+enum cb_err send_smu_message(enum smu_message_id message_id, struct smu_payload *arg);
+
+#endif /* __AMD_BLOCK_SMU_H__ */
diff --git a/src/soc/amd/common/block/smu/Kconfig b/src/soc/amd/common/block/smu/Kconfig
new file mode 100644
index 0000000000..60c231fae8
--- /dev/null
+++ b/src/soc/amd/common/block/smu/Kconfig
@@ -0,0 +1,5 @@
+config SOC_AMD_COMMON_BLOCK_SMU
+	bool
+	default n
+	help
+	  Select this option to add functions to communicate with the SMU to the build.
diff --git a/src/soc/amd/common/block/smu/Makefile.inc b/src/soc/amd/common/block/smu/Makefile.inc
new file mode 100644
index 0000000000..2afd81abde
--- /dev/null
+++ b/src/soc/amd/common/block/smu/Makefile.inc
@@ -0,0 +1 @@
+smm-$(CONFIG_SOC_AMD_COMMON_BLOCK_SMU) += smu.c
diff --git a/src/soc/amd/common/block/smu/smu.c b/src/soc/amd/common/block/smu/smu.c
new file mode 100644
index 0000000000..4f9c1d1abe
--- /dev/null
+++ b/src/soc/amd/common/block/smu/smu.c
@@ -0,0 +1,80 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <timer.h>
+#include <console/console.h>
+#include <device/pci_ops.h>
+#include <amdblocks/smu.h>
+#include <soc/pci_devs.h>
+#include <soc/smu.h>
+#include <types.h>
+
+static uint32_t smu_read32(uint32_t reg)
+{
+	pci_write_config32(SOC_GNB_DEV, SMU_INDEX_ADDR, reg);
+	return pci_read_config32(SOC_GNB_DEV, SMU_DATA_ADDR);
+}
+
+static void smu_write32(uint32_t reg, uint32_t val)
+{
+	pci_write_config32(SOC_GNB_DEV, SMU_INDEX_ADDR, reg);
+	pci_write_config32(SOC_GNB_DEV, SMU_DATA_ADDR, val);
+}
+
+#define SMU_MESG_RESP_TIMEOUT	0x00
+#define SMU_MESG_RESP_OK	0x01
+
+/* returns SMU_MESG_RESP_OK, SMU_MESG_RESP_TIMEOUT or a negative number */
+static int32_t smu_poll_response(bool print_command_duration)
+{
+	struct stopwatch sw;
+	const long timeout_ms = 10 * MSECS_PER_SEC;
+	int32_t result;
+
+	stopwatch_init_msecs_expire(&sw, timeout_ms);
+
+	do {
+		result = smu_read32(REG_ADDR_MESG_RESP);
+		if (result) {
+			if (print_command_duration)
+				printk(BIOS_SPEW, "SMU command consumed %ld usecs\n",
+					stopwatch_duration_usecs(&sw));
+			return result;
+		}
+	} while (!stopwatch_expired(&sw));
+
+	printk(BIOS_ERR, "Error: timeout sending SMU message\n");
+	return SMU_MESG_RESP_TIMEOUT;
+}
+
+/*
+ * Send a message and bi-directional payload to the SMU. SMU response, if any, is returned via
+ * *arg.
+ */
+enum cb_err send_smu_message(enum smu_message_id message_id, struct smu_payload *arg)
+{
+	size_t i;
+
+	/* wait until SMU can process a new request; don't care if an old request failed */
+	if (smu_poll_response(false) == SMU_MESG_RESP_TIMEOUT)
+		return CB_ERR;
+
+	/* clear response register */
+	smu_write32(REG_ADDR_MESG_RESP, 0);
+
+	/* populate arguments */
+	for (i = 0 ; i < SMU_NUM_ARGS ; i++)
+		smu_write32(REG_ADDR_MESG_ARG(i), arg->msg[i]);
+
+	/* send message to SMU */
+	smu_write32(REG_ADDR_MESG_ID, message_id);
+
+	/* wait until SMU has processed the message and check if it was successful */
+	if (smu_poll_response(true) != SMU_MESG_RESP_OK)
+		return CB_ERR;
+
+	/* copy returned values */
+	for (i = 0 ; i < SMU_NUM_ARGS ; i++)
+		arg->msg[i] = smu_read32(REG_ADDR_MESG_ARG(i));
+
+	return CB_SUCCESS;
+}