sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nb/x4x: Rename {ddr,fsb}2{mhz,ps} as {ddr,fsb}_to_{mhz,ps}

Browse Source 
Change-Id: I0442cc5bc54efd7e2c4e5496182c8df85acbcf91
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/33491
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
This commit is contained in:
Elyes HAOUAS
2019-06-15 11:03:00 +02:00
committed by Patrick Georgi
parent 5778f772b5
commit e951e8ec7f
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/northbridge/intel/x4x/raminit.c
View File

@ -461,9 +461,9 @@ static void print_selected_timings(struct sysinfo *s)
{ {
printk(BIOS_DEBUG, "Selected timings:\n"); printk(BIOS_DEBUG, "Selected timings:\n");
printk(BIOS_DEBUG, "\tFSB: %dMHz\n", printk(BIOS_DEBUG, "\tFSB: %dMHz\n",
fsb2mhz(s->selected_timings.fsb_clk)); fsb_to_mhz(s->selected_timings.fsb_clk));
printk(BIOS_DEBUG, "\tDDR: %dMHz\n", printk(BIOS_DEBUG, "\tDDR: %dMHz\n",
ddr2mhz(s->selected_timings.mem_clk)); ddr_to_mhz(s->selected_timings.mem_clk));
printk(BIOS_DEBUG, "\tCAS: %d\n", s->selected_timings.CAS); printk(BIOS_DEBUG, "\tCAS: %d\n", s->selected_timings.CAS);
printk(BIOS_DEBUG, "\ttRAS: %d\n", s->selected_timings.tRAS); printk(BIOS_DEBUG, "\ttRAS: %d\n", s->selected_timings.tRAS);

18
src/northbridge/intel/x4x/raminit_ddr23.c
View File

@ -32,12 +32,12 @@
#define ME_UMA_SIZEMB 0 #define ME_UMA_SIZEMB 0
u32 fsb2mhz(u32 speed) u32 fsb_to_mhz(u32 speed)
{ {
return (speed * 267) + 800; return (speed * 267) + 800;
} }
u32 ddr2mhz(u32 speed) u32 ddr_to_mhz(u32 speed)
{ {
static const u16 mhz[] = { 0, 0, 667, 800, 1067, 1333 }; static const u16 mhz[] = { 0, 0, 667, 800, 1067, 1333 };
@ -413,13 +413,13 @@ static void program_timings(struct sysinfo *s)
adjusted_cas = s->selected_timings.CAS - 3; adjusted_cas = s->selected_timings.CAS - 3;
u16 fsb2ps[3] = { u16 fsb_to_ps[3] = {
5000, // 800 5000, // 800
3750, // 1067 3750, // 1067
3000 // 1333 3000 // 1333
}; };
u16 ddr2ps[6] = { u16 ddr_to_ps[6] = {
5000, // 400 5000, // 400
3750, // 533 3750, // 533
3000, // 667 3000, // 667
@ -573,13 +573,13 @@ static void program_timings(struct sysinfo *s)
MCHBAR8_AND_OR(0x400*i + 0x246, ~0x1f, (reg8 << 2) | 1); MCHBAR8_AND_OR(0x400*i + 0x246, ~0x1f, (reg8 << 2) | 1);
fsb = fsb2ps[s->selected_timings.fsb_clk]; fsb = fsb_to_ps[s->selected_timings.fsb_clk];
ddr = ddr2ps[s->selected_timings.mem_clk]; ddr = ddr_to_ps[s->selected_timings.mem_clk];
reg32 = (u32)((s->selected_timings.CAS + 7 + reg8) * ddr); reg32 = (u32)((s->selected_timings.CAS + 7 + reg8) * ddr);
reg32 = (u32)((reg32 / fsb) << 8); reg32 = (u32)((reg32 / fsb) << 8);
reg32 |= 0x0e000000; reg32 |= 0x0e000000;
if ((fsb2mhz(s->selected_timings.fsb_clk) / if ((fsb_to_mhz(s->selected_timings.fsb_clk) /
ddr2mhz(s->selected_timings.mem_clk)) > 2) { ddr_to_mhz(s->selected_timings.mem_clk)) > 2) {
reg32 |= 1 << 24; reg32 |= 1 << 24;
} }
MCHBAR32_AND_OR(0x400*i + 0x248, ~0x0f001f00, reg32); MCHBAR32_AND_OR(0x400*i + 0x248, ~0x0f001f00, reg32);
@ -671,7 +671,7 @@ static void program_timings(struct sysinfo *s)
if (s->spd_type == DDR3) { if (s->spd_type == DDR3) {
MCHBAR8(0x114) = 0x42; MCHBAR8(0x114) = 0x42;
reg16 = (512 - MAX(5, s->selected_timings.tRFC + 10000 reg16 = (512 - MAX(5, s->selected_timings.tRFC + 10000
/ ddr2ps[s->selected_timings.mem_clk])) / ddr_to_ps[s->selected_timings.mem_clk]))
/ 2; / 2;
reg16 &= 0x1ff; reg16 &= 0x1ff;
reg32 = (reg16 << 22) | (0x80 << 14) | (0xa << 9); reg32 = (reg16 << 22) | (0x80 << 14) | (0xa << 9);

4
src/northbridge/intel/x4x/x4x.h
View File

@ -378,8 +378,8 @@ u8 decode_pciebar(u32 *const base, u32 *const len);
void sdram_initialize(int boot_path, const u8 *spd_map); void sdram_initialize(int boot_path, const u8 *spd_map);
void do_raminit(struct sysinfo *, int fast_boot); void do_raminit(struct sysinfo *, int fast_boot);
void rcven(struct sysinfo *s); void rcven(struct sysinfo *s);
u32 fsb2mhz(u32 speed); u32 fsb_to_mhz(u32 speed);
u32 ddr2mhz(u32 speed); u32 ddr_to_mhz(u32 speed);
u32 test_address(int channel, int rank); u32 test_address(int channel, int rank);
void dqsset(u8 ch, u8 lane, const struct dll_setting *setting); void dqsset(u8 ch, u8 lane, const struct dll_setting *setting);
void dqset(u8 ch, u8 lane, const struct dll_setting *setting); void dqset(u8 ch, u8 lane, const struct dll_setting *setting);