nb/intel/haswell: Consolidate memory-down SPD handling
Mainboards do not need to know about `pei_data` to tell northbridge code
where to find the SPD data. Adjust `mb_get_spd_map` to take a pointer to
a struct instead of an array, and update all the mainboards accordingly.
Currently, the only board with memory-down in the tree is google/slippy.
Mainboard code now obtains the SPD index in `mb_get_spd_map` and adjusts
the channel population accordingly. Then, northbridge code reads the SPD
file and uses the index that was read in `mb_get_spd_map`, and copies it
to channel 0 slot 0 unconditionally. MRC only uses the first position of
the `spd_data` array, and ignores the other positions. In coreboot code,
`setup_sdram_meminfo` uses the data of each SPD index, so `copy_spd` has
to account for this.
Tested on Asrock B85M Pro4, still boots and still resumes from S3.
Change-Id: Ibaed5c6de9853db6abd08f53bbfda8800d207c3e
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/51448
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
diff --git a/src/mainboard/google/slippy/variants/peppy/romstage.c b/src/mainboard/google/slippy/variants/peppy/romstage.c
index 12e2714..dd998f0 100644
--- a/src/mainboard/google/slippy/variants/peppy/romstage.c
+++ b/src/mainboard/google/slippy/variants/peppy/romstage.c
@@ -9,33 +9,26 @@
#include "../../onboard.h"
#include "../../variant.h"
-/* Copy SPD data for on-board memory */
-void copy_spd(struct pei_data *peid)
+unsigned int variant_get_spd_index(void)
{
const int gpio_vector[] = {13, 9, 47, -1};
+ return get_gpios(gpio_vector);
+}
- unsigned int spd_index = fill_spd_for_index(peid->spd_data[0], get_gpios(gpio_vector));
-
+bool variant_is_dual_channel(const unsigned int spd_index)
+{
uint32_t board_version = PEPPY_BOARD_VERSION_PROTO;
google_chromeec_get_board_version(&board_version);
switch (board_version) {
case PEPPY_BOARD_VERSION_PROTO:
/* Index 0 is 2GB config with CH0 only. */
- if (spd_index == 0)
- peid->dimm_channel1_disabled = 3;
- else
- memcpy(peid->spd_data[2], peid->spd_data[0], SPD_LEN);
- break;
+ return spd_index != 0;
case PEPPY_BOARD_VERSION_EVT:
default:
/* Index 0-3 are 4GB config with both CH0 and CH1.
- * Index 4-7 are 2GB config with CH0 only. */
- if (spd_index > 3)
- peid->dimm_channel1_disabled = 3;
- else
- memcpy(peid->spd_data[2], peid->spd_data[0], SPD_LEN);
- break;
+ Index 4-7 are 2GB config with CH0 only. */
+ return spd_index <= 3;
}
}