From df5446196cd81c4a714f45f92fb379c795c1edb5 Mon Sep 17 00:00:00 2001 From: "Jonathan A. Kollasch" Date: Fri, 17 Jul 2015 07:47:41 -0500 Subject: [PATCH] amd/model_fxx: set CPU_ADDR_BITS to 40 on all K8 machines Moves the K8 CPU_ADDR_BITS definition from socket to model. Previously socket_F was not setting CPU_ADDR_BITS correctly. Tested on Sun Ultra 40 M2 with two 2nd-gen Opterons w/ 2x4x2GiB DIMMs. Most if not all K8-based chips support 40-bit physical addresses, with possible exception of IA32-only K8-based Athlon XP-M chips. Probably irrelevant, unless your machine has enough memory (at least 60 to 64GiB before MMIO hoisting) to exceed the CPU_ADDR_BITS default of 36 from src/cpu/x86/Kconfig. Change-Id: I01a2a59fa902280171840c36ca2e631476d3d603 Signed-off-by: Jonathan A. Kollasch Reviewed-on: http://review.coreboot.org/10963 Reviewed-by: Paul Menzel Tested-by: build bot (Jenkins) Tested-by: Raptor Engineering Automated Test Stand Reviewed-by: Marc Jones --- src/cpu/amd/model_fxx/Kconfig | 4 ++++ src/cpu/amd/socket_754/Kconfig | 4 ---- src/cpu/amd/socket_940/Kconfig | 4 ---- src/cpu/amd/socket_S1G1/Kconfig | 4 ---- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/cpu/amd/model_fxx/Kconfig b/src/cpu/amd/model_fxx/Kconfig index 9ee2bf74cf..1172d2964d 100644 --- a/src/cpu/amd/model_fxx/Kconfig +++ b/src/cpu/amd/model_fxx/Kconfig @@ -12,6 +12,10 @@ config CPU_AMD_MODEL_FXX select SUPPORT_CPU_UCODE_IN_CBFS if CPU_AMD_MODEL_FXX +config CPU_ADDR_BITS + int + default 40 + config UDELAY_IO bool default n diff --git a/src/cpu/amd/socket_754/Kconfig b/src/cpu/amd/socket_754/Kconfig index aeda4210f4..ec3ab70d56 100644 --- a/src/cpu/amd/socket_754/Kconfig +++ b/src/cpu/amd/socket_754/Kconfig @@ -8,10 +8,6 @@ config SOCKET_SPECIFIC_OPTIONS select CPU_AMD_MODEL_FXX select X86_AMD_FIXED_MTRRS -config CPU_ADDR_BITS - int - default 40 - config DCACHE_RAM_BASE hex default 0xc8000 diff --git a/src/cpu/amd/socket_940/Kconfig b/src/cpu/amd/socket_940/Kconfig index a8eef61b0f..47b455b94c 100644 --- a/src/cpu/amd/socket_940/Kconfig +++ b/src/cpu/amd/socket_940/Kconfig @@ -9,10 +9,6 @@ config SOCKET_SPECIFIC_OPTIONS select CPU_AMD_MODEL_FXX select X86_AMD_FIXED_MTRRS -config CPU_ADDR_BITS - int - default 40 - config DCACHE_RAM_BASE hex default 0xc8000 diff --git a/src/cpu/amd/socket_S1G1/Kconfig b/src/cpu/amd/socket_S1G1/Kconfig index 01d84a1d3a..3338677e5a 100644 --- a/src/cpu/amd/socket_S1G1/Kconfig +++ b/src/cpu/amd/socket_S1G1/Kconfig @@ -19,10 +19,6 @@ config DIMM_SUPPORT hex default 0x0204 -config CPU_ADDR_BITS - int - default 40 - config DCACHE_RAM_BASE hex default 0xc8000