{cpu,drivers,nb,sb}/amd: Replace {MSR,MTRR} addresses with macros

Change-Id: I7e8de35dcdad52bb311b34bfa9b272d17ed3186b
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/29243
Reviewed-by: Richard Spiegel <richard.spiegel@silverbackltd.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

5 files changed, 28 insertions, 23 deletions

diff --git a/src/northbridge/amd/amdmct/mct/mct_d.c b/src/northbridge/amd/amdmct/mct/mct_d.c
index 91103ffb4f..d03ae9ca98 100644
--- a/src/northbridge/amd/amdmct/mct/mct_d.c
+++ b/src/northbridge/amd/amdmct/mct/mct_d.c
@@ -3255,7 +3255,7 @@ static void mct_init(struct MCTStatStruc *pMCTstat,
 	pDCTstat->DRPresent = 1;
 
 	/* enable extend PCI configuration access */
-	addr = 0xC001001F;
+	addr = NB_CFG_MSR;
 	_RDMSR(addr, &lo, &hi);
 	if (hi & (1 << (46-32))) {
 		pDCTstat->Status |= 1 << SB_ExtConfig;
@@ -3556,7 +3556,7 @@ static u8 CheckNBCOFEarlyArbEn(struct MCTStatStruc *pMCTstat,
 	 */
 
 	/* 3*(Fn2xD4[NBFid]+4)/(2^NbDid)/(3+Fn2x94[MemClkFreq]) */
-	_RDMSR(0xC0010071, &lo, &hi);
+	_RDMSR(MSR_COFVID_STS, &lo, &hi);
 	if (lo & (1 << 22))
 		NbDid |= 1;
 
diff --git a/src/northbridge/amd/amdmct/mct/mctdqs_d.c b/src/northbridge/amd/amdmct/mct/mctdqs_d.c
index 39c11ce7da..5aadcccf56 100644
--- a/src/northbridge/amd/amdmct/mct/mctdqs_d.c
+++ b/src/northbridge/amd/amdmct/mct/mctdqs_d.c
@@ -816,7 +816,7 @@ void SetTargetWTIO_D(u32 TestAddr)
 	u32 lo, hi;
 	hi = TestAddr >> 24;
 	lo = TestAddr << 8;
-	_WRMSR(0xC0010016, lo, hi);		/* IORR0 Base */
+	_WRMSR(IORR_FIRST, lo, hi);		/* IORR0 Base */
 	hi = 0xFF;
 	lo = 0xFC000800;			/* 64MB Mask */
 	_WRMSR(0xC0010017, lo, hi);		/* IORR0 Mask */
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mct_d.c b/src/northbridge/amd/amdmct/mct_ddr3/mct_d.c
index b94c68c931..27aaf1a54e 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mct_d.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mct_d.c
@@ -6789,7 +6789,7 @@ static void mct_InitialMCT_D(struct MCTStatStruc *pMCTstat, struct DCTStatStruc
 		boost_states = (Get_NB32(pDCTstat->dev_link, 0x15c) >> 2) & 0x7;
 
 		/* Retrieve and store the TSC frequency (P0 COF) */
-		p0_state_msr = rdmsr(0xc0010064 + boost_states);
+		p0_state_msr = rdmsr(PSTATE_0_MSR + boost_states);
 		cpu_fid = p0_state_msr.lo & 0x3f;
 		cpu_did = (p0_state_msr.lo >> 6) & 0x7;
 		cpu_divisor = (0x1 << cpu_did);
@@ -6833,7 +6833,7 @@ static void mct_init(struct MCTStatStruc *pMCTstat,
 	pDCTstat->DRPresent = 1;
 
 	/* enable extend PCI configuration access */
-	addr = 0xC001001F;
+	addr = NB_CFG_MSR;
 	_RDMSR(addr, &lo, &hi);
 	if (hi & (1 << (46-32))) {
 		pDCTstat->Status |= 1 << SB_ExtConfig;
@@ -7333,7 +7333,7 @@ static u8 CheckNBCOFEarlyArbEn(struct MCTStatStruc *pMCTstat,
 	 */
 
 	/* 3*(Fn2xD4[NBFid]+4)/(2^NbDid)/(3+Fn2x94[MemClkFreq]) */
-	_RDMSR(0xC0010071, &lo, &hi);
+	_RDMSR(MSR_COFVID_STS, &lo, &hi);
 	if (lo & (1 << 22))
 		NbDid |= 1;
 
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctdqs_d.c b/src/northbridge/amd/amdmct/mct_ddr3/mctdqs_d.c
index ce93472b9d..8b6a8d41bc 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctdqs_d.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctdqs_d.c
@@ -2148,7 +2148,7 @@ void SetTargetWTIO_D(u32 TestAddr)
 	u32 lo, hi;
 	hi = TestAddr >> 24;
 	lo = TestAddr << 8;
-	_WRMSR(0xC0010016, lo, hi);		/* IORR0 Base */
+	_WRMSR(IORR_FIRST, lo, hi);		/* IORR0 Base */
 	hi = 0xFF;
 	lo = 0xFC000800;			/* 64MB Mask */
 	_WRMSR(0xC0010017, lo, hi);		/* IORR0 Mask */
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/s3utils.c b/src/northbridge/amd/amdmct/mct_ddr3/s3utils.c
index 388f064848..6fd5b364a4 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/s3utils.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/s3utils.c
@@ -17,6 +17,9 @@
 #include <arch/cpu.h>
 #include <arch/acpi.h>
 #include <cpu/x86/msr.h>
+#include <cpu/amd/msr.h>
+#include <cpu/x86/mtrr.h>
+#include <cpu/amd/mtrr.h>
 #include <device/device.h>
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
@@ -358,17 +361,18 @@ void copy_mct_data_to_save_variable(struct amd_s3_persistent_data *persistent_da
 			data->f2x1b0 = pci_read_config32(dev_fn2, 0x1b0);
 			data->f3x44 = pci_read_config32(dev_fn3, 0x44);
 			for (i = 0; i < 16; i++) {
-				data->msr0000020[i] = rdmsr_uint64_t(0x00000200 | i);
+				data->msr0000020[i] =
+					rdmsr_uint64_t(MTRR_PHYS_BASE(0) | i);
 			}
-			data->msr00000250 = rdmsr_uint64_t(0x00000250);
-			data->msr00000258 = rdmsr_uint64_t(0x00000258);
+			data->msr00000250 = rdmsr_uint64_t(MTRR_FIX_64K_00000);
+			data->msr00000258 = rdmsr_uint64_t(MTRR_FIX_16K_80000);
 			for (i = 0; i < 8; i++)
 				data->msr0000026[i] = rdmsr_uint64_t(0x00000260 | (i + 8));
-			data->msr000002ff = rdmsr_uint64_t(0x000002ff);
-			data->msrc0010010 = rdmsr_uint64_t(0xc0010010);
-			data->msrc001001a = rdmsr_uint64_t(0xc001001a);
-			data->msrc001001d = rdmsr_uint64_t(0xc001001d);
-			data->msrc001001f = rdmsr_uint64_t(0xc001001f);
+			data->msr000002ff = rdmsr_uint64_t(MTRR_DEF_TYPE_MSR);
+			data->msrc0010010 = rdmsr_uint64_t(SYSCFG_MSR);
+			data->msrc001001a = rdmsr_uint64_t(TOP_MEM);
+			data->msrc001001d = rdmsr_uint64_t(TOP_MEM2);
+			data->msrc001001f = rdmsr_uint64_t(NB_CFG_MSR);
 
 			/* Stage 3 */
 			data->f2x40 = read_config32_dct(dev_fn2, node, channel, 0x40);
@@ -697,10 +701,11 @@ void restore_mct_data_from_save_variable(struct amd_s3_persistent_data *persiste
 			write_config32_dct(PCI_DEV(0, 0x18 + node, 2), node, channel, 0x1b0, data->f2x1b0);
 			write_config32_dct(PCI_DEV(0, 0x18 + node, 3), node, channel, 0x44, data->f3x44);
 			for (i = 0; i < 16; i++) {
-				wrmsr_uint64_t(0x00000200 | i, data->msr0000020[i]);
+				wrmsr_uint64_t(MTRR_PHYS_BASE(0) | i,
+					       data->msr0000020[i]);
 			}
-			wrmsr_uint64_t(0x00000250, data->msr00000250);
-			wrmsr_uint64_t(0x00000258, data->msr00000258);
+			wrmsr_uint64_t(MTRR_FIX_64K_00000, data->msr00000250);
+			wrmsr_uint64_t(MTRR_FIX_16K_80000, data->msr00000258);
 			/* FIXME
 			 * Restoring these MSRs causes a hang on resume due to
 			 * destroying CAR while still executing from CAR!
@@ -708,11 +713,11 @@ void restore_mct_data_from_save_variable(struct amd_s3_persistent_data *persiste
 			 */
 			// for (i = 0; i < 8; i++)
 			//	wrmsr_uint64_t(0x00000260 | (i + 8), data->msr0000026[i]);
-			wrmsr_uint64_t(0x000002ff, data->msr000002ff);
-			wrmsr_uint64_t(0xc0010010, data->msrc0010010);
-			wrmsr_uint64_t(0xc001001a, data->msrc001001a);
-			wrmsr_uint64_t(0xc001001d, data->msrc001001d);
-			wrmsr_uint64_t(0xc001001f, data->msrc001001f);
+			wrmsr_uint64_t(MTRR_DEF_TYPE_MSR, data->msr000002ff);
+			wrmsr_uint64_t(SYSCFG_MSR, data->msrc0010010);
+			wrmsr_uint64_t(TOP_MEM, data->msrc001001a);
+			wrmsr_uint64_t(TOP_MEM2, data->msrc001001d);
+			wrmsr_uint64_t(NB_CFG_MSR, data->msrc001001f);
 		}
 	}