mb/google/glados: port to FSP 2.0

This patch is part of the patch series to drop support for FSP 1.1 in
soc/intel/skylake.

The following modifications have been done to migrate the board(s) from
FSP 1.1 to FSP 2.0:

- remove deprecated devicetree VR_RING domain (only 4 domains in FSP 2.0)
- switch to using the FSP default VBT

TODO:
- testing

Change-Id: Id747ef484dfdcb2d346f817976f52073912468d0
Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/35921
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Michael Niewöhner 2019-10-09 21:02:36 +02:00 committed by Patrick Georgi
parent 24ba85002a
commit f89cb241ee
26 changed files with 192 additions and 304 deletions

View File

@ -17,6 +17,7 @@ config BOARD_GOOGLE_BASEBOARD_GLADOS
select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_CHROMEOS
select MAINBOARD_HAS_LPC_TPM select MAINBOARD_HAS_LPC_TPM
select MAINBOARD_HAS_TPM1 select MAINBOARD_HAS_TPM1
select MAINBOARD_USES_FSP2_0
select SOC_INTEL_SKYLAKE select SOC_INTEL_SKYLAKE
select SYSTEM_TYPE_LAPTOP select SYSTEM_TYPE_LAPTOP
@ -62,6 +63,9 @@ config DEVICETREE
string string
default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb" default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
config INTEL_GMA_VBT_FILE
default "3rdparty/fsp/KabylakeFspBinPkg/SampleCode/Vbt/Vbt.bin"
config MAX_CPUS config MAX_CPUS
int int
default 8 default 8

View File

