Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/83629?usp=email )
Change subject: ec/starlabs/merlin: Remove ITE mirror functionality ......................................................................
ec/starlabs/merlin: Remove ITE mirror functionality
Remove the ITE mirror functionality; all devices will mirror automatically when they exit G3, and this is good enough.
Change-Id: I9b82e1b1386b4607dfe7da9b25ba432ec0303cf8 Signed-off-by: Sean Rhodes sean@starlabs.systems Reviewed-on: https://review.coreboot.org/c/coreboot/+/83629 Reviewed-by: Matt DeVillier matt.devillier@gmail.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/ec/starlabs/merlin/Kconfig M src/ec/starlabs/merlin/ec.h M src/ec/starlabs/merlin/ite.c M src/mainboard/starlabs/lite/cmos.default M src/mainboard/starlabs/lite/cmos.layout M src/mainboard/starlabs/lite/variants/glkr/cmos.default M src/mainboard/starlabs/lite/variants/glkr/cmos.layout M src/mainboard/starlabs/starbook/cmos.default M src/mainboard/starlabs/starbook/cmos.layout M src/mainboard/starlabs/starbook/variants/tgl/cmos.default M src/mainboard/starlabs/starbook/variants/tgl/cmos.layout 11 files changed, 0 insertions(+), 61 deletions(-)
Approvals: Matt DeVillier: Looks good to me, approved build bot (Jenkins): Verified
diff --git a/src/ec/starlabs/merlin/Kconfig b/src/ec/starlabs/merlin/Kconfig index 5a35b51..9f05991 100644 --- a/src/ec/starlabs/merlin/Kconfig +++ b/src/ec/starlabs/merlin/Kconfig @@ -64,20 +64,6 @@ help Select if the mainboard supports limiting the maximum charge of the battery.
-config EC_STARLABS_MIRROR_SUPPORT - bool "Enable mirror flag support" - default n - depends on EC_STARLABS_ITE - help - Select if the EC should mirror the EC firmware contained in the coreboot ROM. - -config EC_STARLABS_MIRROR_VERSION - hex "Version of the EC firmware that should be installed." - depends on EC_STARLABS_MIRROR_SUPPORT - help - The version of the EC that should be installed. The mirror flag will be activated - if this Kconfig option is set and it does not match the current EC version. - config EC_STARLABS_MERLIN bool "Use open-source Merlin EC Firmware" default n diff --git a/src/ec/starlabs/merlin/ec.h b/src/ec/starlabs/merlin/ec.h index 0528816..ca1d081 100644 --- a/src/ec/starlabs/merlin/ec.h +++ b/src/ec/starlabs/merlin/ec.h @@ -98,11 +98,6 @@ #define KBL_DISABLED 0x00 #define KBL_ENABLED 0xdd
-/* Mirror Flag */ -#define MIRROR_DISABLED 0x00 -#define MIRROR_ENABLED 0xaa - uint16_t ec_get_version(void); -void ec_mirror_flag(void);
#endif diff --git a/src/ec/starlabs/merlin/ite.c b/src/ec/starlabs/merlin/ite.c index c4e0d1e..031447a 100644 --- a/src/ec/starlabs/merlin/ite.c +++ b/src/ec/starlabs/merlin/ite.c @@ -25,34 +25,6 @@ return lut[index]; }
-void ec_mirror_flag(void) -{ - /* - * For the mirror flag to work, the status of the EC pin must be known - * at all times, which means external power. This can be either a DC - * charger, or PD with CCG6. PD with an ANX7447 requires configuration - * from the EC, so the update will interrupt this. - * - * This means we can unconditionally apply the mirror flag to devices - * that have CCG6, present on devices with TBT, but have a manual - * flag for devices without it. - */ - uint16_t ec_version = ec_get_version(); - - /* Full mirror support was added in EC 1.18 (0x0112) */ - if (ec_version < 0x0112) - return; - - if (CONFIG(EC_STARLABS_MIRROR_SUPPORT) && - (CONFIG(DRIVERS_INTEL_USB4_RETIMER) || get_uint_option("mirror_flag", 0)) && - (ec_version != CONFIG_EC_STARLABS_MIRROR_VERSION)) { - printk(BIOS_ERR, "ITE: EC version 0x%x doesn't match coreboot version 0x%x.\n", - ec_version, CONFIG_EC_STARLABS_MIRROR_VERSION); - - ec_write(ECRAM_MIRROR_FLAG, MIRROR_ENABLED); - } -} - static uint16_t ec_get_chip_id(unsigned int port) { return (pnp_read_index(port, ITE_CHIPID1) << 8) | @@ -84,8 +56,6 @@ return; }
- ec_mirror_flag(); - /* * Restore settings from CMOS into EC RAM: * diff --git a/src/mainboard/starlabs/lite/cmos.default b/src/mainboard/starlabs/lite/cmos.default index 76ea289..7bf045b 100644 --- a/src/mainboard/starlabs/lite/cmos.default +++ b/src/mainboard/starlabs/lite/cmos.default @@ -14,7 +14,6 @@ # EC kbl_timeout=30 seconds fn_ctrl_swap=Disable -mirror_flag=Disable # Functions fn_lock_state=0x1 trackpad_state=0x1 diff --git a/src/mainboard/starlabs/lite/cmos.layout b/src/mainboard/starlabs/lite/cmos.layout index d594c76..ca77291 100644 --- a/src/mainboard/starlabs/lite/cmos.layout +++ b/src/mainboard/starlabs/lite/cmos.layout @@ -28,8 +28,6 @@ # coreboot config options: EC 600 3 e 4 kbl_timeout 608 1 e 1 fn_ctrl_swap -616 1 e 1 mirror_flag -624 4 h 0 mirror_flag_counter
# coreboot config options: check sums 984 16 h 0 check_sum diff --git a/src/mainboard/starlabs/lite/variants/glkr/cmos.default b/src/mainboard/starlabs/lite/variants/glkr/cmos.default index 97cbac9..6bf32d0 100644 --- a/src/mainboard/starlabs/lite/variants/glkr/cmos.default +++ b/src/mainboard/starlabs/lite/variants/glkr/cmos.default @@ -15,7 +15,6 @@ kbl_timeout=30 seconds fn_ctrl_swap=Disable fast_charge=Normal -mirror_flag=Disable # Functions fn_lock_state=0x1 trackpad_state=0x1 diff --git a/src/mainboard/starlabs/lite/variants/glkr/cmos.layout b/src/mainboard/starlabs/lite/variants/glkr/cmos.layout index 8fa5725..edca818 100644 --- a/src/mainboard/starlabs/lite/variants/glkr/cmos.layout +++ b/src/mainboard/starlabs/lite/variants/glkr/cmos.layout @@ -29,8 +29,6 @@ 600 3 e 4 kbl_timeout 608 1 e 1 fn_ctrl_swap 616 1 e 11 fast_charge -624 1 e 1 mirror_flag -632 4 h 0 mirror_flag_counter
# coreboot config options: check sums 984 16 h 0 check_sum diff --git a/src/mainboard/starlabs/starbook/cmos.default b/src/mainboard/starlabs/starbook/cmos.default index 879ee4f..6f44bdb 100644 --- a/src/mainboard/starlabs/starbook/cmos.default +++ b/src/mainboard/starlabs/starbook/cmos.default @@ -18,7 +18,6 @@ # EC kbl_timeout=30 seconds fn_ctrl_swap=Disable -mirror_flag=Disable # Functions fn_lock_state=0x1 trackpad_state=0x1 diff --git a/src/mainboard/starlabs/starbook/cmos.layout b/src/mainboard/starlabs/starbook/cmos.layout index f534630..505f49f 100644 --- a/src/mainboard/starlabs/starbook/cmos.layout +++ b/src/mainboard/starlabs/starbook/cmos.layout @@ -38,8 +38,6 @@ 608 1 e 1 fn_ctrl_swap 616 2 e 8 max_charge 624 2 e 9 fan_mode -632 1 e 1 mirror_flag -640 4 h 0 mirror_flag_counter
# coreboot config options: check sums 984 16 h 0 check_sum diff --git a/src/mainboard/starlabs/starbook/variants/tgl/cmos.default b/src/mainboard/starlabs/starbook/variants/tgl/cmos.default index 6192e41..fada05c 100644 --- a/src/mainboard/starlabs/starbook/variants/tgl/cmos.default +++ b/src/mainboard/starlabs/starbook/variants/tgl/cmos.default @@ -18,7 +18,6 @@ # EC kbl_timeout=30 seconds fn_ctrl_swap=Disable -mirror_flag=Disable # Functions fn_lock_state=0x1 trackpad_state=0x1 diff --git a/src/mainboard/starlabs/starbook/variants/tgl/cmos.layout b/src/mainboard/starlabs/starbook/variants/tgl/cmos.layout index aed755c..51e6c15 100644 --- a/src/mainboard/starlabs/starbook/variants/tgl/cmos.layout +++ b/src/mainboard/starlabs/starbook/variants/tgl/cmos.layout @@ -38,8 +38,6 @@ 608 1 e 1 fn_ctrl_swap 616 2 e 8 max_charge 624 2 e 9 fan_mode -632 1 e 1 mirror_flag -640 4 h 0 mirror_flag_counter
# coreboot config options: check sums 984 16 h 0 check_sum