summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElyes HAOUAS <ehaouas@noos.fr>2018-10-12 12:28:59 +0200
committerPatrick Georgi <pgeorgi@google.com>2018-10-18 12:51:39 +0000
commit39db1447431bdd651ff17a1c36dee08d7d0b3710 (patch)
treee8338f2129533ff4a8718da19a7d8779054155f2
parent400ce55566caa541304b2483e61bcc2df941998c (diff)
mb: Replace MSR addresses with macros
Change-Id: I020431ba8eb61f5ce256088b919c049985331d64 Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr> Reviewed-on: https://review.coreboot.org/29069 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Martin Roth <martinroth@google.com>
-rw-r--r--src/mainboard/amd/thatcher/mainboard.c13
-rw-r--r--src/mainboard/asus/f2a85-m/mainboard.c13
-rw-r--r--src/mainboard/msi/ms7721/mainboard.c13
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 <console/console.h>
#include <device/device.h>
#include <cpu/x86/msr.h>
+#include <cpu/amd/msr.h>
/*************************************************
* 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 <console/console.h>
#include <cpu/x86/msr.h>
+#include <cpu/amd/msr.h>
#include <device/device.h>
/*************************************************
@@ -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 <console/console.h>
#include <cpu/x86/msr.h>
+#include <cpu/amd/msr.h>
#include <device/device.h>
/*************************************************
@@ -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 = {