coreboot-gerrit January 2025

coreboot-gerrit@coreboot.org

1 participants
3269 discussions

[S] Change in coreboot[main]: soc/mediatek/mt8196: Add mt6363_read8 API
by Jarried Lin (Code Review) 08 Jan '25

08 Jan '25

Attention is currently required from: Hung-Te Lin, Yidi Lin, Yu-Ping Wu. Hello Hope Wang, Hung-Te Lin, Yidi Lin, Yu-Ping Wu, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/85892?usp=email to look at the new patch set (#2). Change subject: soc/mediatek/mt8196: Add mt6363_read8 API ...................................................................... soc/mediatek/mt8196: Add mt6363_read8 API Add mt6363_read8 API for common use. BUG=b:317009620 TEST=Build pass. Change-Id: I3cca4c2e5f6c2537c9661623260b21fb6088eff9 Signed-off-by: Hope Wang <hope.wang(a)mediatek.corp-partner.google.com> --- M src/soc/mediatek/common/include/soc/mt6363.h M src/soc/mediatek/common/mt6363.c 2 files changed, 11 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/92/85892/2 -- To view, visit https://review.coreboot.org/c/coreboot/+/85892?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I3cca4c2e5f6c2537c9661623260b21fb6088eff9 Gerrit-Change-Number: 85892 Gerrit-PatchSet: 2 Gerrit-Owner: Jarried Lin <jarried.lin(a)mediatek.com> Gerrit-Reviewer: Hung-Te Lin <hungte(a)chromium.org> Gerrit-Reviewer: Yidi Lin <yidilin(a)google.com> Gerrit-Reviewer: Yu-Ping Wu <yupingso(a)google.com> Gerrit-CC: Hope Wang <hope.wang(a)mediatek.corp-partner.google.com> Gerrit-Attention: Hung-Te Lin <hungte(a)chromium.org> Gerrit-Attention: Yu-Ping Wu <yupingso(a)google.com> Gerrit-Attention: Yidi Lin <yidilin(a)google.com>

1 0

[L] Change in coreboot[main]: mb/asrock: Add Z87M Extreme4 (Haswell)
by Jan Philipp Groß (Code Review) 08 Jan '25

08 Jan '25

Attention is currently required from: Angel Pons, Máté Kukri, Nicholas Chin. Hello Angel Pons, Máté Kukri, Nicholas Chin, build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/85884?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by build bot (Jenkins) Change subject: mb/asrock: Add Z87M Extreme4 (Haswell) ...................................................................... mb/asrock: Add Z87M Extreme4 (Haswell) This port was done via autoport and subsequent manual tweaking. Working: - Haswell MRC.bin - All four DDR3/DDR3L DIMM slots - S3 suspend and resume - D-Sub Port - DVI-D Port - HDMI Port - RJ-45 Gigabit LAN Port - All four rear USB 2.0 Ports - All four rear USB 3.1 Gen1 Ports - Both USB 2.0 headers - USB 3.1 Gen1 header - All six SATA3 6.0 Gb/s connectors by Intel - Both PCI Express 3.0 x16 slots - PCI Express 2.0 x16 slot - PCI Express 2.0 x1 slots (tested with TL-WDN4800 WiFi adapter) - HD Audio Jack (Audio output tested only) - Front Audio Jack (Audio output tested only) not (yet) tested: - IR header - COM Port header - eSATA connector - PS/2 Mouse/Keyboard Port Change-Id: Icc2eb7430b77fe152cff1c90e80e6ba37cc903e1 Signed-off-by: Jan Philipp Groß <jeangrande(a)mailbox.org> --- A src/mainboard/asrock/z87m_extreme4/Kconfig A src/mainboard/asrock/z87m_extreme4/Kconfig.name A src/mainboard/asrock/z87m_extreme4/Makefile.mk A src/mainboard/asrock/z87m_extreme4/acpi/ec.asl A src/mainboard/asrock/z87m_extreme4/acpi/platform.asl A src/mainboard/asrock/z87m_extreme4/acpi/superio.asl A src/mainboard/asrock/z87m_extreme4/board_info.txt A src/mainboard/asrock/z87m_extreme4/bootblock.c A src/mainboard/asrock/z87m_extreme4/data.vbt A src/mainboard/asrock/z87m_extreme4/devicetree.cb A src/mainboard/asrock/z87m_extreme4/dsdt.asl A src/mainboard/asrock/z87m_extreme4/gma-mainboard.ads A src/mainboard/asrock/z87m_extreme4/gpio.c A src/mainboard/asrock/z87m_extreme4/hda_verb.c A src/mainboard/asrock/z87m_extreme4/romstage.c 15 files changed, 527 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/84/85884/2 -- To view, visit https://review.coreboot.org/c/coreboot/+/85884?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: Icc2eb7430b77fe152cff1c90e80e6ba37cc903e1 Gerrit-Change-Number: 85884 Gerrit-PatchSet: 2 Gerrit-Owner: Jan Philipp Groß <jeangrande(a)mailbox.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Máté Kukri <km(a)mkukri.xyz> Gerrit-Reviewer: Nicholas Chin <nic.c3.14(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Máté Kukri <km(a)mkukri.xyz> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Nicholas Chin <nic.c3.14(a)gmail.com>

1 0

[L] Change in coreboot[main]: mb/starlabs/starlite_adl: Put options in CFR cbtable
by Sean Rhodes (Code Review) 08 Jan '25

08 Jan '25

Hello build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/85711?usp=email to look at the new patch set (#7). The following approvals got outdated and were removed: Verified+1 by build bot (Jenkins) Change subject: mb/starlabs/starlite_adl: Put options in CFR cbtable ...................................................................... mb/starlabs/starlite_adl: Put options in CFR cbtable Change-Id: If92f61dece7e67bfd2e29927198c9ebb81c4d363 Signed-off-by: Sean Rhodes <sean(a)starlabs.systems> --- M src/mainboard/starlabs/starlite_adl/Kconfig A src/mainboard/starlabs/starlite_adl/cfr.c D src/mainboard/starlabs/starlite_adl/cmos.default M src/mainboard/starlabs/starlite_adl/cmos.layout 4 files changed, 329 insertions(+), 80 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/11/85711/7 -- To view, visit https://review.coreboot.org/c/coreboot/+/85711?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: If92f61dece7e67bfd2e29927198c9ebb81c4d363 Gerrit-Change-Number: 85711 Gerrit-PatchSet: 7 Gerrit-Owner: Sean Rhodes <sean(a)starlabs.systems> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

[L] Change in coreboot[main]: mb/starlabs/byte_adl: Put options in CFR cbtable
by Sean Rhodes (Code Review) 08 Jan '25

08 Jan '25

Hello build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/85710?usp=email to look at the new patch set (#7). The following approvals got outdated and were removed: Verified+1 by build bot (Jenkins) Change subject: mb/starlabs/byte_adl: Put options in CFR cbtable ...................................................................... mb/starlabs/byte_adl: Put options in CFR cbtable Change-Id: I11349397e41fb2c7a3f26ab172a2c4b30d24bc0a Signed-off-by: Sean Rhodes <sean(a)starlabs.systems> --- M src/mainboard/starlabs/byte_adl/Kconfig A src/mainboard/starlabs/byte_adl/cfr.c D src/mainboard/starlabs/byte_adl/cmos.default M src/mainboard/starlabs/byte_adl/cmos.layout 4 files changed, 219 insertions(+), 47 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/10/85710/7 -- To view, visit https://review.coreboot.org/c/coreboot/+/85710?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I11349397e41fb2c7a3f26ab172a2c4b30d24bc0a Gerrit-Change-Number: 85710 Gerrit-PatchSet: 7 Gerrit-Owner: Sean Rhodes <sean(a)starlabs.systems> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

[S] Change in coreboot[main]: soc/mediatek/mt8196: Add mt6363_read8 API
by Jarried Lin (Code Review) 08 Jan '25

08 Jan '25

Attention is currently required from: Hope Wang, Hung-Te Lin, Yidi Lin, Yu-Ping Wu. Hello Hope Wang, I'd like you to do a code review. Please visit https://review.coreboot.org/c/coreboot/+/85892?usp=email to review the following change. Change subject: soc/mediatek/mt8196: Add mt6363_read8 API ...................................................................... soc/mediatek/mt8196: Add mt6363_read8 API Add mt6363_read8 API for common use. Change-Id: I3cca4c2e5f6c2537c9661623260b21fb6088eff9 Signed-off-by: Hope Wang <hope.wang(a)mediatek.corp-partner.google.com> --- M src/soc/mediatek/common/include/soc/mt6363.h M src/soc/mediatek/common/mt6363.c 2 files changed, 11 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/92/85892/1 diff --git a/src/soc/mediatek/common/include/soc/mt6363.h b/src/soc/mediatek/common/include/soc/mt6363.h index 19b23d4..7b2ac3a 100644 --- a/src/soc/mediatek/common/include/soc/mt6363.h +++ b/src/soc/mediatek/common/include/soc/mt6363.h @@ -109,6 +109,7 @@ void mt6363_enable_vram_mdfe(bool enable); void mt6363_init_pmif_arb(void); u32 mt6363_read16(u32 reg); +u8 mt6363_read8(u32 reg); void mt6363_write8(u32 reg, u8 reg_val); void mt6363_write_field(u32 reg, u32 val, u32 mask, u32 shift); void mt6363_init_setting(void); diff --git a/src/soc/mediatek/common/mt6363.c b/src/soc/mediatek/common/mt6363.c index 691282b..ddfe6a5 100644 --- a/src/soc/mediatek/common/mt6363.c +++ b/src/soc/mediatek/common/mt6363.c @@ -34,6 +34,16 @@ return rdata; } +u8 mt6363_read8(u32 reg) +{ + u32 rdata = 0; + + assert(pmif_arb); + pmif_arb->read(pmif_arb, SPMI_SLAVE_4, reg, &rdata); + + return (u8)rdata; +} + void mt6363_write8(u32 reg, u8 data) { assert(pmif_arb); -- To view, visit https://review.coreboot.org/c/coreboot/+/85892?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I3cca4c2e5f6c2537c9661623260b21fb6088eff9 Gerrit-Change-Number: 85892 Gerrit-PatchSet: 1 Gerrit-Owner: Jarried Lin <jarried.lin(a)mediatek.com> Gerrit-Reviewer: Hope Wang <hope.wang(a)mediatek.corp-partner.google.com> Gerrit-Reviewer: Hung-Te Lin <hungte(a)chromium.org> Gerrit-Reviewer: Yidi Lin <yidilin(a)google.com> Gerrit-Reviewer: Yu-Ping Wu <yupingso(a)google.com> Gerrit-Attention: Hung-Te Lin <hungte(a)chromium.org> Gerrit-Attention: Hope Wang <hope.wang(a)mediatek.corp-partner.google.com> Gerrit-Attention: Yu-Ping Wu <yupingso(a)google.com> Gerrit-Attention: Yidi Lin <yidilin(a)google.com>

1 0

[M] Change in coreboot[main]: soc/mediatek/mt8196: Add modem power driver to disable unused power
by Jarried Lin (Code Review) 08 Jan '25

08 Jan '25

Attention is currently required from: Hung-Te Lin, Jarried Lin. Hello Hung-Te Lin, Yidi Lin, Yu-Ping Wu, build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/85651?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Verified+1 by build bot (Jenkins) Change subject: soc/mediatek/mt8196: Add modem power driver to disable unused power ...................................................................... soc/mediatek/mt8196: Add modem power driver to disable unused power Disable MT6363 unused power: vbuck5, vcn15, vrf09, vrf12, vrf13, vrf18, vsram_digrf, vsram_mdfe. Disable MT6373 unused power: vant18, vsim1, vsim2. BUG=b:315894234 TEST=Build pass, Check there are no check failed logs. And check logs: Vmodem value: 0x78 (means SPMI_SLAVE_4_750MV) Signed-off-by: Xavier Chang <xavier.chang(a)mediatek.corp-partner.google.com> Change-Id: Ia8808e3500727753e4537017b46ac8ab39d59468 --- M src/soc/mediatek/mt8196/Makefile.mk A src/soc/mediatek/mt8196/include/soc/modem_power_ctrl.h A src/soc/mediatek/mt8196/modem_power_ctrl.c 3 files changed, 112 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/51/85651/4 -- To view, visit https://review.coreboot.org/c/coreboot/+/85651?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: Ia8808e3500727753e4537017b46ac8ab39d59468 Gerrit-Change-Number: 85651 Gerrit-PatchSet: 4 Gerrit-Owner: Jarried Lin <jarried.lin(a)mediatek.com> Gerrit-Reviewer: Hung-Te Lin <hungte(a)chromium.org> Gerrit-Reviewer: Yidi Lin <yidilin(a)google.com> Gerrit-Reviewer: Yu-Ping Wu <yupingso(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Hung-Te Lin <hungte(a)chromium.org> Gerrit-Attention: Jarried Lin <jarried.lin(a)mediatek.com>

1 0

[XS] Change in coreboot[main]: ec/starlabs/merlin: Only include battery ACPI for systems with a battery
by Sean Rhodes (Code Review) 08 Jan '25

08 Jan '25

Attention is currently required from: Matt DeVillier. Sean Rhodes has posted comments on this change by Sean Rhodes. ( https://review.coreboot.org/c/coreboot/+/85716?usp=email ) Change subject: ec/starlabs/merlin: Only include battery ACPI for systems with a battery ...................................................................... Patch Set 6: (1 comment) File src/ec/starlabs/merlin/acpi/ec.asl: https://review.coreboot.org/c/coreboot/+/85716/comment/b1984ed5_515d8697?us… : PS5, Line 137: #if CONFIG > it seems that the convention when using `#if CONFIG` in ASL code is to not indent it at all, so I'd […] Done -- To view, visit https://review.coreboot.org/c/coreboot/+/85716?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I381714887f4319d8e1a25c1e493ba03631cbf082 Gerrit-Change-Number: 85716 Gerrit-PatchSet: 6 Gerrit-Owner: Sean Rhodes <sean(a)starlabs.systems> Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)gmail.com> Gerrit-Reviewer: Sean Rhodes <sean(a)starlabs.systems> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Matt DeVillier <matt.devillier(a)gmail.com> Gerrit-Comment-Date: Wed, 08 Jan 2025 11:17:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Matt DeVillier <matt.devillier(a)gmail.com>

1 0

[S] Change in coreboot[main]: mb/starlabs/*: Add a CMOS option to disable the GNA
by Sean Rhodes (Code Review) 08 Jan '25

08 Jan '25

Attention is currently required from: Matt DeVillier. Hello Matt DeVillier, build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/85703?usp=email to look at the new patch set (#12). The following approvals got outdated and were removed: Code-Review+2 by Matt DeVillier, Verified+1 by build bot (Jenkins) The change is no longer submittable: Code-Review and Verified are unsatisfied now. Change subject: mb/starlabs/*: Add a CMOS option to disable the GNA ...................................................................... mb/starlabs/*: Add a CMOS option to disable the GNA Add an option, which defaults to disabled, to control whether the GNA (Gaussian Neural Accelerator) is enabled. This is a device that designed to handle AI tasks. Change-Id: I99f015cf1b5e21e8b524c4aa9bd3e94f86908ca1 Signed-off-by: Sean Rhodes <sean(a)starlabs.systems> --- M src/mainboard/starlabs/byte_adl/cmos.default M src/mainboard/starlabs/byte_adl/cmos.layout M src/mainboard/starlabs/byte_adl/variants/mk_ii/devtree.c M src/mainboard/starlabs/starbook/cmos.default M src/mainboard/starlabs/starbook/cmos.layout M src/mainboard/starlabs/starbook/variants/adl/devtree.c M src/mainboard/starlabs/starbook/variants/rpl/devtree.c M src/mainboard/starlabs/starbook/variants/tgl/devtree.c M src/mainboard/starlabs/starfighter/cmos.default M src/mainboard/starlabs/starfighter/cmos.layout M src/mainboard/starlabs/starfighter/variants/rpl/devtree.c M src/mainboard/starlabs/starlite_adl/cmos.default M src/mainboard/starlabs/starlite_adl/cmos.layout M src/mainboard/starlabs/starlite_adl/variants/mk_v/devtree.c 14 files changed, 39 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/03/85703/12 -- To view, visit https://review.coreboot.org/c/coreboot/+/85703?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I99f015cf1b5e21e8b524c4aa9bd3e94f86908ca1 Gerrit-Change-Number: 85703 Gerrit-PatchSet: 12 Gerrit-Owner: Sean Rhodes <sean(a)starlabs.systems> Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Matt DeVillier <matt.devillier(a)gmail.com>

1 0

[M] Change in coreboot[main]: ec/starlabs/merlin: Adjust the EC code to read values from CMOS
by Sean Rhodes (Code Review) 08 Jan '25

08 Jan '25

Sean Rhodes has submitted this change. ( https://review.coreboot.org/c/coreboot/+/76582?usp=email ) ( 14 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: ec/starlabs/merlin: Adjust the EC code to read values from CMOS ...................................................................... ec/starlabs/merlin: Adjust the EC code to read values from CMOS This is in preparation to store options in EFI variable store, rather than CMOS. However, some still need to stay in CMOS, so that they can be accessed via ACPI. Change-Id: Idb094456543c75b59a8ddd80b58eb4fa1e10144f Signed-off-by: Sean Rhodes <sean(a)starlabs.systems> Reviewed-on: https://review.coreboot.org/c/coreboot/+/76582 Reviewed-by: Matt DeVillier <matt.devillier(a)gmail.com> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M src/ec/starlabs/merlin/ite.c M src/ec/starlabs/merlin/nuvoton.c 2 files changed, 141 insertions(+), 52 deletions(-) Approvals: Matt DeVillier: Looks good to me, approved build bot (Jenkins): Verified diff --git a/src/ec/starlabs/merlin/ite.c b/src/ec/starlabs/merlin/ite.c index 52d4b9d..1dd83a8 100644 --- a/src/ec/starlabs/merlin/ite.c +++ b/src/ec/starlabs/merlin/ite.c @@ -5,9 +5,12 @@ #include <device/pnp.h> #include <ec/acpi/ec.h> #include <option.h> +#include <pc80/mc146818rtc.h> +#include <halt.h> -#include "ec.h" #include "ecdefs.h" +#include "option_table.h" +#include "ec.h" #define ITE_IT5570 0x5570 #define ITE_IT8987 0x8987 @@ -17,12 +20,34 @@ return (ec_read(ECRAM_MAJOR_VERSION) << 8) | ec_read(ECRAM_MINOR_VERSION); } -static uint8_t get_ec_value_from_option(const char *name, - unsigned int fallback, - const uint8_t *lut, - size_t lut_size) +static uint8_t get_cmos_value(uint32_t bit, uint32_t length) { - unsigned int index = get_uint_option(name, fallback); + uint32_t byte, byte_bit; + uint8_t uchar; + + byte = bit / 8; // find the byte where the data starts + byte_bit = bit % 8; // find the bit in the byte where the data starts + + uchar = cmos_read(byte); // load the byte + uchar >>= byte_bit; // shift the bits to byte align + // clear unspecified bits + return uchar & ((1U << length) - 1); +} + +static uint8_t get_ec_value_from_option(const char *name, + uint32_t fallback, + const uint8_t *lut, + size_t lut_size, + uint32_t cmos_start_bit, + uint32_t cmos_length) +{ + unsigned int index; + + if (cmos_start_bit != UINT_MAX) + index = get_cmos_value(cmos_start_bit, cmos_length); + else + index = get_uint_option(name, fallback); + if (index >= lut_size) index = fallback; return lut[index]; @@ -95,7 +120,9 @@ get_ec_value_from_option("kbl_timeout", 0, kbl_timeout, - ARRAY_SIZE(kbl_timeout))); + ARRAY_SIZE(kbl_timeout), + UINT_MAX, + UINT_MAX)); /* * Fn Ctrl Reverse @@ -115,7 +142,9 @@ get_ec_value_from_option("fn_ctrl_swap", 0, fn_ctrl_swap, - ARRAY_SIZE(fn_ctrl_swap))); + ARRAY_SIZE(fn_ctrl_swap), + UINT_MAX, + UINT_MAX)); /* * Maximum Charge Level @@ -137,7 +166,9 @@ get_ec_value_from_option("max_charge", 0, max_charge, - ARRAY_SIZE(max_charge))); + ARRAY_SIZE(max_charge), + UINT_MAX, + UINT_MAX)); /* * Fan Mode @@ -159,7 +190,9 @@ get_ec_value_from_option("fan_mode", 0, fan_mode, - ARRAY_SIZE(fan_mode))); + ARRAY_SIZE(fan_mode), + UINT_MAX, + UINT_MAX)); /* * Function Lock @@ -170,6 +203,7 @@ * Default: Locked * */ +#ifdef CMOS_VLEN_fn_lock_state const uint8_t fn_lock_state[] = { UNLOCKED, LOCKED @@ -179,7 +213,10 @@ get_ec_value_from_option("fn_lock_state", 1, fn_lock_state, - ARRAY_SIZE(fn_lock_state))); + ARRAY_SIZE(fn_lock_state), + CMOS_VSTART_fn_lock_state, + CMOS_VLEN_fn_lock_state)); +#endif /* * Trackpad State @@ -190,6 +227,7 @@ * Default: Enabled * */ +#ifdef CMOS_VSTART_trackpad_state const uint8_t trackpad_state[] = { TRACKPAD_ENABLED, TRACKPAD_DISABLED @@ -199,7 +237,10 @@ get_ec_value_from_option("trackpad_state", 0, trackpad_state, - ARRAY_SIZE(trackpad_state))); + ARRAY_SIZE(trackpad_state), + CMOS_VSTART_trackpad_state, + CMOS_VLEN_trackpad_state)); +#endif /* * Keyboard Backlight Brightness @@ -210,6 +251,7 @@ * Default: Low * */ +#ifdef CMOS_VSTART_kbl_brightness const uint8_t kbl_brightness[] = { KBL_ON, KBL_OFF, @@ -217,18 +259,16 @@ KBL_HIGH }; - if (CONFIG(EC_STARLABS_KBL_LEVELS)) - ec_write(ECRAM_KBL_BRIGHTNESS, - get_ec_value_from_option("kbl_brightness", - 2, - kbl_brightness, - ARRAY_SIZE(kbl_brightness))); - else - ec_write(ECRAM_KBL_BRIGHTNESS, - get_ec_value_from_option("kbl_brightness", - 0, - kbl_brightness, - ARRAY_SIZE(kbl_brightness))); + ec_write(ECRAM_KBL_BRIGHTNESS, + get_ec_value_from_option("kbl_brightness", + CONFIG(EC_STARLABS_KBL_LEVELS) ? 2 : 0, + kbl_brightness, + ARRAY_SIZE(kbl_brightness), + CMOS_VSTART_kbl_brightness, + CMOS_VLEN_kbl_brightness)); + +#endif + /* * Keyboard Backlight State @@ -264,7 +304,9 @@ get_ec_value_from_option("charging_speed", SPEED_0_5C, charging_speed, - ARRAY_SIZE(charging_speed))); + ARRAY_SIZE(charging_speed), + UINT_MAX, + UINT_MAX)); /* * Lid Switch @@ -285,7 +327,9 @@ get_ec_value_from_option("lid_switch", 0, lid_switch, - ARRAY_SIZE(lid_switch))); + ARRAY_SIZE(lid_switch), + UINT_MAX, + UINT_MAX)); /* * Power LED Brightness @@ -306,7 +350,9 @@ get_ec_value_from_option("power_led", 0, power_led, - ARRAY_SIZE(power_led))); + ARRAY_SIZE(power_led), + UINT_MAX, + UINT_MAX)); } static struct device_operations ops = { diff --git a/src/ec/starlabs/merlin/nuvoton.c b/src/ec/starlabs/merlin/nuvoton.c index e59fa6e..f62bcdf 100644 --- a/src/ec/starlabs/merlin/nuvoton.c +++ b/src/ec/starlabs/merlin/nuvoton.c @@ -5,21 +5,47 @@ #include <device/pnp.h> #include <ec/acpi/ec.h> #include <option.h> +#include <pc80/mc146818rtc.h> +#include <halt.h> -#include "ec.h" #include "ecdefs.h" +#include "option_table.h" +#include "ec.h" + uint16_t ec_get_version(void) { return (ec_read(ECRAM_MAJOR_VERSION) << 8) | ec_read(ECRAM_MINOR_VERSION); } -static uint8_t get_ec_value_from_option(const char *name, - unsigned int fallback, - const uint8_t *lut, - size_t lut_size) +static uint8_t get_cmos_value(uint32_t bit, uint32_t length) { - unsigned int index = get_uint_option(name, fallback); + uint32_t byte, byte_bit; + uint8_t uchar; + + byte = bit / 8; // find the byte where the data starts + byte_bit = bit % 8; // find the bit in the byte where the data starts + + uchar = cmos_read(byte); // load the byte + uchar >>= byte_bit; // shift the bits to byte align + // clear unspecified bits + return uchar & ((1U << length) - 1); +} + +static uint8_t get_ec_value_from_option(const char *name, + uint32_t fallback, + const uint8_t *lut, + size_t lut_size, + uint32_t cmos_start_bit, + uint32_t cmos_length) +{ + unsigned int index; + + if (cmos_start_bit != UINT_MAX) + index = get_cmos_value(cmos_start_bit, cmos_length); + else + index = get_uint_option(name, fallback); + if (index >= lut_size) index = fallback; return lut[index]; @@ -89,7 +115,9 @@ get_ec_value_from_option("kbl_timeout", 0, kbl_timeout, - ARRAY_SIZE(kbl_timeout))); + ARRAY_SIZE(kbl_timeout), + UINT_MAX, + UINT_MAX)); /* * Fn Ctrl Reverse @@ -109,7 +137,9 @@ get_ec_value_from_option("fn_ctrl_swap", 0, fn_ctrl_swap, - ARRAY_SIZE(fn_ctrl_swap))); + ARRAY_SIZE(fn_ctrl_swap), + UINT_MAX, + UINT_MAX)); /* * Maximum Charge Level @@ -131,7 +161,9 @@ get_ec_value_from_option("max_charge", 0, max_charge, - ARRAY_SIZE(max_charge))); + ARRAY_SIZE(max_charge), + UINT_MAX, + UINT_MAX)); /* * Fast Charge @@ -152,7 +184,9 @@ get_ec_value_from_option("fast_charge", 0, fast_charge, - ARRAY_SIZE(fast_charge))); + ARRAY_SIZE(fast_charge), + UINT_MAX, + UINT_MAX)); /* * Fan Mode @@ -174,7 +208,9 @@ get_ec_value_from_option("fan_mode", 0, fan_mode, - ARRAY_SIZE(fan_mode))); + ARRAY_SIZE(fan_mode), + UINT_MAX, + UINT_MAX)); /* * Function Lock @@ -185,6 +221,7 @@ * Default: Locked * */ +#ifdef CMOS_VLEN_fn_lock_state const uint8_t fn_lock_state[] = { UNLOCKED, LOCKED @@ -194,7 +231,10 @@ get_ec_value_from_option("fn_lock_state", 1, fn_lock_state, - ARRAY_SIZE(fn_lock_state))); + ARRAY_SIZE(fn_lock_state), + CMOS_VSTART_fn_lock_state, + CMOS_VLEN_fn_lock_state)); +#endif /* * Trackpad State @@ -205,6 +245,7 @@ * Default: Enabled * */ +#ifdef CMOS_VSTART_trackpad_state const uint8_t trackpad_state[] = { TRACKPAD_ENABLED, TRACKPAD_DISABLED @@ -214,7 +255,10 @@ get_ec_value_from_option("trackpad_state", 0, trackpad_state, - ARRAY_SIZE(trackpad_state))); + ARRAY_SIZE(trackpad_state), + CMOS_VSTART_trackpad_state, + CMOS_VLEN_trackpad_state)); +#endif /* * Keyboard Backlight Brightness @@ -225,6 +269,7 @@ * Default: Low * */ +#ifdef CMOS_VSTART_kbl_brightness const uint8_t kbl_brightness[] = { KBL_ON, KBL_OFF, @@ -232,18 +277,16 @@ KBL_HIGH }; - if (CONFIG(EC_STARLABS_KBL_LEVELS)) - ec_write(ECRAM_KBL_BRIGHTNESS, - get_ec_value_from_option("kbl_brightness", - 2, - kbl_brightness, - ARRAY_SIZE(kbl_brightness))); - else - ec_write(ECRAM_KBL_BRIGHTNESS, - get_ec_value_from_option("kbl_brightness", - 0, - kbl_brightness, - ARRAY_SIZE(kbl_brightness))); + ec_write(ECRAM_KBL_BRIGHTNESS, + get_ec_value_from_option("kbl_brightness", + CONFIG(EC_STARLABS_KBL_LEVELS) ? 2 : 0, + kbl_brightness, + ARRAY_SIZE(kbl_brightness), + CMOS_VSTART_kbl_brightness, + CMOS_VLEN_kbl_brightness)); + +#endif + /* * Keyboard Backlight State -- To view, visit https://review.coreboot.org/c/coreboot/+/76582?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: Idb094456543c75b59a8ddd80b58eb4fa1e10144f Gerrit-Change-Number: 76582 Gerrit-PatchSet: 16 Gerrit-Owner: Sean Rhodes <sean(a)starlabs.systems> Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)gmail.com> Gerrit-Reviewer: Sean Rhodes <sean(a)starlabs.systems> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

[XS] Change in coreboot[main]: ec/starlabs/merlin/nuvoton: Remove the call to initialise the keyboard
by Sean Rhodes (Code Review) 08 Jan '25

08 Jan '25

Sean Rhodes has submitted this change. ( https://review.coreboot.org/c/coreboot/+/85794?usp=email ) Change subject: ec/starlabs/merlin/nuvoton: Remove the call to initialise the keyboard ...................................................................... ec/starlabs/merlin/nuvoton: Remove the call to initialise the keyboard This is done by edk2, so there isn't any need for coreboot to do it. Change-Id: I947d5d2f7512cc910963054dfbe6b5dc0f00462a Signed-off-by: Sean Rhodes <sean(a)starlabs.systems> Reviewed-on: https://review.coreboot.org/c/coreboot/+/85794 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Matt DeVillier <matt.devillier(a)gmail.com> --- M src/ec/starlabs/merlin/nuvoton.c 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: build bot (Jenkins): Verified Matt DeVillier: Looks good to me, approved diff --git a/src/ec/starlabs/merlin/nuvoton.c b/src/ec/starlabs/merlin/nuvoton.c index d0b119f..e59fa6e 100644 --- a/src/ec/starlabs/merlin/nuvoton.c +++ b/src/ec/starlabs/merlin/nuvoton.c @@ -5,7 +5,6 @@ #include <device/pnp.h> #include <ec/acpi/ec.h> #include <option.h> -#include <pc80/keyboard.h> #include "ec.h" #include "ecdefs.h" @@ -56,8 +55,6 @@ return; } - pc_keyboard_init(NO_AUX_DEVICE); - /* * Restore settings from CMOS into EC RAM: * -- To view, visit https://review.coreboot.org/c/coreboot/+/85794?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I947d5d2f7512cc910963054dfbe6b5dc0f00462a Gerrit-Change-Number: 85794 Gerrit-PatchSet: 4 Gerrit-Owner: Sean Rhodes <sean(a)starlabs.systems> Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)gmail.com> Gerrit-Reviewer: Sean Rhodes <sean(a)starlabs.systems> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit January 2025