device/dram: use global DIMM_SPD_SIZE Kconfig variable

Also make sure that no board changes behaviour because of that by adding
a static assert.

TEST=abuild over all builds still succeeds (where it doesn't if
DIMM_SPD_SIZE isn't set to 128 bytes for boards that use the
device/dram code).

Change-Id: Iddb962b16857ee859ddcf1b52d18da9b3be56449
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-on: https://review.coreboot.org/18254
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins)
This commit is contained in:
Patrick Georgi 2017-01-28 13:12:09 +01:00 committed by Patrick Georgi
parent d09dc6b442
commit 44a46a1f04
9 changed files with 34 additions and 5 deletions

View File

@ -1236,7 +1236,6 @@ config DIMM_MAX
config DIMM_SPD_SIZE config DIMM_SPD_SIZE
int int
default 256 default 256
depends on GENERIC_SPD_BIN
help help
Total SPD size that will be used for DIMM. Total SPD size that will be used for DIMM.
Ex: DDR3 256, DDR4 512. Ex: DDR3 256, DDR4 512.

View File

@ -25,11 +25,13 @@
#define SPD_CRC_HI 127 #define SPD_CRC_HI 127
#define SPD_CRC_LO 126 #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_spd_from_cbfs(u8 *buf, int idx)
{ {
const char *spd_file; const char *spd_file;
size_t spd_file_len = 0; size_t spd_file_len = 0;
size_t min_len = (idx + 1) * SPD_SIZE; size_t min_len = (idx + 1) * CONFIG_DIMM_SPD_SIZE;
spd_file = cbfs_boot_map_with_leak("spd.bin", CBFS_TYPE_SPD, spd_file = cbfs_boot_map_with_leak("spd.bin", CBFS_TYPE_SPD,
&spd_file_len); &spd_file_len);
@ -40,9 +42,9 @@ int read_spd_from_cbfs(u8 *buf, int idx)
if (!spd_file || spd_file_len < min_len) if (!spd_file || spd_file_len < min_len)
return -1; return -1;
memcpy(buf, spd_file + (idx * SPD_SIZE), SPD_SIZE); memcpy(buf, spd_file + (idx * CONFIG_DIMM_SPD_SIZE), CONFIG_DIMM_SPD_SIZE);
u16 crc = spd_ddr3_calc_crc(buf, SPD_SIZE); u16 crc = spd_ddr3_calc_crc(buf, CONFIG_DIMM_SPD_SIZE);
if (((buf[SPD_CRC_LO] == 0) && (buf[SPD_CRC_HI] == 0)) if (((buf[SPD_CRC_LO] == 0) && (buf[SPD_CRC_HI] == 0))
|| (buf[SPD_CRC_LO] != (crc & 0xff)) || (buf[SPD_CRC_LO] != (crc & 0xff))
@ -53,7 +55,7 @@ int read_spd_from_cbfs(u8 *buf, int idx)
buf[SPD_CRC_HI] = crc >> 8; buf[SPD_CRC_HI] = crc >> 8;
u16 i; u16 i;
printk(BIOS_WARNING, "\nDisplay the SPD"); printk(BIOS_WARNING, "\nDisplay the SPD");
for (i = 0; i < SPD_SIZE; i++) { for (i = 0; i < CONFIG_DIMM_SPD_SIZE; i++) {
if((i % 16) == 0x00) if((i % 16) == 0x00)
printk(BIOS_WARNING, "\n%02x: ", i); printk(BIOS_WARNING, "\n%02x: ", i);
printk(BIOS_WARNING, "%02x ", buf[i]); printk(BIOS_WARNING, "%02x ", buf[i]);

View File

@ -53,4 +53,8 @@ config HUDSON_LEGACY_FREE
bool bool
default y default y
config DIMM_SPD_SIZE
int
default 128
endif # BOARD_AMD_DB_FT3B_LC endif # BOARD_AMD_DB_FT3B_LC

View File

@ -80,4 +80,8 @@ config BAP_E20_DDR3_1066
endchoice endchoice
config DIMM_SPD_SIZE
int
default 128
endif # BOARD_ODE_E20XX endif # BOARD_ODE_E20XX

View File

@ -74,4 +74,8 @@ config BAP_E21_DDR3_1333
endchoice endchoice
config DIMM_SPD_SIZE
int
default 128
endif # BOARD_ODE_E21XX endif # BOARD_ODE_E21XX

View File

@ -70,4 +70,8 @@ config SB800_AHCI_ROM
bool bool
default n default n
config DIMM_SPD_SIZE
int
default 128
endif # BOARD_GIZMOSPHERE_GIZMO endif # BOARD_GIZMOSPHERE_GIZMO

View File

@ -61,4 +61,8 @@ config HUDSON_LEGACY_FREE
bool bool
default y default y
config DIMM_SPD_SIZE
int
default 128
endif # BOARD_GIZMOSPHERE_GIZMO2 endif # BOARD_GIZMOSPHERE_GIZMO2

View File

@ -116,4 +116,8 @@ endchoice
config UART_D_RS485 config UART_D_RS485
bool "UART D drives RTS# in RS485 mode" if APU1_PINMUX_UART_D bool "UART D drives RTS# in RS485 mode" if APU1_PINMUX_UART_D
config DIMM_SPD_SIZE
int
default 128
endif # BOARD_PCENGINES_APU1 endif # BOARD_PCENGINES_APU1

View File

@ -88,4 +88,8 @@ config APU2_PINMUX_UART_D
endchoice endchoice
config DIMM_SPD_SIZE
int
default 128
endif # BOARD_PCENGINES_APU2 endif # BOARD_PCENGINES_APU2