From 39db1447431bdd651ff17a1c36dee08d7d0b3710 Mon Sep 17 00:00:00 2001 From: Elyes HAOUAS Date: Fri, 12 Oct 2018 12:28:59 +0200 Subject: mb: Replace MSR addresses with macros Change-Id: I020431ba8eb61f5ce256088b919c049985331d64 Signed-off-by: Elyes HAOUAS Reviewed-on: https://review.coreboot.org/29069 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- src/mainboard/amd/thatcher/mainboard.c | 13 +++++++------ src/mainboard/asus/f2a85-m/mainboard.c | 13 +++++++------ src/mainboard/msi/ms7721/mainboard.c | 13 +++++++------ 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/mainboard/amd/thatcher/mainboard.c b/src/mainboard/amd/thatcher/mainboard.c index ca62c2cf37..ef8f9c1011 100644 --- a/src/mainboard/amd/thatcher/mainboard.c +++ b/src/mainboard/amd/thatcher/mainboard.c @@ -16,6 +16,7 @@ #include #include #include +#include /************************************************* * enable the dedicated function in thatcher board. @@ -26,18 +27,18 @@ static void mainboard_enable(struct device *dev) printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n"); - msr = rdmsr(0xC0011020); + msr = rdmsr(LS_CFG_MSR); msr.lo &= ~(1 << 28); - wrmsr(0xC0011020, msr); + wrmsr(LS_CFG_MSR, msr); - msr = rdmsr(0xC0011022); + msr = rdmsr(DC_CFG_MSR); msr.lo &= ~(1 << 4); msr.lo &= ~(1 << 13); - wrmsr(0xC0011022, msr); + wrmsr(DC_CFG_MSR, msr); - msr = rdmsr(0xC0011023); + msr = rdmsr(BU_CFG_MSR); msr.lo &= ~(1 << 23); - wrmsr(0xC0011023, msr); + wrmsr(BU_CFG_MSR, msr); } struct chip_operations mainboard_ops = { diff --git a/src/mainboard/asus/f2a85-m/mainboard.c b/src/mainboard/asus/f2a85-m/mainboard.c index 09645f3d33..2a0e618b24 100644 --- a/src/mainboard/asus/f2a85-m/mainboard.c +++ b/src/mainboard/asus/f2a85-m/mainboard.c @@ -15,6 +15,7 @@ #include #include +#include #include /************************************************* @@ -26,18 +27,18 @@ static void mainboard_enable(struct device *dev) printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n"); - msr = rdmsr(0xC0011020); + msr = rdmsr(LS_CFG_MSR); msr.lo &= ~(1 << 28); - wrmsr(0xC0011020, msr); + wrmsr(LS_CFG_MSR, msr); - msr = rdmsr(0xC0011022); + msr = rdmsr(DC_CFG_MSR); msr.lo &= ~(1 << 4); msr.lo &= ~(1 << 13); - wrmsr(0xC0011022, msr); + wrmsr(DC_CFG_MSR, msr); - msr = rdmsr(0xC0011023); + msr = rdmsr(BU_CFG_MSR); msr.lo &= ~(1 << 23); - wrmsr(0xC0011023, msr); + wrmsr(BU_CFG_MSR, msr); } struct chip_operations mainboard_ops = { diff --git a/src/mainboard/msi/ms7721/mainboard.c b/src/mainboard/msi/ms7721/mainboard.c index 09645f3d33..2a0e618b24 100644 --- a/src/mainboard/msi/ms7721/mainboard.c +++ b/src/mainboard/msi/ms7721/mainboard.c @@ -15,6 +15,7 @@ #include #include +#include #include /************************************************* @@ -26,18 +27,18 @@ static void mainboard_enable(struct device *dev) printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n"); - msr = rdmsr(0xC0011020); + msr = rdmsr(LS_CFG_MSR); msr.lo &= ~(1 << 28); - wrmsr(0xC0011020, msr); + wrmsr(LS_CFG_MSR, msr); - msr = rdmsr(0xC0011022); + msr = rdmsr(DC_CFG_MSR); msr.lo &= ~(1 << 4); msr.lo &= ~(1 << 13); - wrmsr(0xC0011022, msr); + wrmsr(DC_CFG_MSR, msr); - msr = rdmsr(0xC0011023); + msr = rdmsr(BU_CFG_MSR); msr.lo &= ~(1 << 23); - wrmsr(0xC0011023, msr); + wrmsr(BU_CFG_MSR, msr); } struct chip_operations mainboard_ops = { -- cgit v1.2.3