diff options
| author | Patrick Georgi <pgeorgi@chromium.org> | 2017-01-28 15:26:43 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2017-02-10 18:04:11 +0100 |
| commit | 2e08b59cdcf9a26ae9e6d4107be8e45a5fb9dbdf (patch) | |
| tree | 243c5faab07837153940f6c208f39e665886f342 | |
| parent | ded1e05d11675d899e07906e04032b3cc2f29711 (diff) | |
ddr3 spd: Rename read_spd_from_cbfs() to read_ddr3_spd_from_cbfs()
Since it checks for DDR3 style checksums, it's a more appropriate name.
Also make its configuration local for a future code move.
Change-Id: I417ae165579618d9215b8ca5f0500ff9a61af42f
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-on: https://review.coreboot.org/18264
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins)
| -rw-r--r-- | src/device/dram/spd_cache.c | 7 | ||||
| -rw-r--r-- | src/include/spd_cache.h | 4 | ||||
| -rw-r--r-- | src/mainboard/bap/ode_e20XX/BiosCallOuts.c | 2 | ||||
| -rw-r--r-- | src/mainboard/bap/ode_e21XX/BiosCallOuts.c | 2 | ||||
| -rw-r--r-- | src/mainboard/pcengines/apu1/BiosCallOuts.c | 2 | ||||
| -rw-r--r-- | src/mainboard/pcengines/apu2/BiosCallOuts.c | 2 | ||||
| -rw-r--r-- | src/northbridge/amd/agesa/def_callouts.c | 2 | ||||
| -rw-r--r-- | src/northbridge/amd/pi/def_callouts.c | 2 |
8 files changed, 12 insertions, 11 deletions
diff --git a/src/device/dram/spd_cache.c b/src/device/dram/spd_cache.c index 3bdd9c19dd..a74e4a77ba 100644 --- a/src/device/dram/spd_cache.c +++ b/src/device/dram/spd_cache.c @@ -22,13 +22,14 @@ #include <string.h> #define SPD_SIZE 128 -#define SPD_CRC_HI 127 -#define SPD_CRC_LO 126 _Static_assert(SPD_SIZE == CONFIG_DIMM_SPD_SIZE, "configured SPD sizes differ"); -int read_spd_from_cbfs(u8 *buf, int idx) +int read_ddr3_spd_from_cbfs(u8 *buf, int idx) { + const int SPD_CRC_HI = 127; + const int SPD_CRC_LO = 126; + const char *spd_file; size_t spd_file_len = 0; size_t min_len = (idx + 1) * CONFIG_DIMM_SPD_SIZE; diff --git a/src/include/spd_cache.h b/src/include/spd_cache.h index 669639be7c..912aa64295 100644 --- a/src/include/spd_cache.h +++ b/src/include/spd_cache.h @@ -18,9 +18,9 @@ #include <stdint.h> #if IS_ENABLED(CONFIG_SPD_CACHE) -int read_spd_from_cbfs(u8 *buf, int idx); +int read_ddr3_spd_from_cbfs(u8 *buf, int idx); #else -static inline int read_spd_from_cbfs(u8 *buf, int idx) { return -1; } +static inline int read_ddr3_spd_from_cbfs(u8 *buf, int idx) { return -1; } #endif #endif diff --git a/src/mainboard/bap/ode_e20XX/BiosCallOuts.c b/src/mainboard/bap/ode_e20XX/BiosCallOuts.c index 9880b601a0..2ceb5c8b86 100644 --- a/src/mainboard/bap/ode_e20XX/BiosCallOuts.c +++ b/src/mainboard/bap/ode_e20XX/BiosCallOuts.c @@ -239,7 +239,7 @@ static AGESA_STATUS board_ReadSpd_from_cbfs(UINT32 Func, UINTN Data, VOID *Confi return AGESA_UNSUPPORTED; /* Read index 0, first SPD_SIZE bytes of spd.bin file. */ - if (read_spd_from_cbfs((u8 *)info->Buffer, index) < 0) + if (read_ddr3_spd_from_cbfs((u8 *)info->Buffer, index) < 0) die("No SPD data\n"); Status = AGESA_SUCCESS; diff --git a/src/mainboard/bap/ode_e21XX/BiosCallOuts.c b/src/mainboard/bap/ode_e21XX/BiosCallOuts.c index 41603da0b6..10ec422103 100644 --- a/src/mainboard/bap/ode_e21XX/BiosCallOuts.c +++ b/src/mainboard/bap/ode_e21XX/BiosCallOuts.c @@ -328,7 +328,7 @@ static AGESA_STATUS board_ReadSpd_from_cbfs(UINT32 Func, UINTN Data, VOID *Confi return AGESA_UNSUPPORTED; /* Read index 0, first SPD_SIZE bytes of spd.bin file. */ - if (read_spd_from_cbfs((u8 *)info->Buffer, index) < 0) + if (read_ddr3_spd_from_cbfs((u8 *)info->Buffer, index) < 0) die("No SPD data\n"); Status = AGESA_SUCCESS; diff --git a/src/mainboard/pcengines/apu1/BiosCallOuts.c b/src/mainboard/pcengines/apu1/BiosCallOuts.c index 536ec5ff65..f35cbd2215 100644 --- a/src/mainboard/pcengines/apu1/BiosCallOuts.c +++ b/src/mainboard/pcengines/apu1/BiosCallOuts.c @@ -63,7 +63,7 @@ static AGESA_STATUS board_ReadSpd_from_cbfs(UINT32 Func, UINTN Data, VOID *Confi return AGESA_UNSUPPORTED; /* Read index 0, first SPD_SIZE bytes of spd.bin file. */ - if (read_spd_from_cbfs((u8*)info->Buffer, index) < 0) + if (read_ddr3_spd_from_cbfs((u8*)info->Buffer, index) < 0) die("No SPD data\n"); Status = AGESA_SUCCESS; diff --git a/src/mainboard/pcengines/apu2/BiosCallOuts.c b/src/mainboard/pcengines/apu2/BiosCallOuts.c index fe64d64449..221b315849 100644 --- a/src/mainboard/pcengines/apu2/BiosCallOuts.c +++ b/src/mainboard/pcengines/apu2/BiosCallOuts.c @@ -141,7 +141,7 @@ static AGESA_STATUS board_ReadSpd_from_cbfs(UINT32 Func, UINT32 Data, VOID *Conf return AGESA_UNSUPPORTED; /* Read index 0, first SPD_SIZE bytes of spd.bin file. */ - if (read_spd_from_cbfs((u8*)info->Buffer, index) < 0) + if (read_ddr3_spd_from_cbfs((u8*)info->Buffer, index) < 0) die("No SPD data\n"); Status = AGESA_SUCCESS; diff --git a/src/northbridge/amd/agesa/def_callouts.c b/src/northbridge/amd/agesa/def_callouts.c index a2e12a9022..953774af31 100644 --- a/src/northbridge/amd/agesa/def_callouts.c +++ b/src/northbridge/amd/agesa/def_callouts.c @@ -143,7 +143,7 @@ AGESA_STATUS agesa_ReadSpd_from_cbfs(UINT32 Func, UINTN Data, VOID *ConfigPtr) return AGESA_UNSUPPORTED; /* Read index 0, first SPD_SIZE bytes of spd.bin file. */ - if (read_spd_from_cbfs((u8*)info->Buffer, 0) < 0) + if (read_ddr3_spd_from_cbfs((u8*)info->Buffer, 0) < 0) die("No SPD data\n"); Status = AGESA_SUCCESS; diff --git a/src/northbridge/amd/pi/def_callouts.c b/src/northbridge/amd/pi/def_callouts.c index 61b5c8bea1..e38d8072a9 100644 --- a/src/northbridge/amd/pi/def_callouts.c +++ b/src/northbridge/amd/pi/def_callouts.c @@ -132,7 +132,7 @@ AGESA_STATUS agesa_ReadSpd_from_cbfs(UINT32 Func, UINT32 Data, VOID *ConfigPtr) return AGESA_UNSUPPORTED; /* Read index 0, first SPD_SIZE bytes of spd.bin file. */ - if (read_spd_from_cbfs((u8*)info->Buffer, 0) < 0) + if (read_ddr3_spd_from_cbfs((u8*)info->Buffer, 0) < 0) die("No SPD data\n"); Status = AGESA_SUCCESS; |