From f8f4eda8b8c89e42cac12e73aede20a42a332790 Mon Sep 17 00:00:00 2001 From: Bernardo Perez Priego Date: Mon, 8 May 2023 17:53:13 -0700 Subject: [PATCH] mb/google/rex: Enable ISH support Enable ISH based on FW_CONFIG obtained from EC CBI. This is useful in case device is a tablet and motion sensors are handled by ISH instead of EC. BUG=b:280329972,b:283023296 TEST= Set bit 21 of FW_CONFIG with CBI Boot rex board Check that ISH is enabled and loaded Signed-off-by: Bernardo Perez Priego Change-Id: Ibe0e1b8ce2c9b08ac6b1e6fef9bd19afc9b4f59f Reviewed-on: https://review.coreboot.org/c/coreboot/+/75039 Reviewed-by: Subrata Banik Reviewed-by: Kapil Porwal Tested-by: build bot (Jenkins) --- src/mainboard/google/rex/Kconfig | 4 ++-- src/mainboard/google/rex/Kconfig.name | 1 + .../google/rex/variants/rex0/overridetree.cb | 11 +++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/mainboard/google/rex/Kconfig b/src/mainboard/google/rex/Kconfig index cf038b7c23..4021fced68 100644 --- a/src/mainboard/google/rex/Kconfig +++ b/src/mainboard/google/rex/Kconfig @@ -68,8 +68,8 @@ config DEVICETREE default "variants/baseboard/\$(CONFIG_BASEBOARD_DIR)/devicetree.cb" config FMDFILE - default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos_ec_ish-debug-fsp.fmd" if CHROMEOS && DRIVERS_INTEL_ISH && BUILDING_WITH_DEBUG_FSP - default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos_ec_ish.fmd" if CHROMEOS && DRIVERS_INTEL_ISH + default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos_ec_ish-debug-fsp.fmd" if CHROMEOS && BOARD_GOOGLE_REX_EC_ISH && BUILDING_WITH_DEBUG_FSP + default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos_ec_ish.fmd" if CHROMEOS && BOARD_GOOGLE_REX_EC_ISH default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos-debug-fsp.fmd" if CHROMEOS && BUILDING_WITH_DEBUG_FSP default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos.fmd" if CHROMEOS diff --git a/src/mainboard/google/rex/Kconfig.name b/src/mainboard/google/rex/Kconfig.name index a4fa63abe3..13a0447254 100644 --- a/src/mainboard/google/rex/Kconfig.name +++ b/src/mainboard/google/rex/Kconfig.name @@ -5,6 +5,7 @@ config BOARD_GOOGLE_REX0 select BOARD_GOOGLE_BASEBOARD_REX select DRIVERS_GENERIC_MAX98357A select DRIVERS_GENESYSLOGIC_GL9755 + select DRIVERS_INTEL_ISH select DRIVERS_INTEL_SOUNDWIRE select DRIVERS_SOUNDWIRE_CS42L42 select DRIVERS_SOUNDWIRE_MAX98363 diff --git a/src/mainboard/google/rex/variants/rex0/overridetree.cb b/src/mainboard/google/rex/variants/rex0/overridetree.cb index ab9596e1b7..39a0a4d2a5 100644 --- a/src/mainboard/google/rex/variants/rex0/overridetree.cb +++ b/src/mainboard/google/rex/variants/rex0/overridetree.cb @@ -50,6 +50,10 @@ fw_config option VPU_DIS 0 option VPU_EN 1 end + field ISH 21 + option ISH_DISABLE 0 + option ISH_ENABLE 1 + end end chip soc/intel/meteorlake @@ -277,6 +281,13 @@ chip soc/intel/meteorlake .flags = PCIE_RP_LTR | PCIE_RP_AER, }" end #PCIE9 SSD card + device ref ish on + probe ISH ISH_ENABLE + chip drivers/intel/ish + register "firmware_name" = ""rex_ish.bin"" + device generic 0 on end + end + end device ref tbt_pcie_rp0 on end device ref tbt_pcie_rp2 on end device ref vpu on