Change in coreboot[master]: nb/intel/sandybridge: Clean up `channel_test` function

[Angel Pons (Code Review)]

Attention is currently required from:  Felix Singer, Nico Huber, Arthur Heymans, Patrick Rudolph.
Hello  Felix Singer, Nico Huber, Arthur Heymans, Patrick Rudolph,

I'd like you to do a code review. Please visit

https://review.coreboot.org/c/coreboot/+/49288

to review the following change.

Change subject: nb/intel/sandybridge: Clean up `channel_test` function
......................................................................

nb/intel/sandybridge: Clean up `channel_test` function

Rewrite the loops with macros to avoid linter complaints.

Tested on Asus P8Z77-V LX2, still boots.

Change-Id: Ic8b1db2b2b17d000061b451dcdd212a2adfabf94
Signed-off-by: Angel Pons 
---
M src/northbridge/intel/sandybridge/raminit_common.c
1 file changed, 5 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/88/49288/1

diff --git a/src/northbridge/intel/sandybridge/raminit_common.c b/src/northbridge/intel/sandybridge/raminit_common.c
index b792477..015a14b6f 100644
--- a/src/northbridge/intel/sandybridge/raminit_common.c
+++ b/src/northbridge/intel/sandybridge/raminit_common.c
@@ -2624,18 +2624,17 @@
    int channel, rank, lane;

rank = 0;
-	FOR_ALL_POPULATED_CHANNELS
+	FOR_ALL_POPULATED_CHANNELS {
    	if (MCHBAR32(MC_INIT_STATE_ch(channel)) & 0xa000) {
    		printk(BIOS_EMERG, "Mini channel test failed (1): %d\n", channel);
    		return MAKE_ERR;
    	}
+	}
    FOR_ALL_POPULATED_CHANNELS {
    	fill_pattern0(ctrl, channel, 0x12345678, 0x98765432);
    }

-	for (rank = 0; rank < 4; rank++)
-		FOR_ALL_CHANNELS
-			if (ctrl->rankmap[channel] & (1 << rank)) {
+	FOR_ALL_CHANNELS FOR_ALL_POPULATED_RANKS {
    	FOR_ALL_LANES {
    		MCHBAR32(IOSAV_By_ERROR_COUNT(lane)) = 0;
    		MCHBAR32(IOSAV_By_BW_SERROR_C(lane)) = 0;
@@ -2646,12 +2645,13 @@

iosav_run_once_and_wait(channel);

-		FOR_ALL_LANES
+		FOR_ALL_LANES {
    		if (MCHBAR32(IOSAV_By_ERROR_COUNT_ch(channel, lane))) {
    			printk(BIOS_EMERG, "Mini channel test failed (2): %d, %d, %d\n",
    			       channel, rank, lane);
    			return MAKE_ERR;
    		}
+		}
    }
    return 0;
 }