diff options
| author | Matt DeVillier <matt.devillier@gmail.com> | 2017-05-29 19:10:57 -0500 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2017-06-04 18:44:15 +0200 |
| commit | cadd7c7ed31e7901c56e6d0dc7a0aba7e34c776d (patch) | |
| tree | 8d2c2bd3d8f1e6f2605b13ebd6ed513b71031c1b /src/mainboard/google/slippy/variants/peppy | |
| parent | af4c0a431c24a38519815a6e44325d29f9073da7 (diff) | |
google/slippy: populate PEI SPD data for all channels
Since dual-channel setups use same RAM/SPD for both channels,
populate spd_data[1] with same SPD data as spd_data[0],
allowing info for both channels to propogate into the
SBMIOS tables.
Clean up calculations using SPD length to avoid repetition.
Changes modeled after google/auron variants.
Change-Id: I7e14b35642a3fbaecaeb7d1d33b5a7c1405bac45
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/19981
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Diffstat (limited to 'src/mainboard/google/slippy/variants/peppy')
| -rw-r--r-- | src/mainboard/google/slippy/variants/peppy/romstage.c | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/src/mainboard/google/slippy/variants/peppy/romstage.c b/src/mainboard/google/slippy/variants/peppy/romstage.c index 4a3910185d..bf21cbc6fc 100644 --- a/src/mainboard/google/slippy/variants/peppy/romstage.c +++ b/src/mainboard/google/slippy/variants/peppy/romstage.c @@ -77,6 +77,7 @@ static void copy_spd(struct pei_data *peid) int spd_index = get_gpios(gpio_vector); char *spd_file; size_t spd_file_len; + size_t spd_len = sizeof(peid->spd_data[0]); printk(BIOS_DEBUG, "SPD index %d\n", spd_index); spd_file = cbfs_boot_map_with_leak("spd.bin", CBFS_TYPE_SPD, @@ -84,11 +85,24 @@ static void copy_spd(struct pei_data *peid) if (!spd_file) die("SPD data not found."); + if (spd_file_len < ((spd_index + 1) * sizeof(peid->spd_data[0]))) { + printk(BIOS_ERR, "SPD index override to 0 - old hardware?\n"); + spd_index = 0; + } + + if (spd_file_len < spd_len) + die("Missing SPD data."); + + memcpy(peid->spd_data[0], spd_file + (spd_index * spd_len), spd_len); + switch (google_chromeec_get_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[1], + spd_file + (spd_index * spd_len), spd_len); break; case PEPPY_BOARD_VERSION_EVT: @@ -97,22 +111,11 @@ static void copy_spd(struct pei_data *peid) * Index 4-6 are 2GB config with CH0 only. */ if (spd_index > 3) peid->dimm_channel1_disabled = 3; + else + memcpy(peid->spd_data[1], + spd_file + (spd_index * spd_len), spd_len); break; } - - if (spd_file_len < - ((spd_index + 1) * sizeof(peid->spd_data[0]))) { - printk(BIOS_ERR, "SPD index override to 0 - old hardware?\n"); - spd_index = 0; - } - - if (spd_file_len < sizeof(peid->spd_data[0])) - die("Missing SPD data."); - - memcpy(peid->spd_data[0], - spd_file + - spd_index * sizeof(peid->spd_data[0]), - sizeof(peid->spd_data[0])); } void variant_romstage_entry(unsigned long bist) |