[coreboot-gerrit] New patch to review for coreboot: asus/kgpe-d16: fix DIMMSetVoltages

[Felix Held]

Felix Held ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/12297

-gerrit

commit ecaf97e619ed30a61d1dbd34773e009a2f28f081
Author: Felix Held 
Date:   Tue Nov 3 00:59:49 2015 +0100

asus/kgpe-d16: fix DIMMSetVoltages

The RAM voltages can be set per socket, which contains two nodes.

Only reset the allowed voltages per socket before processing a new socket and
    not after every node.

Change-Id: Ia0e47676c7a3eebd56a17ab6de0e9690bf8cf703
    Signed-off-by: Felix Held 
---
 src/mainboard/asus/kgpe-d16/romstage.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/mainboard/asus/kgpe-d16/romstage.c b/src/mainboard/asus/kgpe-d16/romstage.c
index 76cbb8e..02f5fcd 100644
--- a/src/mainboard/asus/kgpe-d16/romstage.c
+++ b/src/mainboard/asus/kgpe-d16/romstage.c
@@ -171,8 +171,8 @@ void DIMMSetVoltages(struct MCTStatStruc *pMCTstat,
    uint8_t dimm;
    uint8_t node;
    uint8_t socket;
-	uint8_t allowed_voltages = 0xf;	/* The mainboard VRMs allow 1.15V, 1.25V, 1.35V, and 1.5V */
-	uint8_t node_allowed_voltages;
+	const uint8_t allowed_voltages = 0xf;	/* The mainboard VRMs allow 1.15V, 1.25V, 1.35V, and 1.5V */
+	uint8_t socket_allowed_voltages;
    uint32_t set_voltage = 0;

if (get_option(&nvram, "minimum_memory_voltage") == CB_SUCCESS) {
@@ -192,26 +192,31 @@ void DIMMSetVoltages(struct MCTStatStruc *pMCTstat,

for (node = 0; node < MAX_NODES_SUPPORTED; node++) {
    	socket = node / 2;
-		node_allowed_voltages = allowed_voltages;
    	struct DCTStatStruc *pDCTstat;
    	pDCTstat = pDCTstatA + node;
+
+		/* reset socket_allowed_voltages before processing each socket */
+		if (!(node % 2))
+			socket_allowed_voltages = allowed_voltages;
+
    	if (pDCTstat->NodePresent) {
    		for (dimm = 0; dimm < MAX_DIMMS_SUPPORTED; dimm++) {
    			if (pDCTstat->DIMMValid & (1 << dimm)) {
-					node_allowed_voltages &= pDCTstat->DimmSupportedVoltages[dimm];
+					socket_allowed_voltages &= pDCTstat->DimmSupportedVoltages[dimm];
    			}
    		}
    	}

+		/* set voltage per socket after processing last contained node */
    	if (pDCTstat->NodePresent && (node % 2)) {
    		/* Set voltages */
-			if (node_allowed_voltages & 0x8) {
+			if (socket_allowed_voltages & 0x8) {
    			set_voltage = 1150;
    			set_ddr3_voltage(socket, 3);
-			} else if (node_allowed_voltages & 0x4) {
+			} else if (socket_allowed_voltages & 0x4) {
    			set_voltage = 1250;
    			set_ddr3_voltage(socket, 2);
-			} else if (node_allowed_voltages & 0x2) {
+			} else if (socket_allowed_voltages & 0x2) {
    			set_voltage = 1350;
    			set_ddr3_voltage(socket, 1);
    		} else {