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

nb/intel/x4x: Rework programming DQ and DQS DLL timings 

This does the following:
* Clarify that settings are set to the same value for each rank;
* Allows to program coarse
* Fix some style issues like white spaces between arithmetic
  operators.

Change-Id: I3a9e28cfec915a0bb15789c23bea259f621b5096
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/20136
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
Reviewed-by: Martin Roth <martinroth@google.com>
This commit is contained in:
Arthur Heymans 2017-06-09 22:55:22 +02:00 committed by Martin Roth
parent 12a4e98cea
commit 3876f24221
1 changed files with 45 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
src/northbridge/intel/x4x/raminit_ddr2.c
View File

@ -399,92 +399,61 @@ static void cmdset(u8 ch, const struct dll_setting *setting)
setting->tap; setting->tap;
} }
/**
* All finer DQ and DQS DLL settings are set to the same value
* for each rank in a channel, while coarse is common.
*/
static void dqsset(u8 ch, u8 lane, const struct dll_setting *setting) static void dqsset(u8 ch, u8 lane, const struct dll_setting *setting)
{ {
MCHBAR32(0x400*ch + 0x5fc) = MCHBAR32(0x400*ch + 0x5fc) & ~(2 << (lane*4)); int rank;
MCHBAR32(0x400*ch + 0x5b4) = (MCHBAR32(0x400*ch + 0x5b4) & ~(0x201 << lane)) | MCHBAR32(0x400 * ch + 0x5fc) = (MCHBAR32(0x400 * ch + 0x5fc)
(setting->db_en << (9 + lane)) | & ~(1 << (lane * 4 + 1)))
(setting->db_sel << lane); | (setting->coarse << (lane * 4 + 1));
MCHBAR32(0x400*ch + 0x5b8) = (MCHBAR32(0x400*ch + 0x5b8) & ~(0x201 << lane)) |
(setting->db_en << (9 + lane)) |
(setting->db_sel << lane);
MCHBAR32(0x400*ch + 0x5bc) = (MCHBAR32(0x400*ch + 0x5bc) & ~(0x201 << lane)) |
(setting->db_en << (9 + lane)) |
(setting->db_sel << lane);
MCHBAR32(0x400*ch + 0x5c0) = (MCHBAR32(0x400*ch + 0x5c0) & ~(0x201 << lane)) |
(setting->db_en << (9 + lane)) |
(setting->db_sel << lane);
MCHBAR32(0x400*ch + 0x5c8) = (MCHBAR32(0x400*ch + 0x5c8) & ~(0x3 << (16+lane*2))) | for (rank = 0; rank < 4; rank++) {
(setting->clk_delay << (16+lane*2)); MCHBAR32(0x400 * ch + 0x5b4 + rank * 4) =
MCHBAR32(0x400*ch + 0x5cc) = (MCHBAR32(0x400*ch + 0x5cc) & ~(0x3 << (16+lane*2))) | (MCHBAR32(0x400 * ch + 0x5b4 + rank * 4)
(setting->clk_delay << (16+lane*2)); & ~(0x201 << lane))
MCHBAR32(0x400*ch + 0x5d0) = (MCHBAR32(0x400*ch + 0x5d0) & ~(0x3 << (16+lane*2))) | | (setting->db_en << (9 + lane))
(setting->clk_delay << (16+lane*2)); | (setting->db_sel << lane);
MCHBAR32(0x400*ch + 0x5d4) = (MCHBAR32(0x400*ch + 0x5d4) & ~(0x3 << (16+lane*2))) |
(setting->clk_delay << (16+lane*2));
MCHBAR8(0x400*ch + 0x520 + lane*4) = (MCHBAR8(0x400*ch + 0x520 + lane*4) & ~0x70) | MCHBAR32(0x400*ch + 0x5c8 + rank * 4) =
(setting->pi << 4); (MCHBAR32(0x400 * ch + 0x5c8 + rank * 4)
MCHBAR8(0x400*ch + 0x520 + lane*4) = (MCHBAR8(0x400*ch + 0x520 + lane*4) & ~0xf) | & ~(0x3 << (16 + lane * 2)))
setting->tap; | (setting->clk_delay << (16+lane * 2));
MCHBAR8(0x400*ch + 0x521 + lane*4) = (MCHBAR8(0x400*ch + 0x521 + lane*4) & ~0x70) |
(setting->pi << 4); MCHBAR8(0x400*ch + 0x520 + lane * 4 + rank) =
MCHBAR8(0x400*ch + 0x521 + lane*4) = (MCHBAR8(0x400*ch + 0x521 + lane*4) & ~0xf) | (MCHBAR8(0x400*ch + 0x520 + lane*4) & ~0x7f)
setting->tap; | (setting->pi << 4)
MCHBAR8(0x400*ch + 0x522 + lane*4) = (MCHBAR8(0x400*ch + 0x522 + lane*4) & ~0x70) | | setting->tap;
(setting->pi << 4); }
MCHBAR8(0x400*ch + 0x522 + lane*4) = (MCHBAR8(0x400*ch + 0x522 + lane*4) & ~0xf) |
setting->tap;
MCHBAR8(0x400*ch + 0x523 + lane*4) = (MCHBAR8(0x400*ch + 0x523 + lane*4) & ~0x70) |
(setting->pi << 4);
MCHBAR8(0x400*ch + 0x523 + lane*4) = (MCHBAR8(0x400*ch + 0x523 + lane*4) & ~0xf) |
setting->tap;
} }
static void dqset(u8 ch, u8 lane, const struct dll_setting *setting) static void dqset(u8 ch, u8 lane, const struct dll_setting *setting)
{ {
MCHBAR32(0x400*ch + 0x5fc) = MCHBAR32(0x400*ch + 0x5fc) & ~(1 << (lane*4)); int rank;
MCHBAR32(0x400 * ch + 0x5fc) = (MCHBAR32(0x400 * ch + 0x5fc)
& ~(1 << (lane * 4)))
| (setting->coarse << (lane * 4));
MCHBAR32(0x400*ch + 0x5a4) = (MCHBAR32(0x400*ch + 0x5a4) & ~(0x201 << lane)) | for (rank = 0; rank < 4; rank++) {
(setting->db_en << (9 + lane)) | MCHBAR32(0x400 * ch + 0x5a4 + rank * 4) =
(setting->db_sel << lane); (MCHBAR32(0x400 * ch + 0x5a4 + rank * 4)
MCHBAR32(0x400*ch + 0x5a8) = (MCHBAR32(0x400*ch + 0x5a8) & ~(0x201 << lane)) | & ~(0x201 << lane))
(setting->db_en << (9 + lane)) | | (setting->db_en << (9 + lane))
(setting->db_sel << lane); | (setting->db_sel << lane);
MCHBAR32(0x400*ch + 0x5ac) = (MCHBAR32(0x400*ch + 0x5ac) & ~(0x201 << lane)) |
(setting->db_en << (9 + lane)) |
(setting->db_sel << lane);
MCHBAR32(0x400*ch + 0x5b0) = (MCHBAR32(0x400*ch + 0x5b0) & ~(0x201 << lane)) |
(setting->db_en << (9 + lane)) |
(setting->db_sel << lane);
MCHBAR32(0x400*ch + 0x5c8) = (MCHBAR32(0x400*ch + 0x5c8) & ~(0x3 << (lane*2))) | MCHBAR32(0x400 * ch + 0x5c8 + rank * 4) =
(setting->clk_delay << (2 * lane)); (MCHBAR32(0x400 * ch + 0x5c8 + rank * 4)
MCHBAR32(0x400*ch + 0x5cc) = (MCHBAR32(0x400*ch + 0x5cc) & ~(0x3 << (lane*2))) | & ~(0x3 << (lane * 2)))
(setting->clk_delay << (2 * lane)); | (setting->clk_delay << (2 * lane));
MCHBAR32(0x400*ch + 0x5d0) = (MCHBAR32(0x400*ch + 0x5d0) & ~(0x3 << (lane*2))) |
(setting->clk_delay << (2 * lane));
MCHBAR32(0x400*ch + 0x5d4) = (MCHBAR32(0x400*ch + 0x5d4) & ~(0x3 << (lane*2))) |
(setting->clk_delay << (2 * lane));
MCHBAR8(0x400*ch + 0x500 + lane*4) = (MCHBAR8(0x400*ch + 0x500 + lane*4) & ~0x70) | MCHBAR8(0x400*ch + 0x500 + lane * 4 + rank) =
(setting->pi << 4); (MCHBAR8(0x400 * ch + 0x500 + lane * 4 + rank) & ~0x7f)
MCHBAR8(0x400*ch + 0x500 + lane*4) = (MCHBAR8(0x400*ch + 0x500 + lane*4) & ~0xf) | | (setting->pi << 4)
setting->tap; | setting->tap;
MCHBAR8(0x400*ch + 0x501 + lane*4) = (MCHBAR8(0x400*ch + 0x501 + lane*4) & ~0x70) | }
(setting->pi << 4);
MCHBAR8(0x400*ch + 0x501 + lane*4) = (MCHBAR8(0x400*ch + 0x501 + lane*4) & ~0xf) |
setting->tap;
MCHBAR8(0x400*ch + 0x502 + lane*4) = (MCHBAR8(0x400*ch + 0x502 + lane*4) & ~0x70) |
(setting->pi << 4);
MCHBAR8(0x400*ch + 0x502 + lane*4) = (MCHBAR8(0x400*ch + 0x502 + lane*4) & ~0xf) |
setting->tap;
MCHBAR8(0x400*ch + 0x503 + lane*4) = (MCHBAR8(0x400*ch + 0x503 + lane*4) & ~0x70) |
(setting->pi << 4);
MCHBAR8(0x400*ch + 0x503 + lane*4) = (MCHBAR8(0x400*ch + 0x503 + lane*4) & ~0xf) |
setting->tap;
} }
static void timings_ddr2(struct sysinfo *s) static void timings_ddr2(struct sysinfo *s)
@ -804,7 +773,7 @@ static void dll_ddr2(struct sysinfo *s)
MCHBAR8(0x1a4) = MCHBAR8(0x1a4) | 0x40; MCHBAR8(0x1a4) = MCHBAR8(0x1a4) | 0x40;
MCHBAR16(0x5f0) = (MCHBAR16(0x5f0) & ~0x400) | 0x400; MCHBAR16(0x5f0) = (MCHBAR16(0x5f0) & ~0x400) | 0x400;
const struct dll_setting dll_setting_667[23] = { static const struct dll_setting dll_setting_667[23] = {
// tap pi db delay // tap pi db delay
{13, 0, 1, 0, 0}, {13, 0, 1, 0, 0},
{4, 1, 0, 0, 0}, {4, 1, 0, 0, 0},
@ -831,7 +800,7 @@ static void dll_ddr2(struct sysinfo *s)
{5, 4, 0, 0, 1} {5, 4, 0, 0, 1}
}; };
const struct dll_setting dll_setting_800[23] = { static const struct dll_setting dll_setting_800[23] = {
// tap pi db delay // tap pi db delay
{11, 5, 1, 0, 0}, {11, 5, 1, 0, 0},
{0, 5, 1, 1, 0}, {0, 5, 1, 1, 0},