From 76c27c8032dfb2a87e4ef326c8200ae138398d4b Mon Sep 17 00:00:00 2001 From: Patrick Rudolph Date: Tue, 11 Apr 2023 13:31:39 +0200 Subject: soc/intel/xeon_sp: Drop Kconfig MAX_SOCKET_UPD The Kconfig is only used in common code to gather the build time maximum socket number FSP support. The same information is available in FSP header as MAX_SOCKET, thus use the FSP as truth of source. Currently MAX_SOCKET is 4. Change-Id: I10282c79dbf5d612c37b7e45b900af105bb83c36 Signed-off-by: Patrick Rudolph Reviewed-on: https://review.coreboot.org/c/coreboot/+/74339 Reviewed-by: Paul Menzel Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans Reviewed-by: Johnny Lin Reviewed-by: Lean Sheng Tan --- src/soc/intel/xeon_sp/spr/Kconfig | 8 -------- src/soc/intel/xeon_sp/spr/romstage.c | 12 ++++++------ 2 files changed, 6 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/src/soc/intel/xeon_sp/spr/Kconfig b/src/soc/intel/xeon_sp/spr/Kconfig index 832aab590968..15b915da6b9d 100644 --- a/src/soc/intel/xeon_sp/spr/Kconfig +++ b/src/soc/intel/xeon_sp/spr/Kconfig @@ -27,14 +27,6 @@ config ACPI_CPU_STRING string default "\\_SB.C%03X" -config MAX_SOCKET_UPD - int - default 2 - help - This is used for configuring common SPR UPD tables which their sizes - depend on the socket number. Since it's the maximal socket number for - the common UPD tables, mainboard should not overwrite it. - config SIPI_FINAL_TIMEOUT int default 400000 diff --git a/src/soc/intel/xeon_sp/spr/romstage.c b/src/soc/intel/xeon_sp/spr/romstage.c index aacc3ab81362..f36e5ccf1c42 100644 --- a/src/soc/intel/xeon_sp/spr/romstage.c +++ b/src/soc/intel/xeon_sp/spr/romstage.c @@ -23,8 +23,8 @@ #include "chip.h" /* Initialize to all zero first */ -static UPD_IIO_PCIE_PORT_CONFIG spr_iio_bifur_table[CONFIG_MAX_SOCKET_UPD]; -static UINT8 deemphasis_list[CONFIG_MAX_SOCKET_UPD * MAX_IIO_PORTS_PER_SOCKET]; +static UPD_IIO_PCIE_PORT_CONFIG spr_iio_bifur_table[MAX_SOCKET]; +static UINT8 deemphasis_list[MAX_SOCKET * MAX_IIO_PORTS_PER_SOCKET]; void __weak mainboard_memory_init_params(FSPM_UPD *mupd) { @@ -119,12 +119,12 @@ static void initialize_iio_upd(FSPM_UPD *mupd) unsigned int port, socket; mupd->FspmConfig.IioPcieConfigTablePtr = (UINT32)spr_iio_bifur_table; - mupd->FspmConfig.IioPcieConfigTableNumber = CONFIG_MAX_SOCKET_UPD; + mupd->FspmConfig.IioPcieConfigTableNumber = MAX_SOCKET; UPD_IIO_PCIE_PORT_CONFIG *PciePortConfig = (UPD_IIO_PCIE_PORT_CONFIG *)spr_iio_bifur_table; /* Initialize non-zero default UPD values */ - for (socket = 0; socket < CONFIG_MAX_SOCKET_UPD; socket++) { + for (socket = 0; socket < MAX_SOCKET; socket++) { for (port = 0; port < MAX_IIO_PORTS_PER_SOCKET; port++) { PciePortConfig[socket].PcieMaxPayload[port] = 0x7; /* Auto */ PciePortConfig[socket].DfxDnTxPresetGen3[port] = 0xff; /* Auto */ @@ -134,10 +134,10 @@ static void initialize_iio_upd(FSPM_UPD *mupd) } mupd->FspmConfig.DeEmphasisPtr = (UINT32)deemphasis_list; - mupd->FspmConfig.DeEmphasisNumber = CONFIG_MAX_SOCKET_UPD * MAX_IIO_PORTS_PER_SOCKET; + mupd->FspmConfig.DeEmphasisNumber = MAX_SOCKET * MAX_IIO_PORTS_PER_SOCKET; UINT8 *DeEmphasisConfig = (UINT8 *)deemphasis_list; - for (port = 0; port < CONFIG_MAX_SOCKET_UPD * MAX_IIO_PORTS_PER_SOCKET; port++) + for (port = 0; port < MAX_SOCKET * MAX_IIO_PORTS_PER_SOCKET; port++) DeEmphasisConfig[port] = 0x1; } -- cgit v1.2.3