[coreboot-gerrit] Change in coreboot[master]: soc/intel/tigerlake: Update Kconfig for NEM Enhanced Mode

[Furquan Shaikh (Code Review)]

Furquan Shaikh has submitted this change. ( https://review.coreboot.org/c/coreboot/+/47259 )

Change subject: soc/intel/tigerlake: Update Kconfig for NEM Enhanced Mode
......................................................................

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 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/47259
Tested-by: build bot (Jenkins) 
Reviewed-by: Furquan Shaikh 
---
M src/mainboard/google/volteer/Kconfig.name
M src/soc/intel/tigerlake/Kconfig
2 files changed, 8 insertions(+), 9 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Furquan Shaikh: Looks good to me, approved
  Shreesh Chhabbi: Looks good to me, but someone else must approve

diff --git a/src/mainboard/google/volteer/Kconfig.name b/src/mainboard/google/volteer/Kconfig.name
index 7aaaea7..b651430 100644
--- a/src/mainboard/google/volteer/Kconfig.name
+++ b/src/mainboard/google/volteer/Kconfig.name
@@ -4,58 +4,60 @@
    bool "-> Delbin"
    select BOARD_GOOGLE_BASEBOARD_VOLTEER
    select SOC_INTEL_CSE_LITE_SKU
-	select USE_CAR_NEM_ENHANCED_V2
    select DRIVERS_GENESYSLOGIC_GL9755

config BOARD_GOOGLE_ELDRID
    bool "-> Eldrid"
    select BOARD_GOOGLE_BASEBOARD_VOLTEER
    select SOC_INTEL_CSE_LITE_SKU
-	select USE_CAR_NEM_ENHANCED_V2

config BOARD_GOOGLE_HALVOR
    bool "-> Halvor"
    select BOARD_GOOGLE_BASEBOARD_VOLTEER
    select SOC_INTEL_CSE_LITE_SKU
+	select INTEL_CAR_NEM

config BOARD_GOOGLE_LINDAR
    bool "-> Lindar"
    select BOARD_GOOGLE_BASEBOARD_VOLTEER
    select SOC_INTEL_CSE_LITE_SKU
+	select INTEL_CAR_NEM

config BOARD_GOOGLE_MALEFOR
    bool "-> Malefor"
    select BOARD_GOOGLE_BASEBOARD_VOLTEER
    select SOC_INTEL_CSE_LITE_SKU
+	select INTEL_CAR_NEM

config BOARD_GOOGLE_TERRADOR
    bool "-> Terrador"
    select BOARD_GOOGLE_BASEBOARD_VOLTEER
    select SOC_INTEL_CSE_LITE_SKU
-	select USE_CAR_NEM_ENHANCED_V2

config BOARD_GOOGLE_TODOR
    bool "-> Todor"
    select BOARD_GOOGLE_BASEBOARD_VOLTEER
    select SOC_INTEL_CSE_LITE_SKU
+	select INTEL_CAR_NEM

config BOARD_GOOGLE_TRONDO
    bool "-> Trondo"
    select BOARD_GOOGLE_BASEBOARD_VOLTEER
    select SOC_INTEL_CSE_LITE_SKU
+	select INTEL_CAR_NEM

config BOARD_GOOGLE_VOLTEER
    bool "-> Volteer"
    select BOARD_GOOGLE_BASEBOARD_VOLTEER
    select VARIANT_HAS_MIPI_CAMERA
    select SOC_INTEL_CSE_LITE_SKU
+	select INTEL_CAR_NEM

config BOARD_GOOGLE_VOLTEER2
    bool "-> Volteer2"
    select BOARD_GOOGLE_BASEBOARD_VOLTEER
    select VARIANT_HAS_MIPI_CAMERA
    select SOC_INTEL_CSE_LITE_SKU
-	select USE_CAR_NEM_ENHANCED_V2
    select DRIVERS_GENESYSLOGIC_GL9755

# Reworked Volteer2 prototype, Haven chip replaced with Dauntless demo board
@@ -64,27 +66,24 @@
    select BOARD_GOOGLE_BASEBOARD_VOLTEER
    select VARIANT_HAS_MIPI_CAMERA
    select SOC_INTEL_CSE_LITE_SKU
-	select USE_CAR_NEM_ENHANCED_V2
    select DRIVERS_GENESYSLOGIC_GL9755

config BOARD_GOOGLE_VOXEL
    bool "-> Voxel"
    select BOARD_GOOGLE_BASEBOARD_VOLTEER
    select SOC_INTEL_CSE_LITE_SKU
-	select USE_CAR_NEM_ENHANCED_V2

config BOARD_GOOGLE_BOLDAR
    bool "-> Boldar"
    select BOARD_GOOGLE_BASEBOARD_VOLTEER
+	select INTEL_CAR_NEM

config BOARD_GOOGLE_ELEMI
    bool "-> Elemi"
    select BOARD_GOOGLE_BASEBOARD_VOLTEER
    select SOC_INTEL_CSE_LITE_SKU
-	select USE_CAR_NEM_ENHANCED_V2

config BOARD_GOOGLE_VOEMA
    bool "-> Voema"
    select BOARD_GOOGLE_BASEBOARD_VOLTEER
    select SOC_INTEL_CSE_LITE_SKU
-	select USE_CAR_NEM_ENHANCED_V2
diff --git a/src/soc/intel/tigerlake/Kconfig b/src/soc/intel/tigerlake/Kconfig
index 79a4c64..b276fb9 100644
--- a/src/soc/intel/tigerlake/Kconfig
+++ b/src/soc/intel/tigerlake/Kconfig
@@ -23,7 +23,7 @@
    select INTEL_DESCRIPTOR_MODE_CAPABLE
    select HAVE_SMI_HANDLER
    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_ADD_VBT if RUN_FSP_GOP
    select IOAPIC