@ -17,7 +17,7 @@
#include <soc/ramstage.h> #include <soc/ramstage.h>
#include <variant/gpio.h> #include <variant/gpio.h>
void mainboard_silicon_init_params(SILICON_INIT_UPD *params) void mainboard_silicon_init_params(FSP_SIL_UPD *params)
{ {
/* Configure pads prior to SiliconInit() in case there's any /* Configure pads prior to SiliconInit() in case there's any
* dependencies during hardware initialization. */ * dependencies during hardware initialization. */

View File

@ -25,18 +25,18 @@
#include "spd/spd_util.h" #include "spd/spd_util.h"
#include "spd/spd.h" #include "spd/spd.h"
void mainboard_pre_raminit(struct romstage_params *params)
void mainboard_memory_init_params(FSPM_UPD *mupd)
{ {
FSP_M_CONFIG *mem_cfg = &mupd->FspmConfig;
#ifdef EC_ENABLE_KEYBOARD_BACKLIGHT #ifdef EC_ENABLE_KEYBOARD_BACKLIGHT
/* Turn on keyboard backlight to indicate we are booting */ /* Turn on keyboard backlight to indicate we are booting */
if (params->power_state->prev_sleep_state != ACPI_S3) const FSPM_ARCH_UPD *arch_upd = &mupd->FspmArchUpd;
if (arch_upd->BootMode != FSP_BOOT_ON_S3_RESUME)
google_chromeec_kbbacklight(25); google_chromeec_kbbacklight(25);
#endif #endif
}
void mainboard_memory_init_params(struct romstage_params *params,
MEMORY_INIT_UPD *memory_params)
{
/* Get SPD index */ /* Get SPD index */
const gpio_t spd_gpios[] = { const gpio_t spd_gpios[] = {
GPIO_MEM_CONFIG_0, GPIO_MEM_CONFIG_0,
@ -46,9 +46,9 @@ void mainboard_memory_init_params(struct romstage_params *params,
}; };
const int spd_idx = gpio_base2_value(spd_gpios, ARRAY_SIZE(spd_gpios)); const int spd_idx = gpio_base2_value(spd_gpios, ARRAY_SIZE(spd_gpios));
memory_params->MemorySpdDataLen = SPD_LEN; mem_cfg->MemorySpdDataLen = SPD_LEN;
memory_params->DqPinsInterleaved = FALSE; mem_cfg->DqPinsInterleaved = FALSE;
spd_memory_init_params(memory_params, spd_idx); spd_memory_init_params(mupd, spd_idx);
variant_memory_init_params(memory_params, spd_idx); variant_memory_init_params(mupd, spd_idx);
} }

View File

@ -83,8 +83,10 @@ __weak int is_dual_channel(const int spd_index)
} }
/* Copy SPD data for on-board memory */ /* Copy SPD data for on-board memory */
void spd_memory_init_params(MEMORY_INIT_UPD *const memory_params, int spd_index) void spd_memory_init_params(FSPM_UPD *mupd, int spd_index)
{ {
FSP_M_CONFIG *mem_cfg;
mem_cfg = &mupd->FspmConfig;
uint8_t *spd_file; uint8_t *spd_file;
size_t spd_file_len; size_t spd_file_len;
@ -112,9 +114,9 @@ void spd_memory_init_params(MEMORY_INIT_UPD *const memory_params, int spd_index)
die("Invalid SPD data."); die("Invalid SPD data.");
/* Assume same memory in both channels */ /* Assume same memory in both channels */
memory_params->MemorySpdPtr00 = (uintptr_t)spd_file + spd_offset; mem_cfg->MemorySpdPtr00 = (uintptr_t)spd_file + spd_offset;
if (is_dual_channel(spd_index)) if (is_dual_channel(spd_index))
memory_params->MemorySpdPtr10 = memory_params->MemorySpdPtr00; mem_cfg->MemorySpdPtr10 = mem_cfg->MemorySpdPtr00;
mainboard_print_spd_info(spd_file + spd_offset); mainboard_print_spd_info(spd_file + spd_offset);
} }

View File

@ -16,6 +16,6 @@
#include <fsp/soc_binding.h> #include <fsp/soc_binding.h>
void spd_memory_init_params(MEMORY_INIT_UPD *, int spd_index); void spd_memory_init_params(FSPM_UPD *mupd, int spd_index);
#endif /* SPD_UTIL_H */ #endif /* SPD_UTIL_H */

View File

@ -60,20 +60,20 @@ chip soc/intel/skylake
register "pirqg_routing" = "PCH_IRQ11" register "pirqg_routing" = "PCH_IRQ11"
register "pirqh_routing" = "PCH_IRQ11" register "pirqh_routing" = "PCH_IRQ11"
# VR Settings Configuration for 5 Domains # VR Settings Configuration for 4 Domains
#+----------------+-------+-------+-------------+-------------+-------+ #+----------------+-----------+-----------+-------------+----------+
#| Domain/Setting | SA | IA | Ring Sliced | GT Unsliced | GT | #| Domain/Setting | SA | IA | GT Unsliced | GT |
#+----------------+-------+-------+-------------+-------------+-------+ #+----------------+-----------+-----------+-------------+----------+
#| Psi1Threshold | 20A | 20A | 20A | 20A | 20A | #| Psi1Threshold | 20A | 20A | 20A | 20A |
#| Psi2Threshold | 4A | 5A | 5A | 5A | 5A | #| Psi2Threshold | 4A | 5A | 5A | 5A |
#| Psi3Threshold | 1A | 1A | 1A | 1A | 1A | #| Psi3Threshold | 1A | 1A | 1A | 1A |
#| Psi3Enable | 1 | 1 | 1 | 1 | 1 | #| Psi3Enable | 1 | 1 | 1 | 1 |
#| Psi4Enable | 1 | 1 | 1 | 1 | 1 | #| Psi4Enable | 1 | 1 | 1 | 1 |
#| ImonSlope | 0 | 0 | 0 | 0 | 0 | #| ImonSlope | 0 | 0 | 0 | 0 |
#| ImonOffset | 0 | 0 | 0 | 0 | 0 | #| ImonOffset | 0 | 0 | 0 | 0 |
#| IccMax | 7A | 34A | 34A | 35A | 35A | #| IccMax | 7A | 34A | 35A | 35A |
#| VrVoltageLimit | 1.52V | 1.52V | 1.52V | 1.52V | 1.52V | #| VrVoltageLimit | 1.52V | 1.52V | 1.52V | 1.52V |
#+----------------+-------+-------+-------------+-------------+-------+ #+----------------+-----------+-----------+-------------+----------+
register "domain_vr_config[VR_SYSTEM_AGENT]" = "{ register "domain_vr_config[VR_SYSTEM_AGENT]" = "{
.vr_config_enable = 1, .vr_config_enable = 1,
.psi1threshold = VR_CFG_AMP(20), .psi1threshold = VR_CFG_AMP(20),
@ -100,19 +100,6 @@ chip soc/intel/skylake
.voltage_limit = 1520, .voltage_limit = 1520,
}" }"
register "domain_vr_config[VR_RING]" = "{
.vr_config_enable = 1,
.psi1threshold = VR_CFG_AMP(20),
.psi2threshold = VR_CFG_AMP(5),
.psi3threshold = VR_CFG_AMP(1),
.psi3enable = 1,
.psi4enable = 1,
.imon_slope = 0x0,
.imon_offset = 0x0,
.icc_max = VR_CFG_AMP(34),
.voltage_limit = 1520,
}"
register "domain_vr_config[VR_GT_UNSLICED]" = "{ register "domain_vr_config[VR_GT_UNSLICED]" = "{
.vr_config_enable = 1, .vr_config_enable = 1,
.psi1threshold = VR_CFG_AMP(20), .psi1threshold = VR_CFG_AMP(20),

View File

@ -18,10 +18,13 @@
#include <string.h> #include <string.h>
#include <baseboard/variant.h> #include <baseboard/variant.h>
#include <fsp/soc_binding.h> #include <fsp/soc_binding.h>
#include <soc/romstage.h>
void variant_memory_init_params( void variant_memory_init_params(FSPM_UPD *mupd, const int spd_index)
MEMORY_INIT_UPD *const memory_params, const int spd_index)
{ {
FSP_M_CONFIG *mem_cfg;
mem_cfg = &mupd->FspmConfig;
/* DQ byte map */ /* DQ byte map */
const u8 dq_map[2][12] = { const u8 dq_map[2][12] = {
{ 0x0F, 0xF0, 0x00, 0xF0, 0x0F, 0xF0, { 0x0F, 0xF0, 0x00, 0xF0, 0x0F, 0xF0,
@ -39,18 +42,12 @@ void variant_memory_init_params(
/* Rcomp target */ /* Rcomp target */
const u16 RcompTarget[5] = { 100, 40, 40, 23, 40 }; const u16 RcompTarget[5] = { 100, 40, 40, 23, 40 };
memcpy(memory_params->DqByteMapCh0, dq_map[0], memcpy(mem_cfg->DqByteMapCh0, dq_map[0], sizeof(mem_cfg->DqByteMapCh0));
sizeof(memory_params->DqByteMapCh0)); memcpy(mem_cfg->DqByteMapCh1, dq_map[1], sizeof(mem_cfg->DqByteMapCh1));
memcpy(memory_params->DqByteMapCh1, dq_map[1], memcpy(mem_cfg->DqsMapCpu2DramCh0, dqs_map[0], sizeof(mem_cfg->DqsMapCpu2DramCh0));
sizeof(memory_params->DqByteMapCh1)); memcpy(mem_cfg->DqsMapCpu2DramCh1, dqs_map[1], sizeof(mem_cfg->DqsMapCpu2DramCh1));
memcpy(memory_params->DqsMapCpu2DramCh0, dqs_map[0], memcpy(mem_cfg->RcompResistor, RcompResistor, sizeof(mem_cfg->RcompResistor));
sizeof(memory_params->DqsMapCpu2DramCh0)); memcpy(mem_cfg->RcompTarget, RcompTarget, sizeof(mem_cfg->RcompTarget));
memcpy(memory_params->DqsMapCpu2DramCh1, dqs_map[1],
sizeof(memory_params->DqsMapCpu2DramCh1));
memcpy(memory_params->RcompResistor, RcompResistor,
sizeof(memory_params->RcompResistor));
memcpy(memory_params->RcompTarget, RcompTarget,
sizeof(memory_params->RcompTarget));
} }
int is_dual_channel(const int spd_index) int is_dual_channel(const int spd_index)

View File

@ -19,6 +19,6 @@
int is_dual_channel(const int spd_index); int is_dual_channel(const int spd_index);
void mainboard_gpio_smi_sleep(void); void mainboard_gpio_smi_sleep(void);
void variant_memory_init_params(MEMORY_INIT_UPD *memory_params, int spd_index); void variant_memory_init_params(FSPM_UPD *mupd, const int spd_index);
#endif /* GLADOS_VARIANT_H */ #endif /* GLADOS_VARIANT_H */

View File

@ -71,20 +71,20 @@ chip soc/intel/skylake
register "SlowSlewRateForSa" = "0" # Fast/2 register "SlowSlewRateForSa" = "0" # Fast/2
register "FastPkgCRampDisable" = "0" register "FastPkgCRampDisable" = "0"
# VR Settings Configuration for 5 Domains # VR Settings Configuration for 4 Domains
#+----------------+-------+-------+-------------+-------------+-------+ #+----------------+-----------+-----------+-------------+----------+
#| Domain/Setting | SA | IA | Ring Sliced | GT Unsliced | GT | #| Domain/Setting | SA | IA | GT Unsliced | GT |
#+----------------+-------+-------+-------------+-------------+-------+ #+----------------+-----------+-----------+-------------+----------+
#| Psi1Threshold | 20A | 20A | 20A | 20A | 20A | #| Psi1Threshold | 20A | 20A | 20A | 20A |
#| Psi2Threshold | 4A | 5A | 5A | 5A | 5A | #| Psi2Threshold | 4A | 5A | 5A | 5A |
#| Psi3Threshold | 1A | 1A | 1A | 1A | 1A | #| Psi3Threshold | 1A | 1A | 1A | 1A |
#| Psi3Enable | 1 | 1 | 1 | 1 | 1 | #| Psi3Enable | 1 | 1 | 1 | 1 |
#| Psi4Enable | 1 | 1 | 1 | 1 | 1 | #| Psi4Enable | 1 | 1 | 1 | 1 |
#| ImonSlope | 0 | 0 | 0 | 0 | 0 | #| ImonSlope | 0 | 0 | 0 | 0 |
#| ImonOffset | 0 | 0 | 0 | 0 | 0 | #| ImonOffset | 0 | 0 | 0 | 0 |
#| IccMax | 7A | 34A | 34A | 35A | 35A | #| IccMax | 4A | 24A | 24A | 24A |
#| VrVoltageLimit | 1.52V | 1.52V | 1.52V | 1.52V | 1.52V | #| VrVoltageLimit | 1.52V | 1.52V | 1.52V | 1.52V |
#+----------------+-------+-------+-------------+-------------+-------+ #+----------------+-----------+-----------+-------------+----------+
register "domain_vr_config[VR_SYSTEM_AGENT]" = "{ register "domain_vr_config[VR_SYSTEM_AGENT]" = "{
.vr_config_enable = 1, .vr_config_enable = 1,
.psi1threshold = VR_CFG_AMP(20), .psi1threshold = VR_CFG_AMP(20),
@ -111,19 +111,6 @@ chip soc/intel/skylake
.voltage_limit = 1520, .voltage_limit = 1520,
}" }"
register "domain_vr_config[VR_RING]" = "{
.vr_config_enable = 1,
.psi1threshold = VR_CFG_AMP(20),
.psi2threshold = VR_CFG_AMP(5),
.psi3threshold = VR_CFG_AMP(1),
.psi3enable = 1,
.psi4enable = 1,
.imon_slope = 0x0,
.imon_offset = 0x0,
.icc_max = VR_CFG_AMP(24),
.voltage_limit = 1520,
}"
register "domain_vr_config[VR_GT_UNSLICED]" = "{ register "domain_vr_config[VR_GT_UNSLICED]" = "{
.vr_config_enable = 1, .vr_config_enable = 1,
.psi1threshold = VR_CFG_AMP(20), .psi1threshold = VR_CFG_AMP(20),

View File

@ -21,9 +21,11 @@
#include <string.h> #include <string.h>
#include <variant/gpio.h> #include <variant/gpio.h>
void variant_memory_init_params( void variant_memory_init_params(FSPM_UPD *mupd, const int spd_index)
MEMORY_INIT_UPD *const memory_params, const int spd_index)
{ {
FSP_M_CONFIG *mem_cfg;
mem_cfg = &mupd->FspmConfig;
/* DQ byte map */ /* DQ byte map */
const u8 dq_map[2][12] = { const u8 dq_map[2][12] = {
{ 0x0F, 0xF0, 0x00, 0xF0, 0x0F, 0xF0, { 0x0F, 0xF0, 0x00, 0xF0, 0x0F, 0xF0,
@ -41,19 +43,12 @@ void variant_memory_init_params(
/* Rcomp target */ /* Rcomp target */
const u16 RcompTarget[5] = { 100, 40, 40, 23, 40 }; const u16 RcompTarget[5] = { 100, 40, 40, 23, 40 };
memcpy(memory_params->DqByteMapCh0, dq_map[0], memcpy(mem_cfg->DqByteMapCh0, dq_map[0], sizeof(mem_cfg->DqByteMapCh0));
sizeof(memory_params->DqByteMapCh0)); memcpy(mem_cfg->DqByteMapCh1, dq_map[1], sizeof(mem_cfg->DqByteMapCh1));
memcpy(memory_params->DqByteMapCh1, dq_map[1], memcpy(mem_cfg->DqsMapCpu2DramCh0, dqs_map[0], sizeof(mem_cfg->DqsMapCpu2DramCh0));
sizeof(memory_params->DqByteMapCh1)); memcpy(mem_cfg->DqsMapCpu2DramCh1, dqs_map[1], sizeof(mem_cfg->DqsMapCpu2DramCh1));
memcpy(memory_params->DqsMapCpu2DramCh0, dqs_map[0], memcpy(mem_cfg->RcompResistor, RcompResistor, sizeof(mem_cfg->RcompResistor));
sizeof(memory_params->DqsMapCpu2DramCh0)); memcpy(mem_cfg->RcompTarget, RcompTarget, sizeof(mem_cfg->RcompTarget));
memcpy(memory_params->DqsMapCpu2DramCh1, dqs_map[1],
sizeof(memory_params->DqsMapCpu2DramCh1));
memcpy(memory_params->RcompResistor, RcompResistor,
sizeof(memory_params->RcompResistor));
memcpy(memory_params->RcompTarget, RcompTarget,
sizeof(memory_params->RcompTarget));
memory_params->DdrFreqLimit = 1600;
} }
void mainboard_gpio_smi_sleep(void) void mainboard_gpio_smi_sleep(void)

View File

@ -70,20 +70,20 @@ chip soc/intel/skylake
register "pirqg_routing" = "PCH_IRQ11" register "pirqg_routing" = "PCH_IRQ11"
register "pirqh_routing" = "PCH_IRQ11" register "pirqh_routing" = "PCH_IRQ11"
# VR Settings Configuration for 5 Domains # VR Settings Configuration for 4 Domains
#+----------------+-------+-------+-------------+-------------+-------+ #+----------------+-----------+-----------+-------------+----------+
#| Domain/Setting | SA | IA | Ring Sliced | GT Unsliced | GT | #| Domain/Setting | SA | IA | GT Unsliced | GT |
#+----------------+-------+-------+-------------+-------------+-------+ #+----------------+-----------+-----------+-------------+----------+
#| Psi1Threshold | 20A | 20A | 20A | 20A | 20A | #| Psi1Threshold | 20A | 20A | 20A | 20A |
#| Psi2Threshold | 4A | 5A | 5A | 5A | 5A | #| Psi2Threshold | 4A | 5A | 5A | 5A |
#| Psi3Threshold | 1A | 1A | 1A | 1A | 1A | #| Psi3Threshold | 1A | 1A | 1A | 1A |
#| Psi3Enable | 1 | 1 | 1 | 1 | 1 | #| Psi3Enable | 1 | 1 | 1 | 1 |
#| Psi4Enable | 1 | 1 | 1 | 1 | 1 | #| Psi4Enable | 1 | 1 | 1 | 1 |
#| ImonSlope | 0 | 0 | 0 | 0 | 0 | #| ImonSlope | 0 | 0 | 0 | 0 |
#| ImonOffset | 0 | 0 | 0 | 0 | 0 | #| ImonOffset | 0 | 0 | 0 | 0 |
#| IccMax | 4A | 24A | 24A | 24A | 24A | #| IccMax | 4A | 24A | 24A | 24A |
#| VrVoltageLimit | 1.52V | 1.52V | 1.52V | 1.52V | 1.52V | #| VrVoltageLimit | 1.52V | 1.52V | 1.52V | 1.52V |
#+----------------+-------+-------+-------------+-------------+-------+ #+----------------+-----------+-----------+-------------+----------+
register "domain_vr_config[VR_SYSTEM_AGENT]" = "{ register "domain_vr_config[VR_SYSTEM_AGENT]" = "{
.vr_config_enable = 1, .vr_config_enable = 1,
.psi1threshold = VR_CFG_AMP(20), .psi1threshold = VR_CFG_AMP(20),
@ -110,19 +110,6 @@ chip soc/intel/skylake
.voltage_limit = 1520, .voltage_limit = 1520,
}" }"
register "domain_vr_config[VR_RING]" = "{
.vr_config_enable = 1,
.psi1threshold = VR_CFG_AMP(20),
.psi2threshold = VR_CFG_AMP(5),
.psi3threshold = VR_CFG_AMP(1),
.psi3enable = 1,
.psi4enable = 1,
.imon_slope = 0x0,
.imon_offset = 0x0,
.icc_max = VR_CFG_AMP(24),
.voltage_limit = 1520,
}"
register "domain_vr_config[VR_GT_UNSLICED]" = "{ register "domain_vr_config[VR_GT_UNSLICED]" = "{
.vr_config_enable = 1, .vr_config_enable = 1,
.psi1threshold = VR_CFG_AMP(20), .psi1threshold = VR_CFG_AMP(20),

View File

@ -21,9 +21,11 @@
#include <string.h> #include <string.h>
#include <variant/gpio.h> #include <variant/gpio.h>
void variant_memory_init_params( void variant_memory_init_params(FSPM_UPD *mupd, const int spd_index)
MEMORY_INIT_UPD *const memory_params, const int spd_index)
{ {
FSP_M_CONFIG *mem_cfg;
mem_cfg = &mupd->FspmConfig;
/* DQ byte map */ /* DQ byte map */
const u8 dq_map[2][12] = { const u8 dq_map[2][12] = {
{ 0x0F, 0xF0, 0x00, 0xF0, 0x0F, 0xF0, { 0x0F, 0xF0, 0x00, 0xF0, 0x0F, 0xF0,
@ -41,18 +43,12 @@ void variant_memory_init_params(
/* Rcomp target */ /* Rcomp target */
const u16 RcompTarget[5] = { 100, 40, 40, 23, 40 }; const u16 RcompTarget[5] = { 100, 40, 40, 23, 40 };
memcpy(memory_params->DqByteMapCh0, dq_map[0], memcpy(mem_cfg->DqByteMapCh0, dq_map[0], sizeof(mem_cfg->DqByteMapCh0));
sizeof(memory_params->DqByteMapCh0)); memcpy(mem_cfg->DqByteMapCh1, dq_map[1], sizeof(mem_cfg->DqByteMapCh1));
memcpy(memory_params->DqByteMapCh1, dq_map[1], memcpy(mem_cfg->DqsMapCpu2DramCh0, dqs_map[0], sizeof(mem_cfg->DqsMapCpu2DramCh0));
sizeof(memory_params->DqByteMapCh1)); memcpy(mem_cfg->DqsMapCpu2DramCh1, dqs_map[1], sizeof(mem_cfg->DqsMapCpu2DramCh1));
memcpy(memory_params->DqsMapCpu2DramCh0, dqs_map[0], memcpy(mem_cfg->RcompResistor, RcompResistor, sizeof(mem_cfg->RcompResistor));
sizeof(memory_params->DqsMapCpu2DramCh0)); memcpy(mem_cfg->RcompTarget, RcompTarget, sizeof(mem_cfg->RcompTarget));
memcpy(memory_params->DqsMapCpu2DramCh1, dqs_map[1],
sizeof(memory_params->DqsMapCpu2DramCh1));
memcpy(memory_params->RcompResistor, RcompResistor,
sizeof(memory_params->RcompResistor));
memcpy(memory_params->RcompTarget, RcompTarget,
sizeof(memory_params->RcompTarget));
} }
void mainboard_gpio_smi_sleep(void) void mainboard_gpio_smi_sleep(void)

View File

@ -70,20 +70,20 @@ chip soc/intel/skylake
register "pirqg_routing" = "PCH_IRQ11" register "pirqg_routing" = "PCH_IRQ11"
register "pirqh_routing" = "PCH_IRQ11" register "pirqh_routing" = "PCH_IRQ11"
# VR Settings Configuration for 5 Domains # VR Settings Configuration for 4 Domains
#+----------------+-------+-------+-------------+-------------+-------+ #+----------------+-----------+-----------+-------------+----------+
#| Domain/Setting | SA | IA | Ring Sliced | GT Unsliced | GT | #| Domain/Setting | SA | IA | GT Unsliced | GT |
#+----------------+-------+-------+-------------+-------------+-------+ #+----------------+-----------+-----------+-------------+----------+
#| Psi1Threshold | 20A | 20A | 20A | 20A | 20A | #| Psi1Threshold | 20A | 20A | 20A | 20A |
#| Psi2Threshold | 4A | 5A | 5A | 5A | 5A | #| Psi2Threshold | 4A | 5A | 5A | 5A |
#| Psi3Threshold | 1A | 1A | 1A | 1A | 1A | #| Psi3Threshold | 1A | 1A | 1A | 1A |
#| Psi3Enable | 1 | 1 | 1 | 1 | 1 | #| Psi3Enable | 1 | 1 | 1 | 1 |
#| Psi4Enable | 1 | 1 | 1 | 1 | 1 | #| Psi4Enable | 1 | 1 | 1 | 1 |
#| ImonSlope | 0 | 0 | 0 | 0 | 0 | #| ImonSlope | 0 | 0 | 0 | 0 |
#| ImonOffset | 0 | 0 | 0 | 0 | 0 | #| ImonOffset | 0 | 0 | 0 | 0 |
#| IccMax | 7A | 34A | 34A | 35A | 35A | #| IccMax | 7A | 34A | 35A | 35A |
#| VrVoltageLimit | 1.52V | 1.52V | 1.52V | 1.52V | 1.52V | #| VrVoltageLimit | 1.52V | 1.52V | 1.52V | 1.52V |
#+----------------+-------+-------+-------------+-------------+-------+ #+----------------+-----------+-----------+-------------+----------+
register "domain_vr_config[VR_SYSTEM_AGENT]" = "{ register "domain_vr_config[VR_SYSTEM_AGENT]" = "{
.vr_config_enable = 1, .vr_config_enable = 1,
.psi1threshold = VR_CFG_AMP(20), .psi1threshold = VR_CFG_AMP(20),
@ -110,19 +110,6 @@ chip soc/intel/skylake
.voltage_limit = 1520, .voltage_limit = 1520,
}" }"
register "domain_vr_config[VR_RING]" = "{
.vr_config_enable = 1,
.psi1threshold = VR_CFG_AMP(20),
.psi2threshold = VR_CFG_AMP(5),
.psi3threshold = VR_CFG_AMP(1),
.psi3enable = 1,
.psi4enable = 1,
.imon_slope = 0x0,
.imon_offset = 0x0,
.icc_max = VR_CFG_AMP(34),
.voltage_limit = 1520,
}"
register "domain_vr_config[VR_GT_UNSLICED]" = "{ register "domain_vr_config[VR_GT_UNSLICED]" = "{
.vr_config_enable = 1, .vr_config_enable = 1,
.psi1threshold = VR_CFG_AMP(20), .psi1threshold = VR_CFG_AMP(20),

View File

@ -21,15 +21,18 @@
#include <string.h> #include <string.h>
#include <variant/gpio.h> #include <variant/gpio.h>
void variant_memory_init_params( void variant_memory_init_params(FSPM_UPD *mupd, const int spd_index)
MEMORY_INIT_UPD *const memory_params, const int spd_index)
{ {
FSP_M_CONFIG *mem_cfg;
mem_cfg = &mupd->FspmConfig;
/* DQ byte map */ /* DQ byte map */
const u8 dq_map[2][12] = { const u8 dq_map[2][12] = {
{ 0x0F, 0xF0, 0x00, 0xF0, 0x0F, 0xF0, { 0x0F, 0xF0, 0x00, 0xF0, 0x0F, 0xF0,
0x0F, 0x00, 0xFF, 0x00, 0xFF, 0x00 }, 0x0F, 0x00, 0xFF, 0x00, 0xFF, 0x00 },
{ 0x33, 0xCC, 0x00, 0xCC, 0x33, 0xCC, { 0x33, 0xCC, 0x00, 0xCC, 0x33, 0xCC,
0x33, 0x00, 0xFF, 0x00, 0xFF, 0x00 } }; 0x33, 0x00, 0xFF, 0x00, 0xFF, 0x00 } };
/* DQS CPU<>DRAM map */ /* DQS CPU<>DRAM map */
const u8 dqs_map[2][8] = { const u8 dqs_map[2][8] = {
{ 0, 3, 1, 2, 4, 5, 6, 7 }, { 0, 3, 1, 2, 4, 5, 6, 7 },
@ -41,18 +44,12 @@ void variant_memory_init_params(
/* Rcomp target */ /* Rcomp target */
const u16 RcompTarget[5] = { 100, 40, 40, 23, 40 }; const u16 RcompTarget[5] = { 100, 40, 40, 23, 40 };
memcpy(memory_params->DqByteMapCh0, dq_map[0], memcpy(mem_cfg->DqByteMapCh0, dq_map[0], sizeof(mem_cfg->DqByteMapCh0));
sizeof(memory_params->DqByteMapCh0)); memcpy(mem_cfg->DqByteMapCh1, dq_map[1], sizeof(mem_cfg->DqByteMapCh1));
memcpy(memory_params->DqByteMapCh1, dq_map[1], memcpy(mem_cfg->DqsMapCpu2DramCh0, dqs_map[0], sizeof(mem_cfg->DqsMapCpu2DramCh0));
sizeof(memory_params->DqByteMapCh1)); memcpy(mem_cfg->DqsMapCpu2DramCh1, dqs_map[1], sizeof(mem_cfg->DqsMapCpu2DramCh1));
memcpy(memory_params->DqsMapCpu2DramCh0, dqs_map[0], memcpy(mem_cfg->RcompResistor, RcompResistor, sizeof(mem_cfg->RcompResistor));
sizeof(memory_params->DqsMapCpu2DramCh0)); memcpy(mem_cfg->RcompTarget, RcompTarget, sizeof(mem_cfg->RcompTarget));
memcpy(memory_params->DqsMapCpu2DramCh1, dqs_map[1],
sizeof(memory_params->DqsMapCpu2DramCh1));
memcpy(memory_params->RcompResistor, RcompResistor,
sizeof(memory_params->RcompResistor));
memcpy(memory_params->RcompTarget, RcompTarget,
sizeof(memory_params->RcompTarget));
} }
void mainboard_gpio_smi_sleep(void) void mainboard_gpio_smi_sleep(void)

View File

@ -70,20 +70,20 @@ chip soc/intel/skylake
register "pirqg_routing" = "PCH_IRQ11" register "pirqg_routing" = "PCH_IRQ11"
register "pirqh_routing" = "PCH_IRQ11" register "pirqh_routing" = "PCH_IRQ11"
# VR Settings Configuration for 5 Domains # VR Settings Configuration for 4 Domains
#+----------------+-------+-------+-------------+-------------+-------+ #+----------------+-----------+-----------+-------------+----------+
#| Domain/Setting | SA | IA | Ring Sliced | GT Unsliced | GT | #| Domain/Setting | SA | IA | GT Unsliced | GT |
#+----------------+-------+-------+-------------+-------------+-------+ #+----------------+-----------+-----------+-------------+----------+
#| Psi1Threshold | 20A | 20A | 20A | 20A | 20A | #| Psi1Threshold | 20A | 20A | 20A | 20A |
#| Psi2Threshold | 4A | 5A | 5A | 5A | 5A | #| Psi2Threshold | 4A | 5A | 5A | 5A |
#| Psi3Threshold | 1A | 1A | 1A | 1A | 1A | #| Psi3Threshold | 1A | 1A | 1A | 1A |
#| Psi3Enable | 1 | 1 | 1 | 1 | 1 | #| Psi3Enable | 1 | 1 | 1 | 1 |
#| Psi4Enable | 1 | 1 | 1 | 1 | 1 | #| Psi4Enable | 1 | 1 | 1 | 1 |
#| ImonSlope | 0 | 0 | 0 | 0 | 0 | #| ImonSlope | 0 | 0 | 0 | 0 |
#| ImonOffset | 0 | 0 | 0 | 0 | 0 | #| ImonOffset | 0 | 0 | 0 | 0 |
#| IccMax | 7A | 34A | 34A | 35A | 35A | #| IccMax | 7A | 34A | 35A | 35A |
#| VrVoltageLimit | 1.52V | 1.52V | 1.52V | 1.52V | 1.52V | #| VrVoltageLimit | 1.52V | 1.52V | 1.52V | 1.52V |
#+----------------+-------+-------+-------------+-------------+-------+ #+----------------+-----------+-----------+-------------+----------+
register "domain_vr_config[VR_SYSTEM_AGENT]" = "{ register "domain_vr_config[VR_SYSTEM_AGENT]" = "{
.vr_config_enable = 1, .vr_config_enable = 1,
.psi1threshold = VR_CFG_AMP(20), .psi1threshold = VR_CFG_AMP(20),
@ -110,19 +110,6 @@ chip soc/intel/skylake
.voltage_limit = 1520, .voltage_limit = 1520,
}" }"
register "domain_vr_config[VR_RING]" = "{
.vr_config_enable = 1,
.psi1threshold = VR_CFG_AMP(20),
.psi2threshold = VR_CFG_AMP(5),
.psi3threshold = VR_CFG_AMP(1),
.psi3enable = 1,
.psi4enable = 1,
.imon_slope = 0x0,
.imon_offset = 0x0,
.icc_max = VR_CFG_AMP(34),
.voltage_limit = 1520,
}"
register "domain_vr_config[VR_GT_UNSLICED]" = "{ register "domain_vr_config[VR_GT_UNSLICED]" = "{
.vr_config_enable = 1, .vr_config_enable = 1,
.psi1threshold = VR_CFG_AMP(20), .psi1threshold = VR_CFG_AMP(20),

View File

@ -21,9 +21,11 @@
#include <string.h> #include <string.h>
#include <variant/gpio.h> #include <variant/gpio.h>
void variant_memory_init_params( void variant_memory_init_params(FSPM_UPD *mupd, const int spd_index)
MEMORY_INIT_UPD *const memory_params, const int spd_index)
{ {
FSP_M_CONFIG *mem_cfg;
mem_cfg = &mupd->FspmConfig;
/* DQ byte map */ /* DQ byte map */
const u8 dq_map[2][12] = { const u8 dq_map[2][12] = {
{ 0x0F, 0xF0, 0x00, 0xF0, 0x0F, 0xF0, { 0x0F, 0xF0, 0x00, 0xF0, 0x0F, 0xF0,
@ -41,18 +43,12 @@ void variant_memory_init_params(
/* Rcomp target */ /* Rcomp target */
const u16 RcompTarget[5] = { 100, 40, 40, 23, 40 }; const u16 RcompTarget[5] = { 100, 40, 40, 23, 40 };
memcpy(memory_params->DqByteMapCh0, dq_map[0], memcpy(mem_cfg->DqByteMapCh0, dq_map[0], sizeof(mem_cfg->DqByteMapCh0));
sizeof(memory_params->DqByteMapCh0)); memcpy(mem_cfg->DqByteMapCh1, dq_map[1], sizeof(mem_cfg->DqByteMapCh1));
memcpy(memory_params->DqByteMapCh1, dq_map[1], memcpy(mem_cfg->DqsMapCpu2DramCh0, dqs_map[0], sizeof(mem_cfg->DqsMapCpu2DramCh0));
sizeof(memory_params->DqByteMapCh1)); memcpy(mem_cfg->DqsMapCpu2DramCh1, dqs_map[1], sizeof(mem_cfg->DqsMapCpu2DramCh1));
memcpy(memory_params->DqsMapCpu2DramCh0, dqs_map[0], memcpy(mem_cfg->RcompResistor, RcompResistor, sizeof(mem_cfg->RcompResistor));
sizeof(memory_params->DqsMapCpu2DramCh0)); memcpy(mem_cfg->RcompTarget, RcompTarget, sizeof(mem_cfg->RcompTarget));
memcpy(memory_params->DqsMapCpu2DramCh1, dqs_map[1],
sizeof(memory_params->DqsMapCpu2DramCh1));
memcpy(memory_params->RcompResistor, RcompResistor,
sizeof(memory_params->RcompResistor));
memcpy(memory_params->RcompTarget, RcompTarget,
sizeof(memory_params->RcompTarget));
} }
void mainboard_gpio_smi_sleep(void) void mainboard_gpio_smi_sleep(void)

View File

@ -58,20 +58,20 @@ chip soc/intel/skylake
register "pirqg_routing" = "PCH_IRQ11" register "pirqg_routing" = "PCH_IRQ11"
register "pirqh_routing" = "PCH_IRQ11" register "pirqh_routing" = "PCH_IRQ11"
# VR Settings Configuration for 5 Domains # VR Settings Configuration for 4 Domains
#+----------------+-------+-------+-------------+-------------+-------+ #+----------------+-----------+-----------+-------------+----------+
#| Domain/Setting | SA | IA | Ring Sliced | GT Unsliced | GT | #| Domain/Setting | SA | IA | GT Unsliced | GT |
#+----------------+-------+-------+-------------+-------------+-------+ #+----------------+-----------+-----------+-------------+----------+
#| Psi1Threshold | 20A | 20A | 20A | 20A | 20A | #| Psi1Threshold | 20A | 20A | 20A | 20A |
#| Psi2Threshold | 4A | 5A | 5A | 5A | 5A | #| Psi2Threshold | 4A | 5A | 5A | 5A |
#| Psi3Threshold | 1A | 1A | 1A | 1A | 1A | #| Psi3Threshold | 1A | 1A | 1A | 1A |
#| Psi3Enable | 1 | 1 | 1 | 1 | 1 | #| Psi3Enable | 1 | 1 | 1 | 1 |
#| Psi4Enable | 1 | 1 | 1 | 1 | 1 | #| Psi4Enable | 1 | 1 | 1 | 1 |
#| ImonSlope | 0 | 0 | 0 | 0 | 0 | #| ImonSlope | 0 | 0 | 0 | 0 |
#| ImonOffset | 0 | 0 | 0 | 0 | 0 | #| ImonOffset | 0 | 0 | 0 | 0 |
#| IccMax | 7A | 34A | 34A | 35A | 35A | #| IccMax | 7A | 34A | 35A | 35A |
#| VrVoltageLimit | 1.52V | 1.52V | 1.52V | 1.52V | 1.52V | #| VrVoltageLimit | 1.52V | 1.52V | 1.52V | 1.52V |
#+----------------+-------+-------+-------------+-------------+-------+ #+----------------+-----------+-----------+-------------+----------+
register "domain_vr_config[VR_SYSTEM_AGENT]" = "{ register "domain_vr_config[VR_SYSTEM_AGENT]" = "{
.vr_config_enable = 1, .vr_config_enable = 1,
.psi1threshold = VR_CFG_AMP(20), .psi1threshold = VR_CFG_AMP(20),
@ -98,19 +98,6 @@ chip soc/intel/skylake
.voltage_limit = 1520, .voltage_limit = 1520,
}" }"
register "domain_vr_config[VR_RING]" = "{
.vr_config_enable = 1,
.psi1threshold = VR_CFG_AMP(20),
.psi2threshold = VR_CFG_AMP(5),
.psi3threshold = VR_CFG_AMP(1),
.psi3enable = 1,
.psi4enable = 1,
.imon_slope = 0x0,
.imon_offset = 0x0,
.icc_max = VR_CFG_AMP(34),
.voltage_limit = 1520,
}"
register "domain_vr_config[VR_GT_UNSLICED]" = "{ register "domain_vr_config[VR_GT_UNSLICED]" = "{
.vr_config_enable = 1, .vr_config_enable = 1,
.psi1threshold = VR_CFG_AMP(20), .psi1threshold = VR_CFG_AMP(20),

View File

@ -28,9 +28,11 @@
#define MEM_SINGLE_CHANB 0xb #define MEM_SINGLE_CHANB 0xb
#define MEM_SINGLE_CHANC 0xc #define MEM_SINGLE_CHANC 0xc
void variant_memory_init_params( void variant_memory_init_params(FSPM_UPD *mupd, const int spd_index)
MEMORY_INIT_UPD *const params, const int spd_index)
{ {
FSP_M_CONFIG *mem_cfg;
mem_cfg = &mupd->FspmConfig;
/* DQ byte map */ /* DQ byte map */
const u8 dq_map[2][12] = { const u8 dq_map[2][12] = {
{ 0x0F, 0xF0, 0x00, 0xF0, 0x0F, 0xF0, { 0x0F, 0xF0, 0x00, 0xF0, 0x0F, 0xF0,
@ -58,18 +60,12 @@ void variant_memory_init_params(
if (spd_index == K4E6E304EB_MEM_ID) if (spd_index == K4E6E304EB_MEM_ID)
targeted_rcomp = StrengthendRcompTarget; targeted_rcomp = StrengthendRcompTarget;
memcpy(params->DqByteMapCh0, dq_map[0], memcpy(mem_cfg->DqByteMapCh0, dq_map[0], sizeof(mem_cfg->DqByteMapCh0));
sizeof(params->DqByteMapCh0)); memcpy(mem_cfg->DqByteMapCh1, dq_map[1], sizeof(mem_cfg->DqByteMapCh1));
memcpy(params->DqByteMapCh1, dq_map[1], memcpy(mem_cfg->DqsMapCpu2DramCh0, dqs_map[0], sizeof(mem_cfg->DqsMapCpu2DramCh0));
sizeof(params->DqByteMapCh1)); memcpy(mem_cfg->DqsMapCpu2DramCh1, dqs_map[1], sizeof(mem_cfg->DqsMapCpu2DramCh1));
memcpy(params->DqsMapCpu2DramCh0, dqs_map[0], memcpy(mem_cfg->RcompResistor, RcompResistor, sizeof(mem_cfg->RcompResistor));
sizeof(params->DqsMapCpu2DramCh0)); memcpy(mem_cfg->RcompTarget, RcompTarget, sizeof(mem_cfg->RcompTarget));
memcpy(params->DqsMapCpu2DramCh1, dqs_map[1],
sizeof(params->DqsMapCpu2DramCh1));
memcpy(params->RcompResistor, RcompResistor,
sizeof(params->RcompResistor));
memcpy(params->RcompTarget, targeted_rcomp,
sizeof(params->RcompTarget));
} }
int is_dual_channel(const int spd_index) int is_dual_channel(const int spd_index)

View File

@ -60,20 +60,20 @@ chip soc/intel/skylake
register "pirqg_routing" = "PCH_IRQ11" register "pirqg_routing" = "PCH_IRQ11"
register "pirqh_routing" = "PCH_IRQ11" register "pirqh_routing" = "PCH_IRQ11"
# VR Settings Configuration for 5 Domains # VR Settings Configuration for 4 Domains
#+----------------+-------+-------+-------------+-------------+-------+ #+----------------+-----------+-----------+-------------+----------+
#| Domain/Setting | SA | IA | Ring Sliced | GT Unsliced | GT | #| Domain/Setting | SA | IA | GT Unsliced | GT |
#+----------------+-------+-------+-------------+-------------+-------+ #+----------------+-----------+-----------+-------------+----------+
#| Psi1Threshold | 20A | 20A | 20A | 20A | 20A | #| Psi1Threshold | 20A | 20A | 20A | 20A |
#| Psi2Threshold | 4A | 5A | 5A | 5A | 5A | #| Psi2Threshold | 4A | 5A | 5A | 5A |
#| Psi3Threshold | 1A | 1A | 1A | 1A | 1A | #| Psi3Threshold | 1A | 1A | 1A | 1A |
#| Psi3Enable | 1 | 1 | 1 | 1 | 1 | #| Psi3Enable | 1 | 1 | 1 | 1 |
#| Psi4Enable | 1 | 1 | 1 | 1 | 1 | #| Psi4Enable | 1 | 1 | 1 | 1 |
#| ImonSlope | 0 | 0 | 0 | 0 | 0 | #| ImonSlope | 0 | 0 | 0 | 0 |
#| ImonOffset | 0 | 0 | 0 | 0 | 0 | #| ImonOffset | 0 | 0 | 0 | 0 |
#| IccMax | 7A | 34A | 34A | 35A | 35A | #| IccMax | 7A | 34A | 35A | 35A |
#| VrVoltageLimit | 1.52V | 1.52V | 1.52V | 1.52V | 1.52V | #| VrVoltageLimit | 1.52V | 1.52V | 1.52V | 1.52V |
#+----------------+-------+-------+-------------+-------------+-------+ #+----------------+-----------+-----------+-------------+----------+
register "domain_vr_config[VR_SYSTEM_AGENT]" = "{ register "domain_vr_config[VR_SYSTEM_AGENT]" = "{
.vr_config_enable = 1, .vr_config_enable = 1,
.psi1threshold = VR_CFG_AMP(20), .psi1threshold = VR_CFG_AMP(20),
@ -100,19 +100,6 @@ chip soc/intel/skylake
.voltage_limit = 1520, .voltage_limit = 1520,
}" }"
register "domain_vr_config[VR_RING]" = "{
.vr_config_enable = 1,
.psi1threshold = VR_CFG_AMP(20),
.psi2threshold = VR_CFG_AMP(5),
.psi3threshold = VR_CFG_AMP(1),
.psi3enable = 1,
.psi4enable = 1,
.imon_slope = 0x0,
.imon_offset = 0x0,
.icc_max = VR_CFG_AMP(34),
.voltage_limit = 1520,
}"
register "domain_vr_config[VR_GT_UNSLICED]" = "{ register "domain_vr_config[VR_GT_UNSLICED]" = "{
.vr_config_enable = 1, .vr_config_enable = 1,
.psi1threshold = VR_CFG_AMP(20), .psi1threshold = VR_CFG_AMP(20),

View File

@ -21,9 +21,11 @@
#define K4E6E304EE_MEM_ID 0x3 #define K4E6E304EE_MEM_ID 0x3
void variant_memory_init_params( void variant_memory_init_params(FSPM_UPD *mupd, const int spd_index)
MEMORY_INIT_UPD *const memory_params, const int spd_index)
{ {
FSP_M_CONFIG *mem_cfg;
mem_cfg = &mupd->FspmConfig;
/* DQ byte map */ /* DQ byte map */
const u8 dq_map[2][12] = { const u8 dq_map[2][12] = {
{ 0x0F, 0xF0, 0x00, 0xF0, 0x0F, 0xF0, { 0x0F, 0xF0, 0x00, 0xF0, 0x0F, 0xF0,
@ -51,16 +53,10 @@ void variant_memory_init_params(
if (spd_index == K4E6E304EE_MEM_ID) if (spd_index == K4E6E304EE_MEM_ID)
targeted_rcomp = StrengthendRcompTarget; targeted_rcomp = StrengthendRcompTarget;
memcpy(memory_params->DqByteMapCh0, dq_map[0], memcpy(mem_cfg->DqByteMapCh0, dq_map[0], sizeof(mem_cfg->DqByteMapCh0));
sizeof(memory_params->DqByteMapCh0)); memcpy(mem_cfg->DqByteMapCh1, dq_map[1], sizeof(mem_cfg->DqByteMapCh1));
memcpy(memory_params->DqByteMapCh1, dq_map[1], memcpy(mem_cfg->DqsMapCpu2DramCh0, dqs_map[0], sizeof(mem_cfg->DqsMapCpu2DramCh0));
sizeof(memory_params->DqByteMapCh1)); memcpy(mem_cfg->DqsMapCpu2DramCh1, dqs_map[1], sizeof(mem_cfg->DqsMapCpu2DramCh1));
memcpy(memory_params->DqsMapCpu2DramCh0, dqs_map[0], memcpy(mem_cfg->RcompResistor, RcompResistor, sizeof(mem_cfg->RcompResistor));
sizeof(memory_params->DqsMapCpu2DramCh0)); memcpy(mem_cfg->RcompTarget, RcompTarget, sizeof(mem_cfg->RcompTarget));
memcpy(memory_params->DqsMapCpu2DramCh1, dqs_map[1],
sizeof(memory_params->DqsMapCpu2DramCh1));
memcpy(memory_params->RcompResistor, RcompResistor,
sizeof(memory_params->RcompResistor));
memcpy(memory_params->RcompTarget, targeted_rcomp,
sizeof(memory_params->RcompTarget));
} }