nb/intel/sandybridge: Relocate PREA-ACT-RD sequence
Tested on Asus P8H61-M PRO, still boots.
Change-Id: Ie5e243380d940ca89857b230e15091ac01fde928
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/47622
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
diff --git a/src/northbridge/intel/sandybridge/raminit_common.c b/src/northbridge/intel/sandybridge/raminit_common.c
index 68281dd..4ba2f0d 100644
--- a/src/northbridge/intel/sandybridge/raminit_common.c
+++ b/src/northbridge/intel/sandybridge/raminit_common.c
@@ -1428,99 +1428,7 @@
wait_for_iosav(channel);
- const struct iosav_ssq rd_sequence[] = {
- /* DRAM command PREA */
- [0] = {
- .sp_cmd_ctrl = {
- .command = IOSAV_PRE,
- .ranksel_ap = 1,
- },
- .subseq_ctrl = {
- .cmd_executions = 1,
- .cmd_delay_gap = 3,
- .post_ssq_wait = ctrl->tRP,
- .data_direction = SSQ_NA,
- },
- .sp_cmd_addr = {
- .address = 1024,
- .rowbits = 6,
- .bank = 0,
- .rank = slotrank,
- },
- .addr_update = {
- .addr_wrap = 18,
- },
- },
- /* DRAM command ACT */
- [1] = {
- .sp_cmd_ctrl = {
- .command = IOSAV_ACT,
- .ranksel_ap = 1,
- },
- .subseq_ctrl = {
- .cmd_executions = 8,
- .cmd_delay_gap = MAX(ctrl->tRRD, (ctrl->tFAW >> 2) + 1),
- .post_ssq_wait = ctrl->CAS,
- .data_direction = SSQ_NA,
- },
- .sp_cmd_addr = {
- .address = 0,
- .rowbits = 6,
- .bank = 0,
- .rank = slotrank,
- },
- .addr_update = {
- .inc_bank = 1,
- .addr_wrap = 18,
- },
- },
- /* DRAM command RD */
- [2] = {
- .sp_cmd_ctrl = {
- .command = IOSAV_RD,
- .ranksel_ap = 1,
- },
- .subseq_ctrl = {
- .cmd_executions = 500,
- .cmd_delay_gap = 4,
- .post_ssq_wait = MAX(ctrl->tRTP, 8),
- .data_direction = SSQ_RD,
- },
- .sp_cmd_addr = {
- .address = 0,
- .rowbits = 0,
- .bank = 0,
- .rank = slotrank,
- },
- .addr_update = {
- .inc_addr_8 = 1,
- .addr_wrap = 18,
- },
- },
- /* DRAM command PREA */
- [3] = {
- .sp_cmd_ctrl = {
- .command = IOSAV_PRE,
- .ranksel_ap = 1,
- },
- .subseq_ctrl = {
- .cmd_executions = 1,
- .cmd_delay_gap = 3,
- .post_ssq_wait = ctrl->tRP,
- .data_direction = SSQ_NA,
- },
- .sp_cmd_addr = {
- .address = 1024,
- .rowbits = 6,
- .bank = 0,
- .rank = slotrank,
- },
- .addr_update = {
- .addr_wrap = 18,
- },
- },
- };
- iosav_write_sequence(channel, rd_sequence, ARRAY_SIZE(rd_sequence));
+ iosav_write_prea_act_read_sequence(ctrl, channel, slotrank);
/* Execute command queue */
iosav_run_once(channel);