6be82a4cd8
The dimm_info structure (defined in src/include/memory_info.h) currently does not hold information about the DIMM's node/controller ID. This patch extends the dimm_info structure by adding a new field for the node ID, called node_num. Also, adapt the dimm_info_fill() function accordingly to populate the newly-added field. Background: These changes are necessary for the Atlas mainboard, where we are currently experiencing issues with the DIMMs device/bank locator. Our 2 DIMMs share the same CHANNEL and DIMM ID but have a distinct NODE ID. By looking at the smbios table we see Channel-0-DIMM-0 for both DIMMs. Thus, we need their NODE IDs in order to distinguish them. This patch was tested by building and booting for the Alderlake-P RVP board, which has the same DIMM slot configuration as the Prodrive Atlas mainboard. Signed-off-by: David Milosevic <David.Milosevic@9elements.com> Change-Id: I6ffa5bdff0ba0e3c4a4a51f2419291fd1278cd68 Reviewed-on: https://review.coreboot.org/c/coreboot/+/68525 Reviewed-by: Jonathan Zhang <jonzhang@fb.com> Reviewed-by: Lean Sheng Tan <sheng.tan@9elements.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
50 lines
1.4 KiB
C
50 lines
1.4 KiB
C
/* SPDX-License-Identifier: GPL-2.0-only */
|
|
|
|
#include <smbios.h>
|
|
#include "smbios.h"
|
|
#include <string.h>
|
|
#include <commonlib/helpers.h>
|
|
#include <device/dram/ddr3.h>
|
|
#include <dimm_info_util.h>
|
|
|
|
#define EXTENSION_BUS_WIDTH_8BITS 8
|
|
|
|
/* Fill the SMBIOS memory information from FSP MEM_INFO_DATA_HOB in CBMEM.*/
|
|
void dimm_info_fill(struct dimm_info *dimm, u32 dimm_capacity, u8 ddr_type,
|
|
u32 frequency, u8 rank_per_dimm, u8 channel_id, u8 dimm_id,
|
|
const char *module_part_num, size_t module_part_number_size,
|
|
const u8 *module_serial_num, u16 data_width, u32 vdd_voltage,
|
|
bool ecc_support, u16 mod_id, u8 mod_type, u8 ctrlr_id)
|
|
{
|
|
dimm->mod_id = mod_id;
|
|
dimm->mod_type = mod_type;
|
|
dimm->dimm_size = dimm_capacity;
|
|
dimm->ddr_type = ddr_type;
|
|
dimm->ddr_frequency = frequency;
|
|
dimm->rank_per_dimm = rank_per_dimm;
|
|
dimm->channel_num = channel_id;
|
|
dimm->dimm_num = dimm_id;
|
|
dimm->ctrlr_num = ctrlr_id;
|
|
|
|
if (vdd_voltage > 0xFFFF) {
|
|
dimm->vdd_voltage = 0xFFFF;
|
|
} else {
|
|
dimm->vdd_voltage = vdd_voltage;
|
|
}
|
|
|
|
strncpy((char *)dimm->module_part_number,
|
|
module_part_num,
|
|
MIN(sizeof(dimm->module_part_number),
|
|
module_part_number_size));
|
|
if (module_serial_num)
|
|
memcpy(dimm->serial, module_serial_num,
|
|
DIMM_INFO_SERIAL_SIZE);
|
|
|
|
uint16_t total_width = data_width;
|
|
|
|
if (ecc_support)
|
|
total_width += EXTENSION_BUS_WIDTH_8BITS;
|
|
|
|
dimm->bus_width = smbios_bus_width_to_spd_width(ddr_type, total_width, data_width);
|
|
}
|