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

nb/intel/ironlake: Deduplicate programming 274/265 values 

Transform the existing functions so that their functionality does not
overlap. Also, deduplicate printing these values in debug builds.

Tested on out-of-tree HP 630, still boots.

Change-Id: I3f50dcf56284c9648b116bc5aacc0adf2d863b5d
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/49583
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Angel Pons 2021-01-15 23:13:00 +01:00 committed by Patrick Georgi
parent 7a87c9203e
commit 0a8b1136e6
1 changed files with 16 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/northbridge/intel/ironlake/quickpath.c
View File

@ -143,7 +143,7 @@ compute_frequence_ratios(struct raminfo *info, u16 freq1, u16 freq2,
result->freq_max_reduced = freq_max_reduced; result->freq_max_reduced = freq_max_reduced;
} }
static void set_274265(struct raminfo *info) static void compute_274265(struct raminfo *info)
{ {
int delay_a_ps, delay_b_ps, delay_c_ps, delay_d_ps; int delay_a_ps, delay_b_ps, delay_c_ps, delay_d_ps;
int delay_e_ps, delay_e_cycles, delay_f_cycles; int delay_e_ps, delay_e_cycles, delay_f_cycles;
@ -222,36 +222,34 @@ static void set_274265(struct raminfo *info)
info->training.reg274265[channel][1] = info->training.reg274265[channel][1] =
div_roundup(delay_d_ps + 7 * halfcycle_ps(info), div_roundup(delay_d_ps + 7 * halfcycle_ps(info),
4 * halfcycle_ps(info)) - 6; 4 * halfcycle_ps(info)) - 6;
MCHBAR32((channel << 10) + 0x274) =
info->training.reg274265[channel][1] |
(info->training.reg274265[channel][0] << 16);
info->training.reg274265[channel][2] = info->training.reg274265[channel][2] =
div_roundup(delay_c_ps + 3 * fsbcycle_ps(info), div_roundup(delay_c_ps + 3 * fsbcycle_ps(info),
4 * halfcycle_ps(info)) + 1; 4 * halfcycle_ps(info)) + 1;
MCHBAR16((channel << 10) + 0x265) =
info->training.reg274265[channel][2] << 8;
} }
if (info->training.reg2ca9_bit0)
MCHBAR8_OR(0x2ca9, 1);
else
MCHBAR8_AND(0x2ca9, ~1);
} }
static void restore_274265(struct raminfo *info) static void program_274265(const struct ram_training *const training)
{ {
int channel; int channel;
for (channel = 0; channel < NUM_CHANNELS; channel++) { for (channel = 0; channel < NUM_CHANNELS; channel++) {
MCHBAR32((channel << 10) + 0x274) = MCHBAR32((channel << 10) + 0x274) =
(info->cached_training->reg274265[channel][0] << 16) | (training->reg274265[channel][0] << 16) |
info->cached_training->reg274265[channel][1]; training->reg274265[channel][1];
MCHBAR16((channel << 10) + 0x265) = MCHBAR16((channel << 10) + 0x265) =
info->cached_training->reg274265[channel][2] << 8; training->reg274265[channel][2] << 8;
} }
if (info->cached_training->reg2ca9_bit0) if (training->reg2ca9_bit0)
MCHBAR8_OR(0x2ca9, 1); MCHBAR8_OR(0x2ca9, 1);
else else
MCHBAR8_AND(0x2ca9, ~1); MCHBAR8_AND(0x2ca9, ~1);
printk(RAM_SPEW, "reg2ca9_bit0 = %x\n", training->reg2ca9_bit0);
for (int i = 0; i < 2; i++)
for (int j = 0; j < 3; j++)
printk(RAM_SPEW, "reg274265[%d][%d] = %x\n",
i, j, training->reg274265[i][j]);
} }
static void static void
@ -435,23 +433,11 @@ void late_quickpath_init(struct raminfo *info, const int s3resume)
{ {
const u16 deven = pci_read_config16(NORTHBRIDGE, DEVEN); const u16 deven = pci_read_config16(NORTHBRIDGE, DEVEN);
int i, j;
if (s3resume && info->cached_training) { if (s3resume && info->cached_training) {
restore_274265(info); program_274265(info->cached_training);
printk(RAM_SPEW, "reg2ca9_bit0 = %x\n",
info->cached_training->reg2ca9_bit0);
for (i = 0; i < 2; i++)
for (j = 0; j < 3; j++)
printk(RAM_SPEW, "reg274265[%d][%d] = %x\n",
i, j, info->cached_training->reg274265[i][j]);
} else { } else {
set_274265(info); compute_274265(info);
printk(RAM_SPEW, "reg2ca9_bit0 = %x\n", program_274265(&info->training);
info->training.reg2ca9_bit0);
for (i = 0; i < 2; i++)
for (j = 0; j < 3; j++)
printk(RAM_SPEW, "reg274265[%d][%d] = %x\n",
i, j, info->training.reg274265[i][j]);
} }
set_2dxx_series(info, s3resume); set_2dxx_series(info, s3resume);