soc/amd/picasso/psp: move to common code and rename to psp_smm_gen2

Change-Id: I771a7d36eea7307754386824190624a09c0e38f7
Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50515
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>

2 files changed, 0 insertions, 46 deletions

diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc
index d81eddc59d..e92de1f588 100644
--- a/src/soc/amd/picasso/Makefile.inc
+++ b/src/soc/amd/picasso/Makefile.inc
@@ -25,7 +25,6 @@ romstage-y += gpio.c
 romstage-y += reset.c
 romstage-y += memmap.c
 romstage-y += uart.c
-romstage-y += psp.c
 romstage-y += mrc_cache.c
 
 verstage-y += i2c.c
@@ -50,7 +49,6 @@ ramstage-y += memmap.c
 ramstage-y += uart.c
 ramstage-y += finalize.c
 ramstage-y += soc_util.c
-ramstage-y += psp.c
 ramstage-y += fsp_params.c
 ramstage-y += update_microcode.c
 ramstage-y += graphics.c
@@ -63,7 +61,6 @@ ifeq ($(CONFIG_DEBUG_SMI),y)
 smm-y += uart.c
 endif
 smm-y += gpio.c
-smm-y += psp.c
 smm-y += smu.c
 
 CPPFLAGS_common += -I$(src)/soc/amd/picasso
diff --git a/src/soc/amd/picasso/psp.c b/src/soc/amd/picasso/psp.c
deleted file mode 100644
index f02723ad1f..0000000000
--- a/src/soc/amd/picasso/psp.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <soc/smi.h>
-#include <amdblocks/acpimmio.h>
-#include <amdblocks/psp.h>
-#include <amdblocks/smi.h>
-
-void soc_fill_smm_trig_info(struct smm_trigger_info *trig)
-{
-	if (!trig)
-		return;
-
-	trig->address = (uintptr_t)acpimmio_smi + SMI_REG_SMITRIG0;
-	trig->address_type = SMM_TRIGGER_MEM;
-	trig->value_width = SMM_TRIGGER_DWORD;
-	trig->value_and_mask = ~SMITRIG0_PSP;
-	trig->value_or_mask = SMITRIG0_PSP;
-}
-
-void soc_fill_smm_reg_info(struct smm_register_info *reg)
-{
-	if (!reg)
-		return;
-
-	reg->smi_enb.address = (uintptr_t)acpimmio_smi + SMI_REG_SMITRIG0;
-	reg->smi_enb.address_type = SMM_TRIGGER_MEM;
-	reg->smi_enb.value_width = SMM_TRIGGER_DWORD;
-	reg->smi_enb.reg_bit_mask = SMITRG0_SMIENB;
-	reg->smi_enb.expect_value = 0;
-
-	reg->eos.address = (uintptr_t)acpimmio_smi + SMI_REG_SMITRIG0;
-	reg->eos.address_type = SMM_TRIGGER_MEM;
-	reg->eos.value_width = SMM_TRIGGER_DWORD;
-	reg->eos.reg_bit_mask = SMITRG0_EOS;
-	reg->eos.expect_value = SMITRG0_EOS;
-
-	reg->psp_smi_en.address = (uintptr_t)acpimmio_smi + SMI_REG_CONTROL0;
-	reg->psp_smi_en.address += sizeof(uint32_t) * SMITYPE_PSP / 16;
-	reg->psp_smi_en.address_type = SMM_TRIGGER_MEM;
-	reg->psp_smi_en.value_width = SMM_TRIGGER_DWORD;
-	reg->psp_smi_en.reg_bit_mask = SMI_MODE_MASK << (2 * SMITYPE_PSP % 16);
-	reg->psp_smi_en.expect_value = SMI_MODE_SMI << (2 * SMITYPE_PSP % 16);
-}