[coreboot-gerrit] Change in coreboot[master]: nb/intel/sandybridge: Always wait for IOSAV after starting it

[Felix Held (Code Review)]

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/48403 )

Change subject: nb/intel/sandybridge: Always wait for IOSAV after starting it
......................................................................

nb/intel/sandybridge: Always wait for IOSAV after starting it

Ensure that IOSAV is finished before continuing. This might solve some
random failures on the I/O and roundtrip latency training algorithm.

Tested on Asus P8Z77-V LX2, still boots.

Change-Id: Ic08a40346b6c60e372bada10f9c4ee42eb974f9f
Signed-off-by: Angel Pons 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48403
Reviewed-by: Patrick Rudolph 
Tested-by: build bot (Jenkins) 
---
M src/northbridge/intel/sandybridge/raminit_common.c
M src/northbridge/intel/sandybridge/raminit_common.h
M src/northbridge/intel/sandybridge/raminit_iosav.c
3 files changed, 4 insertions(+), 10 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Patrick Rudolph: Looks good to me, approved

diff --git a/src/northbridge/intel/sandybridge/raminit_common.c b/src/northbridge/intel/sandybridge/raminit_common.c
index 9308ed5..ccf2403 100644
--- a/src/northbridge/intel/sandybridge/raminit_common.c
+++ b/src/northbridge/intel/sandybridge/raminit_common.c
@@ -680,7 +680,7 @@
    };
    iosav_write_sequence(channel, sequence, ARRAY_SIZE(sequence));

-	iosav_run_once(channel);
+	iosav_run_once_and_wait(channel);
 }

/* Obtain optimal power down mode for current configuration */
@@ -1332,7 +1332,7 @@

iosav_write_prea_sequence(channel, slotrank, ctrl->tRP, 0);

-		iosav_run_once(channel);
+		iosav_run_once_and_wait(channel);

const union gdcr_training_mod_reg training_mod = {
    		.receive_enable_mode = 1,
@@ -1460,7 +1460,7 @@

iosav_write_prea_sequence(channel, slotrank, ctrl->tRP, 18);

-	iosav_run_once(channel);
+	iosav_run_once_and_wait(channel);

for (tx_dq = 0; tx_dq <= MAX_TX_DQ; tx_dq++) {
    	FOR_ALL_LANES ctrl->timings[channel][slotrank].lanes[lane].tx_dq = tx_dq;
diff --git a/src/northbridge/intel/sandybridge/raminit_common.h b/src/northbridge/intel/sandybridge/raminit_common.h
index 3de29ff..53d0cd9 100644
--- a/src/northbridge/intel/sandybridge/raminit_common.h
+++ b/src/northbridge/intel/sandybridge/raminit_common.h
@@ -291,7 +291,6 @@

void iosav_write_sequence(const int ch, const struct iosav_ssq *seq, const unsigned int length);
 void iosav_run_queue(const int ch, const u8 loops, const u8 as_timer);
-void iosav_run_once(const int ch);
 void wait_for_iosav(int channel);
 void iosav_run_once_and_wait(const int ch);

diff --git a/src/northbridge/intel/sandybridge/raminit_iosav.c b/src/northbridge/intel/sandybridge/raminit_iosav.c
index b3c6db6..cb49e0c 100644
--- a/src/northbridge/intel/sandybridge/raminit_iosav.c
+++ b/src/northbridge/intel/sandybridge/raminit_iosav.c
@@ -36,11 +36,6 @@
    MCHBAR32(IOSAV_SEQ_CTL_ch(ch)) = loops | ((ssq_count - 1) << 18) | (as_timer << 22);
 }

-void iosav_run_once(const int ch)
-{
-	iosav_run_queue(ch, 1, 0);
-}
-
 void wait_for_iosav(int channel)
 {
    while (1) {
@@ -51,7 +46,7 @@

void iosav_run_once_and_wait(const int ch)
 {
-	iosav_run_once(ch);
+	iosav_run_queue(ch, 1, 0);
    wait_for_iosav(ch);
 }