Fix high dword of MTRR mask set with CONFIG_CPU_ADDR_BITS
Bits were being shifted off the end of the mask accidentally. This results in all masks being 32 bits wide instead of 48. Change-Id: I5f4d1b6a323df1aa4568ff4491f82447b8a2f839 Signed-off-by: Martin Roth <martin.roth@se-eng.com> Reviewed-on: http://review.coreboot.org/2146 Tested-by: build bot (Jenkins) Reviewed-by: Zheng Bao <zheng.bao@amd.com> Reviewed-by: Marc Jones <marcj303@gmail.com> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
This commit is contained in:
parent
a12eaccc0b
commit
09574d5c3c
|
@ -270,7 +270,7 @@ agesawrapper_amdinitmmio (
|
|||
/* Set ROM cache onto WP to decrease post time */
|
||||
MsrReg = (0x0100000000 - CONFIG_ROM_SIZE) | 5;
|
||||
LibAmdMsrWrite (0x20E, &MsrReg, &StdHeader);
|
||||
MsrReg = ((1UL << CONFIG_CPU_ADDR_BITS) - CONFIG_ROM_SIZE) | 0x800;
|
||||
MsrReg = ((1ULL << CONFIG_CPU_ADDR_BITS) - CONFIG_ROM_SIZE) | 0x800ull;
|
||||
LibAmdMsrWrite (0x20F, &MsrReg, &StdHeader);
|
||||
|
||||
Status = AGESA_SUCCESS;
|
||||
|
|
|
@ -166,7 +166,7 @@ agesawrapper_amdinitmmio (
|
|||
/* Set ROM cache onto WP to decrease post time */
|
||||
MsrReg = (0x0100000000ull - CONFIG_ROM_SIZE) | 5ull;
|
||||
LibAmdMsrWrite (0x20C, &MsrReg, &StdHeader);
|
||||
MsrReg = ((1UL << CONFIG_CPU_ADDR_BITS) - CONFIG_ROM_SIZE) | 0x800ull;
|
||||
MsrReg = ((1ULL << CONFIG_CPU_ADDR_BITS) - CONFIG_ROM_SIZE) | 0x800ull;
|
||||
LibAmdMsrWrite (0x20D, &MsrReg, &StdHeader);
|
||||
|
||||
Status = AGESA_SUCCESS;
|
||||
|
|
|
@ -166,7 +166,7 @@ agesawrapper_amdinitmmio (
|
|||
/* Set ROM cache onto WP to decrease post time */
|
||||
MsrReg = (0x0100000000ull - CONFIG_ROM_SIZE) | 5ull;
|
||||
LibAmdMsrWrite (0x20C, &MsrReg, &StdHeader);
|
||||
MsrReg = ((1UL << CONFIG_CPU_ADDR_BITS) - CONFIG_ROM_SIZE) | 0x800ull;
|
||||
MsrReg = ((1ULL << CONFIG_CPU_ADDR_BITS) - CONFIG_ROM_SIZE) | 0x800ull;
|
||||
LibAmdMsrWrite (0x20D, &MsrReg, &StdHeader);
|
||||
|
||||
Status = AGESA_SUCCESS;
|
||||
|
|
|
@ -281,7 +281,7 @@ agesawrapper_amdinitmmio (
|
|||
/* Set ROM cache onto WP to decrease post time */
|
||||
MsrReg = (0x0100000000ull - CONFIG_ROM_SIZE) | 5ull;
|
||||
LibAmdMsrWrite (0x20C, &MsrReg, &StdHeader);
|
||||
MsrReg = ((1UL << CONFIG_CPU_ADDR_BITS) - CONFIG_ROM_SIZE) | 0x800ull;
|
||||
MsrReg = ((1ULL << CONFIG_CPU_ADDR_BITS) - CONFIG_ROM_SIZE) | 0x800ull;
|
||||
LibAmdMsrWrite (0x20D, &MsrReg, &StdHeader);
|
||||
|
||||
/* Clear all pending SMI. On S3 clear power button enable so it wll not generate an SMI */
|
||||
|
|
|
@ -194,7 +194,7 @@ UINT32 agesawrapper_amdinitmmio(VOID)
|
|||
/* Set ROM cache onto WP to decrease post time */
|
||||
MsrReg = (0x0100000000 - CONFIG_ROM_SIZE) | 5;
|
||||
LibAmdMsrWrite (0x20C, &MsrReg, &StdHeader);
|
||||
MsrReg = ((1UL << CONFIG_CPU_ADDR_BITS) - CONFIG_ROM_SIZE) | 0x800;
|
||||
MsrReg = ((1ULL << CONFIG_CPU_ADDR_BITS) - CONFIG_ROM_SIZE) | 0x800ull;
|
||||
LibAmdMsrWrite(0x20D, &MsrReg, &StdHeader);
|
||||
|
||||
Status = AGESA_SUCCESS;
|
||||
|
|
|
@ -194,7 +194,7 @@ UINT32 agesawrapper_amdinitmmio(VOID)
|
|||
/* Set ROM cache onto WP to decrease post time */
|
||||
MsrReg = (0x0100000000 - CONFIG_ROM_SIZE) | 5;
|
||||
LibAmdMsrWrite (0x20C, &MsrReg, &StdHeader);
|
||||
MsrReg = ((1UL << CONFIG_CPU_ADDR_BITS) - CONFIG_ROM_SIZE) | 0x800;
|
||||
MsrReg = ((1ULL << CONFIG_CPU_ADDR_BITS) - CONFIG_ROM_SIZE) | 0x800ull;
|
||||
LibAmdMsrWrite(0x20D, &MsrReg, &StdHeader);
|
||||
|
||||
Status = AGESA_SUCCESS;
|
||||
|
|
|
@ -204,7 +204,7 @@ agesawrapper_amdinitmmio (
|
|||
/* Set ROM cache onto WP to decrease post time */
|
||||
MsrReg = (0x0100000000ull - CONFIG_ROM_SIZE) | 5ull;
|
||||
LibAmdMsrWrite (0x20C, &MsrReg, &StdHeader);
|
||||
MsrReg = ((1UL << CONFIG_CPU_ADDR_BITS) - CONFIG_ROM_SIZE) | 0x800ull;
|
||||
MsrReg = ((1ULL << CONFIG_CPU_ADDR_BITS) - CONFIG_ROM_SIZE) | 0x800ull;
|
||||
LibAmdMsrWrite (0x20D, &MsrReg, &StdHeader);
|
||||
|
||||
Status = AGESA_SUCCESS;
|
||||
|
|
Loading…
Reference in New Issue