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

nb/intel/sandybridge: Cache FRQ index 

It does not change once a frequency has been set, so store it somewhere.
Since this changes the saved data definition, update MRC_CACHE_VERSION.
As SNB will eventually use the same code, only IVB is being refactored.

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

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

@ -33,7 +33,7 @@
/* /*
* WARNING: Do not forget to increase MRC_CACHE_VERSION when the saved data is changed! * WARNING: Do not forget to increase MRC_CACHE_VERSION when the saved data is changed!
*/ */
#define MRC_CACHE_VERSION 2 #define MRC_CACHE_VERSION 3
typedef struct odtmap_st { typedef struct odtmap_st {
u16 rttwr; u16 rttwr;
@ -78,6 +78,9 @@ typedef struct ramctr_timing_st {
/* DDR base_freq = 100 Mhz / 133 Mhz */ /* DDR base_freq = 100 Mhz / 133 Mhz */
u8 base_freq; u8 base_freq;
/* Frequency index */
u32 FRQ;
u16 cas_supported; u16 cas_supported;
/* Latencies are in units of ns, scaled by x256 */ /* Latencies are in units of ns, scaled by x256 */
u32 tCK; u32 tCK;

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

@ -203,6 +203,9 @@ static void find_cas_tck(ramctr_timing *ctrl)
} }
} }
/* Frequency multiplier */
ctrl->FRQ = get_FRQ(ctrl->tCK, ctrl->base_freq);
printk(BIOS_DEBUG, "Selected DRAM frequency: %u MHz\n", NS2MHZ_DIV256 / ctrl->tCK); printk(BIOS_DEBUG, "Selected DRAM frequency: %u MHz\n", NS2MHZ_DIV256 / ctrl->tCK);
printk(BIOS_DEBUG, "Selected CAS latency : %uT\n", val); printk(BIOS_DEBUG, "Selected CAS latency : %uT\n", val);
ctrl->CAS = val; ctrl->CAS = val;
@ -363,16 +366,14 @@ static void dram_timing(ramctr_timing *ctrl)
ctrl->tRFC = DIV_ROUND_UP(ctrl->tRFC, ctrl->tCK); ctrl->tRFC = DIV_ROUND_UP(ctrl->tRFC, ctrl->tCK);
printk(BIOS_DEBUG, "Selected tRFC : %uT\n", ctrl->tRFC); printk(BIOS_DEBUG, "Selected tRFC : %uT\n", ctrl->tRFC);
const u32 FRQ = get_FRQ(ctrl->tCK, ctrl->base_freq); ctrl->tREFI = get_REFI(ctrl->FRQ, ctrl->base_freq);
ctrl->tMOD = get_MOD(ctrl->FRQ, ctrl->base_freq);
ctrl->tREFI = get_REFI(FRQ, ctrl->base_freq); ctrl->tXSOffset = get_XSOffset(ctrl->FRQ, ctrl->base_freq);
ctrl->tMOD = get_MOD(FRQ, ctrl->base_freq); ctrl->tWLO = get_WLO(ctrl->FRQ, ctrl->base_freq);
ctrl->tXSOffset = get_XSOffset(FRQ, ctrl->base_freq); ctrl->tCKE = get_CKE(ctrl->FRQ, ctrl->base_freq);
ctrl->tWLO = get_WLO(FRQ, ctrl->base_freq); ctrl->tXPDLL = get_XPDLL(ctrl->FRQ, ctrl->base_freq);
ctrl->tCKE = get_CKE(FRQ, ctrl->base_freq); ctrl->tXP = get_XP(ctrl->FRQ, ctrl->base_freq);
ctrl->tXPDLL = get_XPDLL(FRQ, ctrl->base_freq); ctrl->tAONPD = get_AONPD(ctrl->FRQ, ctrl->base_freq);
ctrl->tXP = get_XP(FRQ, ctrl->base_freq);
ctrl->tAONPD = get_AONPD(FRQ, ctrl->base_freq);
} }
static void dram_freq(ramctr_timing *ctrl) static void dram_freq(ramctr_timing *ctrl)
@ -391,9 +392,6 @@ static void dram_freq(ramctr_timing *ctrl)
/* Step 1 - Set target PCU frequency */ /* Step 1 - Set target PCU frequency */
find_cas_tck(ctrl); find_cas_tck(ctrl);
/* Frequency multiplier */
const u32 FRQ = get_FRQ(ctrl->tCK, ctrl->base_freq);
/* /*
* The PLL will never lock if the required frequency is already set. * The PLL will never lock if the required frequency is already set.
* Exit early to prevent a system hang. * Exit early to prevent a system hang.
@ -404,7 +402,7 @@ static void dram_freq(ramctr_timing *ctrl)
return; return;
/* Step 2 - Select frequency in the MCU */ /* Step 2 - Select frequency in the MCU */
reg1 = FRQ; reg1 = ctrl->FRQ;
if (ctrl->base_freq == 100) if (ctrl->base_freq == 100)
reg1 |= 0x100; /* Enable 100Mhz REF clock */ reg1 |= 0x100; /* Enable 100Mhz REF clock */
@ -422,7 +420,7 @@ static void dram_freq(ramctr_timing *ctrl)
/* Step 3 - Verify lock frequency */ /* Step 3 - Verify lock frequency */
reg1 = MCHBAR32(MC_BIOS_DATA); reg1 = MCHBAR32(MC_BIOS_DATA);
val2 = (u8) reg1; val2 = (u8) reg1;
if (val2 >= FRQ) { if (val2 >= ctrl->FRQ) {
printk(BIOS_DEBUG, "MCU frequency is set at : %d MHz\n", printk(BIOS_DEBUG, "MCU frequency is set at : %d MHz\n",
(1000 << 8) / ctrl->tCK); (1000 << 8) / ctrl->tCK);
return; return;
@ -434,7 +432,6 @@ static void dram_freq(ramctr_timing *ctrl)
static void dram_ioregs(ramctr_timing *ctrl) static void dram_ioregs(ramctr_timing *ctrl)
{ {
const u32 FRQ = get_FRQ(ctrl->tCK, ctrl->base_freq);
u32 reg; u32 reg;
int channel; int channel;
@ -462,7 +459,7 @@ static void dram_ioregs(ramctr_timing *ctrl)
printram("done\n"); printram("done\n");
/* Set COMP2 */ /* Set COMP2 */
MCHBAR32(CRCOMPOFST2) = get_COMP2(FRQ, ctrl->base_freq); MCHBAR32(CRCOMPOFST2) = get_COMP2(ctrl->FRQ, ctrl->base_freq);
printram("COMP2 done\n"); printram("COMP2 done\n");
/* Set COMP1 */ /* Set COMP1 */