commit 285dd6ec3a8529d2b91eb657e85007be6a3397b6
author Felix Held <felix-coreboot@felixheld.de> Wed Feb 17 22:16:40 2021 +0100
committer Felix Held <felix-coreboot@felixheld.de> Fri Feb 19 13:19:24 2021 +0000
tree e706223e60933d3b883d1d1930ba738b1d30f7bd
parent 82d16b150ce3287f4e9f33e86bdde32bc455b193

soc/amd/common/amdblocks/psp: move MSR_PSP_ADDR to include/cpu/amd/msr.h

Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: I5bd6f74bc0fbe461fa01d3baa63612eaec77b97a
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50854
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

src/soc/amd/common/block/include/amdblocks/psp.h

diff --git a/src/soc/amd/common/block/include/amdblocks/psp.h b/src/soc/amd/common/block/include/amdblocks/psp.h
index 9d56d6b..8cd8236 100644
--- a/src/soc/amd/common/block/include/amdblocks/psp.h
+++ b/src/soc/amd/common/block/include/amdblocks/psp.h
@@ -3,8 +3,6 @@
 #ifndef AMD_BLOCK_PSP_H
 #define AMD_BLOCK_PSP_H
 
-#define MSR_PSP_ADDR		0xc00110a2
-
 /* Get the mailbox base address - specific to family of device. */
 void *soc_get_mbox_address(void);
 

src/soc/amd/common/block/psp/psp_gen2.c

diff --git a/src/soc/amd/common/block/psp/psp_gen2.c b/src/soc/amd/common/block/psp/psp_gen2.c
index ca84057..95adce4 100644
--- a/src/soc/amd/common/block/psp/psp_gen2.c
+++ b/src/soc/amd/common/block/psp/psp_gen2.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <console/console.h>
+#include <cpu/amd/msr.h>
 #include <cpu/x86/msr.h>
 #include <device/mmio.h>
 #include <timer.h>

src/soc/amd/stoneyridge/cpu.c

diff --git a/src/soc/amd/stoneyridge/cpu.c b/src/soc/amd/stoneyridge/cpu.c
index badea8b..17fd9b9 100644
--- a/src/soc/amd/stoneyridge/cpu.c
+++ b/src/soc/amd/stoneyridge/cpu.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <amdblocks/smm.h>
+#include <cpu/amd/msr.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/mp.h>
 #include <cpu/x86/mtrr.h>
@@ -15,7 +16,6 @@
 #include <soc/smi.h>
 #include <soc/iomap.h>
 #include <console/console.h>
-#include <amdblocks/psp.h>
 
 /*
  * MP and SMM loading initialization.

src/soc/amd/stoneyridge/psp.c

diff --git a/src/soc/amd/stoneyridge/psp.c b/src/soc/amd/stoneyridge/psp.c
index 69db08d..cd14d7b 100644
--- a/src/soc/amd/stoneyridge/psp.c
+++ b/src/soc/amd/stoneyridge/psp.c
@@ -3,6 +3,7 @@
 #include <console/console.h>
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
+#include <cpu/amd/msr.h>
 #include <cpu/x86/msr.h>
 #include <soc/pci_devs.h>
 #include <soc/northbridge.h>