summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Held <felix-coreboot@felixheld.de>2023-01-12 23:10:22 +0100
committerFelix Held <felix-coreboot@felixheld.de>2023-01-13 23:35:56 +0000
commit43529966a071754a19d531ea7c2ce18af20de873 (patch)
treeccf27fd0cb1e96b80263378e595ff086673aebf5
parent4a973324da513a54c8e7fbeb5d1b8dd2ea27b927 (diff)
soc/amd/picasso: use common SMU S3/4/5 entry message code
Signed-off-by: Felix Held <felix-coreboot@felixheld.de> Change-Id: Iedd99cfb64809c4e111e0931c2260981f465035b Reviewed-on: https://review.coreboot.org/c/coreboot/+/71876 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com> Reviewed-by: Fred Reitberger <reitbergerfred@gmail.com>
-rw-r--r--src/soc/amd/picasso/Kconfig1
-rw-r--r--src/soc/amd/picasso/Makefile.inc1
-rw-r--r--src/soc/amd/picasso/smu.c17
3 files changed, 1 insertions, 18 deletions
diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig
index b18868dcec..a0254e98d3 100644
--- a/src/soc/amd/picasso/Kconfig
+++ b/src/soc/amd/picasso/Kconfig
@@ -55,6 +55,7 @@ config SOC_AMD_PICASSO
select SOC_AMD_COMMON_BLOCK_SMI
select SOC_AMD_COMMON_BLOCK_SMM
select SOC_AMD_COMMON_BLOCK_SMU
+ select SOC_AMD_COMMON_BLOCK_SMU_SX_ENTRY
select SOC_AMD_COMMON_BLOCK_SPI
select SOC_AMD_COMMON_BLOCK_TSC_FAM17H_19H
select SOC_AMD_COMMON_BLOCK_UART
diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc
index 504a40ef85..cc073a7cfe 100644
--- a/src/soc/amd/picasso/Makefile.inc
+++ b/src/soc/amd/picasso/Makefile.inc
@@ -50,7 +50,6 @@ ifeq ($(CONFIG_DEBUG_SMI),y)
smm-y += uart.c
endif
smm-y += gpio.c
-smm-y += smu.c
CPPFLAGS_common += -I$(src)/soc/amd/picasso/include
CPPFLAGS_common += -I$(src)/soc/amd/picasso/acpi
diff --git a/src/soc/amd/picasso/smu.c b/src/soc/amd/picasso/smu.c
deleted file mode 100644
index 076baaaded..0000000000
--- a/src/soc/amd/picasso/smu.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <amdblocks/smu.h>
-#include <console/console.h>
-#include <soc/smu.h>
-
-/*
- * Request the SMU to put system into S3, S4, or S5. On entry, SlpTyp determines S-State and
- * SlpTypeEn gets set by the SMU. Function does not return if successful.
- */
-void smu_sx_entry(void)
-{
- struct smu_payload msg = { 0 }; /* Unused for SMC_MSG_S3ENTRY */
-
- printk(BIOS_DEBUG, "SMU: Put system into S3/S4/S5\n");
- send_smu_message(SMC_MSG_S3ENTRY, &msg);
-}