GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nb/intel/sandybridge: Unify the code paths 

The code for Sandy Bridge is a subset of the code for Ivy Bridge. Adapt
the Ivy Bridge code so that it also supports Sandy Bridge, and use it.

Tested on Asus P8Z77-V LX2, still boots with i7-2600 and i5-3330.

Change-Id: I7b78ec605aff976b9a5cdbb364a69df4b4947c6e
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/39737
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Angel Pons 2020-03-23 23:18:03 +01:00 committed by Patrick Georgi
parent 29f391ec8f
commit efbed263df
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/northbridge/intel/sandybridge/raminit.c
View File

@ -214,14 +214,6 @@ static void save_timings(ramctr_timing *ctrl)
mrc_cache_stash_data(MRC_TRAINING_DATA, MRC_CACHE_VERSION, ctrl, sizeof(*ctrl)); mrc_cache_stash_data(MRC_TRAINING_DATA, MRC_CACHE_VERSION, ctrl, sizeof(*ctrl));
} }
static int try_init_dram_ddr3(ramctr_timing *ctrl, int fast_boot, int s3resume, int me_uma_size)
{
if (IS_SANDY_CPU(ctrl->cpu))
return try_init_dram_ddr3_snb(ctrl, fast_boot, s3resume, me_uma_size);
else
return try_init_dram_ddr3_ivb(ctrl, fast_boot, s3resume, me_uma_size);
}
static void init_dram_ddr3(int min_tck, int s3resume, const u32 cpuid) static void init_dram_ddr3(int min_tck, int s3resume, const u32 cpuid)
{ {
int me_uma_size, cbmem_was_inited, fast_boot, err; int me_uma_size, cbmem_was_inited, fast_boot, err;

2
src/northbridge/intel/sandybridge/raminit_common.h
View File

@ -179,8 +179,8 @@ void set_read_write_timings(ramctr_timing *ctrl);
void set_normal_operation(ramctr_timing *ctrl); void set_normal_operation(ramctr_timing *ctrl);
void final_registers(ramctr_timing *ctrl); void final_registers(ramctr_timing *ctrl);
void restore_timings(ramctr_timing *ctrl); void restore_timings(ramctr_timing *ctrl);
int try_init_dram_ddr3(ramctr_timing *ctrl, int fast_boot, int s3resume, int me_uma_size);
int try_init_dram_ddr3_snb(ramctr_timing *ctrl, int fast_boot, int s3_resume, int me_uma_size); int try_init_dram_ddr3_snb(ramctr_timing *ctrl, int fast_boot, int s3_resume, int me_uma_size);
int try_init_dram_ddr3_ivb(ramctr_timing *ctrl, int fast_boot, int s3_resume, int me_uma_size);
#endif #endif

24
src/northbridge/intel/sandybridge/raminit_ivy.c
View File

@ -10,6 +10,8 @@
#include "raminit_common.h" #include "raminit_common.h"
#include "raminit_tables.h" #include "raminit_tables.h"
#define SNB_MIN_DCLK_133_MULT 3
#define SNB_MAX_DCLK_133_MULT 8
#define IVB_MIN_DCLK_133_MULT 3 #define IVB_MIN_DCLK_133_MULT 3
#define IVB_MAX_DCLK_133_MULT 10 #define IVB_MAX_DCLK_133_MULT 10
#define IVB_MIN_DCLK_100_MULT 7 #define IVB_MIN_DCLK_100_MULT 7
@ -26,6 +28,10 @@ static u32 get_FRQ(const ramctr_timing *ctrl)
if (ctrl->base_freq == 133) if (ctrl->base_freq == 133)
return clamp_u32(IVB_MIN_DCLK_133_MULT, FRQ, IVB_MAX_DCLK_133_MULT); return clamp_u32(IVB_MIN_DCLK_133_MULT, FRQ, IVB_MAX_DCLK_133_MULT);
} else if (IS_SANDY_CPU(ctrl->cpu)) {
if (ctrl->base_freq == 133)
return clamp_u32(SNB_MIN_DCLK_133_MULT, FRQ, SNB_MAX_DCLK_133_MULT);
} }
die("Unsupported CPU or base frequency."); die("Unsupported CPU or base frequency.");
@ -121,7 +127,7 @@ static u32 get_COMP2(u32 FRQ, u8 base_freq)
return frq_comp2_map[0][FRQ - 3]; return frq_comp2_map[0][FRQ - 3];
} }
static void ivb_normalize_tclk(ramctr_timing *ctrl, bool ref_100mhz_support) static void normalize_tclk(ramctr_timing *ctrl, bool ref_100mhz_support)
{ {
if (ctrl->tCK <= TCK_1200MHZ) { if (ctrl->tCK <= TCK_1200MHZ) {
ctrl->tCK = TCK_1200MHZ; ctrl->tCK = TCK_1200MHZ;
@ -164,7 +170,7 @@ static void ivb_normalize_tclk(ramctr_timing *ctrl, bool ref_100mhz_support)
if (!ref_100mhz_support && ctrl->base_freq == 100) { if (!ref_100mhz_support && ctrl->base_freq == 100) {
/* Skip unsupported frequency */ /* Skip unsupported frequency */
ctrl->tCK++; ctrl->tCK++;
ivb_normalize_tclk(ctrl, ref_100mhz_support); normalize_tclk(ctrl, ref_100mhz_support);
} }
} }
@ -188,7 +194,7 @@ static void find_cas_tck(ramctr_timing *ctrl)
* Normalising tCK before computing clock could potentially * Normalising tCK before computing clock could potentially
* result in a lower selected CAS, which is desired. * result in a lower selected CAS, which is desired.
*/ */
ivb_normalize_tclk(ctrl, ref_100mhz_support); normalize_tclk(ctrl, ref_100mhz_support);
if (!(ctrl->tCK)) if (!(ctrl->tCK))
die("Couldn't find compatible clock / CAS settings\n"); die("Couldn't find compatible clock / CAS settings\n");
@ -218,6 +224,10 @@ static void find_cas_tck(ramctr_timing *ctrl)
static void dram_timing(ramctr_timing *ctrl) static void dram_timing(ramctr_timing *ctrl)
{ {
/*
* On Sandy Bridge, the maximum supported DDR3 frequency is 1066MHz (DDR3 2133).
* Cap it for faster DIMMs, and align it to the closest JEDEC standard frequency.
*/
/* /*
* On Ivy Bridge, the maximum supported DDR3 frequency is 1400MHz (DDR3 2800). * On Ivy Bridge, the maximum supported DDR3 frequency is 1400MHz (DDR3 2800).
* Cap it at 1200MHz (DDR3 2400), and align it to the closest JEDEC standard frequency. * Cap it at 1200MHz (DDR3 2400), and align it to the closest JEDEC standard frequency.
@ -482,11 +492,13 @@ static void dram_ioregs(ramctr_timing *ctrl)
printram("done\n"); printram("done\n");
} }
int try_init_dram_ddr3_ivb(ramctr_timing *ctrl, int fast_boot, int s3_resume, int me_uma_size) int try_init_dram_ddr3(ramctr_timing *ctrl, int fast_boot, int s3resume, int me_uma_size)
{ {
int err; int err;
printk(BIOS_DEBUG, "Starting Ivybridge RAM training (%d).\n", fast_boot); printk(BIOS_DEBUG, "Starting %s Bridge RAM training (%s).\n",
IS_SANDY_CPU(ctrl->cpu) ? "Sandy" : "Ivy",
fast_boot ? "fast boot" : "full initialization");
if (!fast_boot) { if (!fast_boot) {
/* Find fastest common supported parameters */ /* Find fastest common supported parameters */
@ -592,7 +604,7 @@ int try_init_dram_ddr3_ivb(ramctr_timing *ctrl, int fast_boot, int s3_resume, in
write_controller_mr(ctrl); write_controller_mr(ctrl);
if (!s3_resume) { if (!s3resume) {
err = channel_test(ctrl); err = channel_test(ctrl);
if (err) if (err)
return err; return err;