{cpu,drivers}/amd: Replace MTRR addresses with macros
Change-Id: I315c0b70c552c5dd7f640b18b913350bb88be81b Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr> Reviewed-on: https://review.coreboot.org/29173 Reviewed-by: Richard Spiegel <richard.spiegel@silverbackltd.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
		
				
					committed by
					
						 Patrick Georgi
						Patrick Georgi
					
				
			
			
				
	
			
			
			
						parent
						
							253cd5a7e6
						
					
				
				
					commit
					d50cf23e43
				
			| @@ -83,9 +83,9 @@ void amd_initmmio(void) | ||||
|  | ||||
| 	/* Set ROM cache onto WP to decrease post time */ | ||||
| 	MsrReg = (0x0100000000ull - CACHE_ROM_SIZE) | 5ull; | ||||
| 	LibAmdMsrWrite(0x20C, &MsrReg, &StdHeader); | ||||
| 	LibAmdMsrWrite(MTRR_PHYS_BASE(6), &MsrReg, &StdHeader); | ||||
| 	MsrReg = ((1ULL << CONFIG_CPU_ADDR_BITS) - CACHE_ROM_SIZE) | 0x800ull; | ||||
| 	LibAmdMsrWrite(0x20D, &MsrReg, &StdHeader); | ||||
| 	LibAmdMsrWrite(MTRR_PHYS_MASK(6), &MsrReg, &StdHeader); | ||||
|  | ||||
| 	if (IS_ENABLED(CONFIG_UDELAY_LAPIC)){ | ||||
| 		LibAmdMsrRead(0x1B, &MsrReg, &StdHeader); | ||||
|   | ||||
| @@ -54,11 +54,11 @@ static void model_15_init(struct device *dev) | ||||
| 	 * same as OntarioApMtrrSettingsList for APs | ||||
| 	 */ | ||||
| 	msr.lo = msr.hi = 0; | ||||
| 	wrmsr(0x259, msr); | ||||
| 	wrmsr(MTRR_FIX_16K_A0000, msr); | ||||
| 	msr.lo = msr.hi = 0x1e1e1e1e; | ||||
| 	wrmsr(0x250, msr); | ||||
| 	wrmsr(0x258, msr); | ||||
| 	for (msrno = 0x268; msrno <= 0x26f; msrno++) | ||||
| 	wrmsr(MTRR_FIX_64K_00000, msr); | ||||
| 	wrmsr(MTRR_FIX_16K_80000, msr); | ||||
| 	for (msrno = MTRR_FIX_4K_C0000; msrno <= MTRR_FIX_4K_F8000; msrno++) | ||||
| 		wrmsr(msrno, msr); | ||||
|  | ||||
| 	msr = rdmsr(SYSCFG_MSR); | ||||
|   | ||||
| @@ -89,9 +89,9 @@ void amd_initmmio(void) | ||||
|  | ||||
| 	/* Set ROM cache onto WP to decrease post time */ | ||||
| 	MsrReg = (0x0100000000ull - CACHE_ROM_SIZE) | 5ull; | ||||
| 	LibAmdMsrWrite(0x20C, &MsrReg, &StdHeader); | ||||
| 	LibAmdMsrWrite(MTRR_PHYS_BASE(6), &MsrReg, &StdHeader); | ||||
| 	MsrReg = ((1ULL << CONFIG_CPU_ADDR_BITS) - CACHE_ROM_SIZE) | 0x800ull; | ||||
| 	LibAmdMsrWrite(0x20D, &MsrReg, &StdHeader); | ||||
| 	LibAmdMsrWrite(MTRR_PHYS_MASK(6), &MsrReg, &StdHeader); | ||||
|  | ||||
| 	if (IS_ENABLED(CONFIG_UDELAY_LAPIC)) { | ||||
| 		LibAmdMsrRead(0x1B, &MsrReg, &StdHeader); | ||||
|   | ||||
| @@ -66,11 +66,11 @@ static void model_15_init(struct device *dev) | ||||
|  | ||||
| 	// BSP: make a0000-bffff UC, c0000-fffff WB | ||||
| 	msr.lo = msr.hi = 0; | ||||
| 	wrmsr(0x259, msr); | ||||
| 	wrmsr(MTRR_FIX_16K_A0000, msr); | ||||
| 	msr.lo = msr.hi = 0x1e1e1e1e; | ||||
| 	wrmsr(0x250, msr); | ||||
| 	wrmsr(0x258, msr); | ||||
| 	for (msrno = 0x268; msrno <= 0x26f; msrno++) | ||||
| 	wrmsr(MTRR_FIX_64K_00000, msr); | ||||
| 	wrmsr(MTRR_FIX_16K_80000, msr); | ||||
| 	for (msrno = MTRR_FIX_4K_C0000; msrno <= MTRR_FIX_4K_F8000; msrno++) | ||||
| 		wrmsr(msrno, msr); | ||||
|  | ||||
| 	msr = rdmsr(SYSCFG_MSR); | ||||
|   | ||||
| @@ -94,9 +94,9 @@ void amd_initmmio(void) | ||||
|  | ||||
| 	/* Set ROM cache onto WP to decrease post time */ | ||||
| 	MsrReg = (0x0100000000ull - CACHE_ROM_SIZE) | 5ull; | ||||
| 	LibAmdMsrWrite(0x20C, &MsrReg, &StdHeader); | ||||
| 	LibAmdMsrWrite(MTRR_PHYS_BASE(6), &MsrReg, &StdHeader); | ||||
| 	MsrReg = ((1ULL << CONFIG_CPU_ADDR_BITS) - CACHE_ROM_SIZE) | 0x800ull; | ||||
| 	LibAmdMsrWrite(0x20D, &MsrReg, &StdHeader); | ||||
| 	LibAmdMsrWrite(MTRR_PHYS_MASK(6), &MsrReg, &StdHeader); | ||||
|  | ||||
| 	if (IS_ENABLED(CONFIG_UDELAY_LAPIC)) { | ||||
| 		LibAmdMsrRead(0x1B, &MsrReg, &StdHeader); | ||||
|   | ||||
| @@ -51,11 +51,11 @@ static void model_16_init(struct device *dev) | ||||
| 	 * same as OntarioApMtrrSettingsList for APs | ||||
| 	 */ | ||||
| 	msr.lo = msr.hi = 0; | ||||
| 	wrmsr(0x259, msr); | ||||
| 	wrmsr(MTRR_FIX_16K_A0000, msr); | ||||
| 	msr.lo = msr.hi = 0x1e1e1e1e; | ||||
| 	wrmsr(0x250, msr); | ||||
| 	wrmsr(0x258, msr); | ||||
| 	for (msrno = 0x268; msrno <= 0x26f; msrno++) | ||||
| 	wrmsr(MTRR_FIX_64K_00000, msr); | ||||
| 	wrmsr(MTRR_FIX_16K_80000, msr); | ||||
| 	for (msrno = MTRR_FIX_4K_C0000; msrno <= MTRR_FIX_4K_F8000; msrno++) | ||||
| 		wrmsr(msrno, msr); | ||||
|  | ||||
| 	msr = rdmsr(SYSCFG_MSR); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user