diff options
| author | Felix Held <felix-coreboot@felixheld.de> | 2021-02-17 22:22:21 +0100 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2021-02-19 13:20:16 +0000 |
| commit | e09294f57a03a21ff89b571b0a606c358fc97188 (patch) | |
| tree | a8e9b378aec2dbd210a262169c0a138b04409c1f /src/soc | |
| parent | 285dd6ec3a8529d2b91eb657e85007be6a3397b6 (diff) | |
include/cpu/amd/msr: rename MSR_PSP_ADDR to PSP_ADDR_MSR
The new name is more consistent with the rest of the MSR definitions.
Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: I5666d9837c61881639b5f292553a728e49c5ceb2
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50855
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>
Diffstat (limited to 'src/soc')
| -rw-r--r-- | src/soc/amd/common/block/psp/psp_gen2.c | 4 | ||||
| -rw-r--r-- | src/soc/amd/stoneyridge/cpu.c | 4 | ||||
| -rw-r--r-- | src/soc/amd/stoneyridge/psp.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/soc/amd/common/block/psp/psp_gen2.c b/src/soc/amd/common/block/psp/psp_gen2.c index 95adce40d2..e2f51d8206 100644 --- a/src/soc/amd/common/block/psp/psp_gen2.c +++ b/src/soc/amd/common/block/psp/psp_gen2.c @@ -13,9 +13,9 @@ static uintptr_t soc_get_psp_base_address(void) { - uintptr_t psp_mmio = rdmsr(MSR_PSP_ADDR).lo; + uintptr_t psp_mmio = rdmsr(PSP_ADDR_MSR).lo; if (!psp_mmio) - printk(BIOS_ERR, "PSP: MSR_PSP_ADDR uninitialized\n"); + printk(BIOS_ERR, "PSP: PSP_ADDR_MSR uninitialized\n"); return psp_mmio; } diff --git a/src/soc/amd/stoneyridge/cpu.c b/src/soc/amd/stoneyridge/cpu.c index 17fd9b97bb..d943deb69a 100644 --- a/src/soc/amd/stoneyridge/cpu.c +++ b/src/soc/amd/stoneyridge/cpu.c @@ -76,10 +76,10 @@ static void model_15_init(struct device *dev) uint32_t psp_bar; /* Note: NDA BKDG names this 32-bit register BAR3 */ psp_bar = pci_read_config32(SOC_PSP_DEV, PCI_BASE_ADDRESS_4); psp_bar &= ~PCI_BASE_ADDRESS_MEM_ATTR_MASK; - psp_msr = rdmsr(MSR_PSP_ADDR); + psp_msr = rdmsr(PSP_ADDR_MSR); if (psp_msr.lo == 0) { psp_msr.lo = psp_bar; - wrmsr(MSR_PSP_ADDR, psp_msr); + wrmsr(PSP_ADDR_MSR, psp_msr); } } diff --git a/src/soc/amd/stoneyridge/psp.c b/src/soc/amd/stoneyridge/psp.c index cd14d7bf69..8d6290f619 100644 --- a/src/soc/amd/stoneyridge/psp.c +++ b/src/soc/amd/stoneyridge/psp.c @@ -45,9 +45,9 @@ void *soc_get_mbox_address(void) /* Determine if Bar3Hide has been set, and if hidden get the base from * the MSR instead. */ if (pci_read_config32(SOC_PSP_DEV, PSP_BAR_ENABLES) & BAR3HIDE) { - psp_mmio = rdmsr(MSR_PSP_ADDR).lo; + psp_mmio = rdmsr(PSP_ADDR_MSR).lo; if (!psp_mmio) { - printk(BIOS_WARNING, "PSP: BAR hidden, MSR_PSP_ADDR uninitialized\n"); + printk(BIOS_WARNING, "PSP: BAR hidden, PSP_ADDR_MSR uninitialized\n"); return 0; } } else { |