sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ec/starlabs/merlin: Remove ITE mirror functionality

Browse Source 
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>
This commit is contained in:
Sean Rhodes 2024-07-24 08:36:41 +01:00 committed by Felix Held
parent 32d21ff3eb
commit 50b7976bb2
11 changed files with 0 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ec/starlabs/merlin/Kconfig
View File

@ -64,20 +64,6 @@ config EC_STARLABS_MAX_CHARGE
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

5
src/ec/starlabs/merlin/ec.h
View File

@ -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

30
src/ec/starlabs/merlin/ite.c
View File

@ -25,34 +25,6 @@ static uint8_t get_ec_value_from_option(const char *name,
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 @@ static void merlin_init(struct device *dev)
return;
}
ec_mirror_flag();
/*
* Restore settings from CMOS into EC RAM:
*

1
src/mainboard/starlabs/lite/cmos.default
View File

@ -14,7 +14,6 @@ legacy_8254_timer=Disable
# EC
kbl_timeout=30 seconds
fn_ctrl_swap=Disable
mirror_flag=Disable
# Functions
fn_lock_state=0x1
trackpad_state=0x1

2
src/mainboard/starlabs/lite/cmos.layout
View File

@ -28,8 +28,6 @@ entries
# 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

1
src/mainboard/starlabs/lite/variants/glkr/cmos.default
View File

@ -15,7 +15,6 @@ legacy_8254_timer=Disable
kbl_timeout=30 seconds
fn_ctrl_swap=Disable
fast_charge=Normal
mirror_flag=Disable
# Functions
fn_lock_state=0x1
trackpad_state=0x1

2
src/mainboard/starlabs/lite/variants/glkr/cmos.layout
View File

@ -29,8 +29,6 @@ entries
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

1
src/mainboard/starlabs/starbook/cmos.default
View File

@ -18,7 +18,6 @@ pci_hot_plug=Disable
# EC
kbl_timeout=30 seconds
fn_ctrl_swap=Disable
mirror_flag=Disable
# Functions
fn_lock_state=0x1
trackpad_state=0x1

2
src/mainboard/starlabs/starbook/cmos.layout
View File

@ -38,8 +38,6 @@ entries
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

1
src/mainboard/starlabs/starbook/variants/tgl/cmos.default
View File

@ -18,7 +18,6 @@ thunderbolt=Disable
# EC
kbl_timeout=30 seconds
fn_ctrl_swap=Disable
mirror_flag=Disable
# Functions
fn_lock_state=0x1
trackpad_state=0x1

2
src/mainboard/starlabs/starbook/variants/tgl/cmos.layout
View File

@ -38,8 +38,6 @@ entries
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