soc/intel/tigerlake: Update Kconfig for NEM Enhanced Mode

This change switches the selection of CAR mode so that
INTEL_CAR_NEM_ENHANCED_V2 is the default unless mainboard
selects INTEL_CAR_NEM. INTEL_CAR_NEM is selected only by
mainboards using older silicon (ES1 or ES2) that did not
support NEM enhanced mode.

This enables NEM Enhanced Mode for TGL-U/Y RVPs.

Bug=b:171601324
BRANCH=volteer
Test=Build coreboot for volteer. Boot on SKU that has 4MB L3 cache.

Change-Id: Ib6e041261cb8ca9c6e602935da4962aac0d9ece5
Signed-off-by: Shreesh Chhabbi <shreesh.chhabbi@intel.corp-partner.google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/47259
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
This commit is contained in:
Shreesh Chhabbi 2020-11-05 12:22:13 -08:00 committed by Furquan Shaikh
parent ed820a0e21
commit 0c32182dba
2 changed files with 8 additions and 9 deletions

View File

@ -4,58 +4,60 @@ config BOARD_GOOGLE_DELBIN
bool "-> Delbin" bool "-> Delbin"
select BOARD_GOOGLE_BASEBOARD_VOLTEER select BOARD_GOOGLE_BASEBOARD_VOLTEER
select SOC_INTEL_CSE_LITE_SKU select SOC_INTEL_CSE_LITE_SKU
select USE_CAR_NEM_ENHANCED_V2
select DRIVERS_GENESYSLOGIC_GL9755 select DRIVERS_GENESYSLOGIC_GL9755
config BOARD_GOOGLE_ELDRID config BOARD_GOOGLE_ELDRID
bool "-> Eldrid" bool "-> Eldrid"
select BOARD_GOOGLE_BASEBOARD_VOLTEER select BOARD_GOOGLE_BASEBOARD_VOLTEER
select SOC_INTEL_CSE_LITE_SKU select SOC_INTEL_CSE_LITE_SKU
select USE_CAR_NEM_ENHANCED_V2
config BOARD_GOOGLE_HALVOR config BOARD_GOOGLE_HALVOR
bool "-> Halvor" bool "-> Halvor"
select BOARD_GOOGLE_BASEBOARD_VOLTEER select BOARD_GOOGLE_BASEBOARD_VOLTEER
select SOC_INTEL_CSE_LITE_SKU select SOC_INTEL_CSE_LITE_SKU
select INTEL_CAR_NEM
config BOARD_GOOGLE_LINDAR config BOARD_GOOGLE_LINDAR
bool "-> Lindar" bool "-> Lindar"
select BOARD_GOOGLE_BASEBOARD_VOLTEER select BOARD_GOOGLE_BASEBOARD_VOLTEER
select SOC_INTEL_CSE_LITE_SKU select SOC_INTEL_CSE_LITE_SKU
select INTEL_CAR_NEM
config BOARD_GOOGLE_MALEFOR config BOARD_GOOGLE_MALEFOR
bool "-> Malefor" bool "-> Malefor"
select BOARD_GOOGLE_BASEBOARD_VOLTEER select BOARD_GOOGLE_BASEBOARD_VOLTEER
select SOC_INTEL_CSE_LITE_SKU select SOC_INTEL_CSE_LITE_SKU
select INTEL_CAR_NEM
config BOARD_GOOGLE_TERRADOR config BOARD_GOOGLE_TERRADOR
bool "-> Terrador" bool "-> Terrador"
select BOARD_GOOGLE_BASEBOARD_VOLTEER select BOARD_GOOGLE_BASEBOARD_VOLTEER
select SOC_INTEL_CSE_LITE_SKU select SOC_INTEL_CSE_LITE_SKU
select USE_CAR_NEM_ENHANCED_V2
config BOARD_GOOGLE_TODOR config BOARD_GOOGLE_TODOR
bool "-> Todor" bool "-> Todor"
select BOARD_GOOGLE_BASEBOARD_VOLTEER select BOARD_GOOGLE_BASEBOARD_VOLTEER
select SOC_INTEL_CSE_LITE_SKU select SOC_INTEL_CSE_LITE_SKU
select INTEL_CAR_NEM
config BOARD_GOOGLE_TRONDO config BOARD_GOOGLE_TRONDO
bool "-> Trondo" bool "-> Trondo"
select BOARD_GOOGLE_BASEBOARD_VOLTEER select BOARD_GOOGLE_BASEBOARD_VOLTEER
select SOC_INTEL_CSE_LITE_SKU select SOC_INTEL_CSE_LITE_SKU
select INTEL_CAR_NEM
config BOARD_GOOGLE_VOLTEER config BOARD_GOOGLE_VOLTEER
bool "-> Volteer" bool "-> Volteer"
select BOARD_GOOGLE_BASEBOARD_VOLTEER select BOARD_GOOGLE_BASEBOARD_VOLTEER
select VARIANT_HAS_MIPI_CAMERA select VARIANT_HAS_MIPI_CAMERA
select SOC_INTEL_CSE_LITE_SKU select SOC_INTEL_CSE_LITE_SKU
select INTEL_CAR_NEM
config BOARD_GOOGLE_VOLTEER2 config BOARD_GOOGLE_VOLTEER2
bool "-> Volteer2" bool "-> Volteer2"
select BOARD_GOOGLE_BASEBOARD_VOLTEER select BOARD_GOOGLE_BASEBOARD_VOLTEER
select VARIANT_HAS_MIPI_CAMERA select VARIANT_HAS_MIPI_CAMERA
select SOC_INTEL_CSE_LITE_SKU select SOC_INTEL_CSE_LITE_SKU
select USE_CAR_NEM_ENHANCED_V2
select DRIVERS_GENESYSLOGIC_GL9755 select DRIVERS_GENESYSLOGIC_GL9755
# Reworked Volteer2 prototype, Haven chip replaced with Dauntless demo board # Reworked Volteer2 prototype, Haven chip replaced with Dauntless demo board
@ -64,27 +66,24 @@ config BOARD_GOOGLE_VOLTEER2_TI50
select BOARD_GOOGLE_BASEBOARD_VOLTEER select BOARD_GOOGLE_BASEBOARD_VOLTEER
select VARIANT_HAS_MIPI_CAMERA select VARIANT_HAS_MIPI_CAMERA
select SOC_INTEL_CSE_LITE_SKU select SOC_INTEL_CSE_LITE_SKU
select USE_CAR_NEM_ENHANCED_V2
select DRIVERS_GENESYSLOGIC_GL9755 select DRIVERS_GENESYSLOGIC_GL9755
config BOARD_GOOGLE_VOXEL config BOARD_GOOGLE_VOXEL
bool "-> Voxel" bool "-> Voxel"
select BOARD_GOOGLE_BASEBOARD_VOLTEER select BOARD_GOOGLE_BASEBOARD_VOLTEER
select SOC_INTEL_CSE_LITE_SKU select SOC_INTEL_CSE_LITE_SKU
select USE_CAR_NEM_ENHANCED_V2
config BOARD_GOOGLE_BOLDAR config BOARD_GOOGLE_BOLDAR
bool "-> Boldar" bool "-> Boldar"
select BOARD_GOOGLE_BASEBOARD_VOLTEER select BOARD_GOOGLE_BASEBOARD_VOLTEER
select INTEL_CAR_NEM
config BOARD_GOOGLE_ELEMI config BOARD_GOOGLE_ELEMI
bool "-> Elemi" bool "-> Elemi"
select BOARD_GOOGLE_BASEBOARD_VOLTEER select BOARD_GOOGLE_BASEBOARD_VOLTEER
select SOC_INTEL_CSE_LITE_SKU select SOC_INTEL_CSE_LITE_SKU
select USE_CAR_NEM_ENHANCED_V2
config BOARD_GOOGLE_VOEMA config BOARD_GOOGLE_VOEMA
bool "-> Voema" bool "-> Voema"
select BOARD_GOOGLE_BASEBOARD_VOLTEER select BOARD_GOOGLE_BASEBOARD_VOLTEER
select SOC_INTEL_CSE_LITE_SKU select SOC_INTEL_CSE_LITE_SKU
select USE_CAR_NEM_ENHANCED_V2

View File

@ -23,7 +23,7 @@ config CPU_SPECIFIC_OPTIONS
select INTEL_DESCRIPTOR_MODE_CAPABLE select INTEL_DESCRIPTOR_MODE_CAPABLE
select HAVE_SMI_HANDLER select HAVE_SMI_HANDLER
select IDT_IN_EVERY_STAGE select IDT_IN_EVERY_STAGE
select INTEL_CAR_NEM select USE_CAR_NEM_ENHANCED_V2 if !INTEL_CAR_NEM
select INTEL_GMA_ACPI select INTEL_GMA_ACPI
select INTEL_GMA_ADD_VBT if RUN_FSP_GOP select INTEL_GMA_ADD_VBT if RUN_FSP_GOP
select IOAPIC select IOAPIC