From afc6c0ae12ddd26c05bcc2fa527c7a15d0bca0ad Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Fri, 12 Mar 2021 15:49:55 +0100 Subject: mb/google/slippy: Correct memory-down SPD handling MRC only uses the SPD data for the first index, and ignores the rest. Moreover, index 1 corresponds to the second DIMM on the first channel, which does not exist on ULT (only one DIMM per channel is supported). Copy the SPD to the first DIMM on channel 1 instead. Adjust northbridge code to retrieve the serial number from the correct SPD data block. Tested on Google Wolf, both channels are still correctly detected. Change-Id: Ic60ff75043e6b96a59baa9e5ebffb712a100a934 Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/51443 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/mainboard/google/slippy/variants/falco/romstage.c | 2 +- src/mainboard/google/slippy/variants/leon/romstage.c | 2 +- src/mainboard/google/slippy/variants/peppy/romstage.c | 4 ++-- src/mainboard/google/slippy/variants/wolf/romstage.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/mainboard/google/slippy') diff --git a/src/mainboard/google/slippy/variants/falco/romstage.c b/src/mainboard/google/slippy/variants/falco/romstage.c index 21a4ec62be..05b4eb78c5 100644 --- a/src/mainboard/google/slippy/variants/falco/romstage.c +++ b/src/mainboard/google/slippy/variants/falco/romstage.c @@ -18,7 +18,7 @@ void copy_spd(struct pei_data *peid) */ switch (spd_index) { case 0: case 1: case 2: case 6: - memcpy(peid->spd_data[1], peid->spd_data[0], SPD_LEN); + memcpy(peid->spd_data[2], peid->spd_data[0], SPD_LEN); break; case 3: case 4: case 5: case 7: peid->dimm_channel1_disabled = 3; diff --git a/src/mainboard/google/slippy/variants/leon/romstage.c b/src/mainboard/google/slippy/variants/leon/romstage.c index 938590b4f0..2e5dee195e 100644 --- a/src/mainboard/google/slippy/variants/leon/romstage.c +++ b/src/mainboard/google/slippy/variants/leon/romstage.c @@ -19,7 +19,7 @@ void copy_spd(struct pei_data *peid) if (spd_index & 0x4) peid->dimm_channel1_disabled = 3; else - memcpy(peid->spd_data[1], peid->spd_data[0], SPD_LEN); + memcpy(peid->spd_data[2], peid->spd_data[0], SPD_LEN); } const struct usb2_port_setting mainboard_usb2_ports[MAX_USB2_PORTS] = { diff --git a/src/mainboard/google/slippy/variants/peppy/romstage.c b/src/mainboard/google/slippy/variants/peppy/romstage.c index 02b47db97f..12e2714b6d 100644 --- a/src/mainboard/google/slippy/variants/peppy/romstage.c +++ b/src/mainboard/google/slippy/variants/peppy/romstage.c @@ -24,7 +24,7 @@ void copy_spd(struct pei_data *peid) if (spd_index == 0) peid->dimm_channel1_disabled = 3; else - memcpy(peid->spd_data[1], peid->spd_data[0], SPD_LEN); + memcpy(peid->spd_data[2], peid->spd_data[0], SPD_LEN); break; case PEPPY_BOARD_VERSION_EVT: @@ -34,7 +34,7 @@ void copy_spd(struct pei_data *peid) if (spd_index > 3) peid->dimm_channel1_disabled = 3; else - memcpy(peid->spd_data[1], peid->spd_data[0], SPD_LEN); + memcpy(peid->spd_data[2], peid->spd_data[0], SPD_LEN); break; } } diff --git a/src/mainboard/google/slippy/variants/wolf/romstage.c b/src/mainboard/google/slippy/variants/wolf/romstage.c index 939d58403f..05e128d87e 100644 --- a/src/mainboard/google/slippy/variants/wolf/romstage.c +++ b/src/mainboard/google/slippy/variants/wolf/romstage.c @@ -18,7 +18,7 @@ void copy_spd(struct pei_data *peid) */ switch (spd_index) { case 0: case 1: case 2: - memcpy(peid->spd_data[1], peid->spd_data[0], SPD_LEN); + memcpy(peid->spd_data[2], peid->spd_data[0], SPD_LEN); break; case 3: case 4: case 5: peid->dimm_channel1_disabled = 3; -- cgit v1.2.3