coreboot-gerrit December 2018

coreboot-gerrit@coreboot.org

1 participants
1832 discussions

Change in ...coreboot[master]: soc/intel/braswell: Add support for FSP MR2
by Nico Huber (Code Review) 06 Dec '18

06 Dec '18

Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/29661 ) Change subject: soc/intel/braswell: Add support for FSP MR2 ...................................................................... Patch Set 3: Am I correct that the IMAGE_REV coreboot already knows is newer? Did you ask Intel to update the version on Github? -- To view, visit https://review.coreboot.org/c/coreboot/+/29661 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Id40b5d46ddda93845d9739b56aaf7ad24ee89246 Gerrit-Change-Number: 29661 Gerrit-PatchSet: 3 Gerrit-Owner: Frans Hendriks <fhendriks(a)eltan.com> Gerrit-Reviewer: Frans Hendriks <fhendriks(a)eltan.com> Gerrit-Reviewer: Hannah Williams <hannah.williams(a)intel.com> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Michał Żygowski <michal.zygowski(a)3mdeb.com> Gerrit-CC: Nico Huber <nico.h(a)gmx.de> Gerrit-Comment-Date: Thu, 06 Dec 2018 13:03:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in ...coreboot[master]: mb/lenovo/x1_carbon_gen1/cmos: Port USB Always On
by Peter Lemenkov (Code Review) 06 Dec '18

06 Dec '18

Hello Patrick Rudolph, build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/29032 to look at the new patch set (#4). Change subject: mb/lenovo/x1_carbon_gen1/cmos: Port USB Always On ...................................................................... mb/lenovo/x1_carbon_gen1/cmos: Port USB Always On Port commit f1395d82: "ec/lenovo/h8: Add USB Always On" to the Thinkpad x1_carbon_gen1 board as well, as it seems to work fine on all generations. See also commit 7ffb329f with Change-Id I6dcbfaae2a444d9a679ecb64a87dc2a59b8fd281 ("mb/lenovo/*/cmos: Port USB Always On"). Note that we don't need to call h8_usb_always_on() directly since commit 4f4322dd with Change-Id If812cd1ef8fb1a24d7fadbe834f574b40cbcd56a ("lenovo/h8,thinkpads: Re-do USB Always On"). Change-Id: Ib9070b659b0c9ad5dde4200ec2845c6fa2b78b25 Signed-off-by: Patrick Rudolph <siro(a)das-labor.org> Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com> --- M src/mainboard/lenovo/x1_carbon_gen1/cmos.default M src/mainboard/lenovo/x1_carbon_gen1/cmos.layout 2 files changed, 5 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/32/29032/4 -- To view, visit https://review.coreboot.org/c/coreboot/+/29032 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ib9070b659b0c9ad5dde4200ec2845c6fa2b78b25 Gerrit-Change-Number: 29032 Gerrit-PatchSet: 4 Gerrit-Owner: Peter Lemenkov <lemenkov(a)gmail.com> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: newpatchset

1 0

Change in ...coreboot[master]: soc/intel/braswell: Add support for FSP MR2
by Frans Hendriks (Code Review) 06 Dec '18

06 Dec '18

Hello build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/29661 to look at the new patch set (#3). Change subject: soc/intel/braswell: Add support for FSP MR2 ...................................................................... soc/intel/braswell: Add support for FSP MR2 Actual FspUpdVpd.h does not match the MR2 version in fsp 3rdparty Add config USE_BSWSBFSP to support FSP MR2 BUG=NA TEST=Portwell PQ7-M107 Change-Id: Id40b5d46ddda93845d9739b56aaf7ad24ee89246 Signed-off-by: Frans Hendriks <fhendriks(a)eltan.com> --- M src/soc/intel/braswell/Kconfig M src/vendorcode/intel/fsp/fsp1_1/braswell/FspUpdVpd.h 2 files changed, 37 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/61/29661/3 -- To view, visit https://review.coreboot.org/c/coreboot/+/29661 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Id40b5d46ddda93845d9739b56aaf7ad24ee89246 Gerrit-Change-Number: 29661 Gerrit-PatchSet: 3 Gerrit-Owner: Frans Hendriks <fhendriks(a)eltan.com> Gerrit-Reviewer: Frans Hendriks <fhendriks(a)eltan.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Michał Żygowski <michal.zygowski(a)3mdeb.com> Gerrit-MessageType: newpatchset

1 0

Change in ...coreboot[master]: rammus: ELAN touchpad I2C special timing requirement
by Patrick Georgi (Code Review) 06 Dec '18

06 Dec '18

Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/29922 ) Change subject: rammus: ELAN touchpad I2C special timing requirement ...................................................................... rammus: ELAN touchpad I2C special timing requirement According to issue tracker b:119899090. https://partnerissuetracker.corp.google.com/issues/119899090 We modify rammus devicetree.cb .i2c[1] configuration to meet ELAN touchpad I2C special timing requirement. BUG=b:119899090 BRANCH=firmware-rammus-11275.B TEST=emerge-rammus coreboot chromeos-ec chromeos-bootimage Flash FW to DUT, and check touchpad I2C characteristics meet requirement Signed-off-by: YanRu chen <kane_chen(a)pegatron.corp-partner.google.com> Change-Id: Ifeb08c2530e6a7674f23f7d48cefa16cfc59cb13 Reviewed-on: https://review.coreboot.org/c/29922 Reviewed-by: Patrick Georgi <pgeorgi(a)google.com> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M src/mainboard/google/poppy/variants/rammus/devicetree.cb 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: build bot (Jenkins): Verified Patrick Georgi: Looks good to me, approved diff --git a/src/mainboard/google/poppy/variants/rammus/devicetree.cb b/src/mainboard/google/poppy/variants/rammus/devicetree.cb index f10b84d..3af712f 100644 --- a/src/mainboard/google/poppy/variants/rammus/devicetree.cb +++ b/src/mainboard/google/poppy/variants/rammus/devicetree.cb @@ -191,7 +191,7 @@ .speed = I2C_SPEED_FAST, .speed_config[0] = { .speed = I2C_SPEED_FAST, - .scl_lcnt = 190, + .scl_lcnt = 170, .scl_hcnt = 100, .sda_hold = 36, }, -- To view, visit https://review.coreboot.org/c/coreboot/+/29922 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ifeb08c2530e6a7674f23f7d48cefa16cfc59cb13 Gerrit-Change-Number: 29922 Gerrit-PatchSet: 7 Gerrit-Owner: YanRu Chen <kane_chen(a)pegatron.corp-partner.google.com> Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: YanRu Chen <kane_chen(a)pegatron.corp-partner.google.com> Gerrit-Reviewer: Zhuohao Lee <zhuohao(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Jerry Chou <jerry_chou(a)pegatron.corp-partner.google.com> Gerrit-CC: Ken Lu <ken_lu(a)pegatron.corp-partner.google.com> Gerrit-CC: Statham Chu <statham_chu(a)pegatron.corp-partner.google.com> Gerrit-MessageType: merged

1 0

Change in ...coreboot[master]: rammus: ELAN touchpad I2C special timing requirement
by Patrick Georgi (Code Review) 06 Dec '18

06 Dec '18

Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/29922 ) Change subject: rammus: ELAN touchpad I2C special timing requirement ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://review.coreboot.org/c/coreboot/+/29922 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ifeb08c2530e6a7674f23f7d48cefa16cfc59cb13 Gerrit-Change-Number: 29922 Gerrit-PatchSet: 6 Gerrit-Owner: YanRu Chen <kane_chen(a)pegatron.corp-partner.google.com> Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: YanRu Chen <kane_chen(a)pegatron.corp-partner.google.com> Gerrit-Reviewer: Zhuohao Lee <zhuohao(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Jerry Chou <jerry_chou(a)pegatron.corp-partner.google.com> Gerrit-CC: Ken Lu <ken_lu(a)pegatron.corp-partner.google.com> Gerrit-CC: Statham Chu <statham_chu(a)pegatron.corp-partner.google.com> Gerrit-Comment-Date: Thu, 06 Dec 2018 12:11:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in ...coreboot[master]: rammus: ELAN touchpad I2C special timing requirement
by Ken Lu (Code Review) 06 Dec '18

06 Dec '18

Ken Lu has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/29922 ) Change subject: rammus: ELAN touchpad I2C special timing requirement ...................................................................... Patch Set 6: > Patch Set 5: > > (1 comment) Done -- To view, visit https://review.coreboot.org/c/coreboot/+/29922 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ifeb08c2530e6a7674f23f7d48cefa16cfc59cb13 Gerrit-Change-Number: 29922 Gerrit-PatchSet: 6 Gerrit-Owner: YanRu Chen <kane_chen(a)pegatron.corp-partner.google.com> Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com> Gerrit-Reviewer: YanRu Chen <kane_chen(a)pegatron.corp-partner.google.com> Gerrit-Reviewer: Zhuohao Lee <zhuohao(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Jerry Chou <jerry_chou(a)pegatron.corp-partner.google.com> Gerrit-CC: Ken Lu <ken_lu(a)pegatron.corp-partner.google.com> Gerrit-CC: Patrick Georgi <pgeorgi(a)google.com> Gerrit-CC: Statham Chu <statham_chu(a)pegatron.corp-partner.google.com> Gerrit-Comment-Date: Thu, 06 Dec 2018 12:08:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in ...coreboot[master]: rammus: ELAN touchpad I2C special timing requirement
by Ken Lu (Code Review) 06 Dec '18

06 Dec '18

Ken Lu has uploaded a new patch set (#6) to the change originally created by YanRu Chen. ( https://review.coreboot.org/c/coreboot/+/29922 ) Change subject: rammus: ELAN touchpad I2C special timing requirement ...................................................................... rammus: ELAN touchpad I2C special timing requirement According to issue tracker b:119899090. https://partnerissuetracker.corp.google.com/issues/119899090 We modify rammus devicetree.cb .i2c[1] configuration to meet ELAN touchpad I2C special timing requirement. BUG=b:119899090 BRANCH=firmware-rammus-11275.B TEST=emerge-rammus coreboot chromeos-ec chromeos-bootimage Flash FW to DUT, and check touchpad I2C characteristics meet requirement Signed-off-by: YanRu chen <kane_chen(a)pegatron.corp-partner.google.com> Change-Id: Ifeb08c2530e6a7674f23f7d48cefa16cfc59cb13 --- M src/mainboard/google/poppy/variants/rammus/devicetree.cb 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/22/29922/6 -- To view, visit https://review.coreboot.org/c/coreboot/+/29922 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ifeb08c2530e6a7674f23f7d48cefa16cfc59cb13 Gerrit-Change-Number: 29922 Gerrit-PatchSet: 6 Gerrit-Owner: YanRu Chen <kane_chen(a)pegatron.corp-partner.google.com> Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com> Gerrit-Reviewer: YanRu Chen <kane_chen(a)pegatron.corp-partner.google.com> Gerrit-Reviewer: Zhuohao Lee <zhuohao(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Jerry Chou <jerry_chou(a)pegatron.corp-partner.google.com> Gerrit-CC: Ken Lu <ken_lu(a)pegatron.corp-partner.google.com> Gerrit-CC: Patrick Georgi <pgeorgi(a)google.com> Gerrit-CC: Statham Chu <statham_chu(a)pegatron.corp-partner.google.com> Gerrit-MessageType: newpatchset

1 0

Change in ...coreboot[master]: mb/google/sarien/variants/sarien: Enable melf touchscreen
by Patrick Georgi (Code Review) 06 Dec '18

06 Dec '18

Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/29830 ) Change subject: mb/google/sarien/variants/sarien: Enable melf touchscreen ...................................................................... mb/google/sarien/variants/sarien: Enable melf touchscreen BUG=b:119799550 BRANCH=master TEST=Verify touchscreen on sarien works with this change. Change-Id: I926c988c141628ae2d98206f9eb615d06357a366 Signed-off-by: Chris Zhou <chris_zhou(a)compal.corp-partner.google.com> Reviewed-on: https://review.coreboot.org/c/29830 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Duncan Laurie <dlaurie(a)chromium.org> --- M src/mainboard/google/sarien/variants/sarien/devicetree.cb 1 file changed, 12 insertions(+), 1 deletion(-) Approvals: build bot (Jenkins): Verified Duncan Laurie: Looks good to me, approved diff --git a/src/mainboard/google/sarien/variants/sarien/devicetree.cb b/src/mainboard/google/sarien/variants/sarien/devicetree.cb index 991e9640..5004abf 100644 --- a/src/mainboard/google/sarien/variants/sarien/devicetree.cb +++ b/src/mainboard/google/sarien/variants/sarien/devicetree.cb @@ -202,7 +202,18 @@ device pci 14.3 on end # CNVi wifi end device pci 14.5 off end # SDCard - device pci 15.0 on end # I2C #0 + device pci 15.0 on + chip drivers/i2c/generic + register "hid" = ""MLFS0000"" + register "desc" = ""Melfas Touchscreen"" + register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_C23_IRQ)" + register "probed" = "1" + register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_E7)" + register "enable_delay_ms" = "5" + register "has_power_resource" = "1" + device i2c 10 on end + end + end # I2C #0 device pci 15.1 on chip drivers/i2c/hid register "generic.hid" = ""ACPI0C50"" -- To view, visit https://review.coreboot.org/c/coreboot/+/29830 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I926c988c141628ae2d98206f9eb615d06357a366 Gerrit-Change-Number: 29830 Gerrit-PatchSet: 4 Gerrit-Owner: Chris Zhou <chris_zhou(a)compal.corp-partner.google.com> Gerrit-Reviewer: Chris Zhou <chris_zhou(a)compal.corp-partner.google.com> Gerrit-Reviewer: Duncan Laurie <dlaurie(a)chromium.org> Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: Shelley Chen <shchen(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Crystal Lin <crystal_lin(a)compal.corp-partner.google.com> Gerrit-CC: Ivy Jian <ivy_jian(a)compal.corp-partner.google.com> Gerrit-CC: Van Chen <van_chen(a)compal.corp-partner.google.com> Gerrit-MessageType: merged

1 0

Change in ...coreboot[master]: Shyvana: ELAN touchpad I2C special timing requirement
by Patrick Georgi (Code Review) 06 Dec '18

06 Dec '18

Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/29922 ) Change subject: Shyvana: ELAN touchpad I2C special timing requirement ...................................................................... Patch Set 5: (1 comment) https://review.coreboot.org/#/c/29922/5//COMMIT_MSG Commit Message: https://review.coreboot.org/#/c/29922/5//COMMIT_MSG@7 PS5, Line 7: Shyvana That name doesn't seem to be used in the tree. Could you replace it with the right project name (maybe rammus)? -- To view, visit https://review.coreboot.org/c/coreboot/+/29922 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ifeb08c2530e6a7674f23f7d48cefa16cfc59cb13 Gerrit-Change-Number: 29922 Gerrit-PatchSet: 5 Gerrit-Owner: YanRu Chen <kane_chen(a)pegatron.corp-partner.google.com> Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com> Gerrit-Reviewer: YanRu Chen <kane_chen(a)pegatron.corp-partner.google.com> Gerrit-Reviewer: Zhuohao Lee <zhuohao(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Jerry Chou <jerry_chou(a)pegatron.corp-partner.google.com> Gerrit-CC: Ken Lu <ken_lu(a)pegatron.corp-partner.google.com> Gerrit-CC: Patrick Georgi <pgeorgi(a)google.com> Gerrit-CC: Statham Chu <statham_chu(a)pegatron.corp-partner.google.com> Gerrit-Comment-Date: Thu, 06 Dec 2018 12:02:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in ...coreboot[master]: lenovo/h8, thinkpads: Re-do USB Always On
by Patrick Georgi (Code Review) 06 Dec '18

06 Dec '18

Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/29565 ) Change subject: lenovo/h8,thinkpads: Re-do USB Always On ...................................................................... lenovo/h8,thinkpads: Re-do USB Always On Re-write the UAO handling code as it had stopped working (#171) (the flag was not getting read from the RTC properly in SMM) Remove the SMM code as it's not needed (but EC flag won't be set upon entering S3 now) Set the EC flags on boot the same way other flags are set Document bitwise operators for clarity Propagate changes to other Thinkpads (updated X201 to have 2 bits for the flag as it only had 1) Per Nicola Corna's previous commits, 0x0d is set for "AC only" "AC only" does exhibit different behaviour - the USB port is turned on a few seconds after entering S3, rather than < 1 sec, regardless of AC status Tested on X220 Change-Id: If812cd1ef8fb1a24d7fadbe834f574b40cbcd56a Signed-off-by: Nathaniel Roach <nroach44(a)gmail.com> Reviewed-on: https://review.coreboot.org/c/29565 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Philipp Deppenwiese <zaolin.daisuki(a)gmail.com> --- M src/ec/lenovo/h8/Makefile.inc M src/ec/lenovo/h8/h8.c M src/ec/lenovo/h8/h8.h D src/ec/lenovo/h8/smm.c M src/mainboard/lenovo/l520/smihandler.c M src/mainboard/lenovo/t420/smihandler.c M src/mainboard/lenovo/t420s/smihandler.c M src/mainboard/lenovo/t430/smihandler.c M src/mainboard/lenovo/t430s/smihandler.c M src/mainboard/lenovo/t520/smihandler.c M src/mainboard/lenovo/t530/smihandler.c M src/mainboard/lenovo/x201/cmos.layout M src/mainboard/lenovo/x201/smihandler.c M src/mainboard/lenovo/x220/cmos.layout M src/mainboard/lenovo/x220/smihandler.c M src/mainboard/lenovo/x230/smihandler.c 16 files changed, 41 insertions(+), 72 deletions(-) Approvals: build bot (Jenkins): Verified Philipp Deppenwiese: Looks good to me, approved diff --git a/src/ec/lenovo/h8/Makefile.inc b/src/ec/lenovo/h8/Makefile.inc index e4408f1..ebf6d7d 100644 --- a/src/ec/lenovo/h8/Makefile.inc +++ b/src/ec/lenovo/h8/Makefile.inc @@ -9,6 +9,5 @@ ramstage-y += bluetooth.c ramstage-y += wwan.c ramstage-$(CONFIG_HAVE_ACPI_TABLES) += ssdt.c -smm-y += smm.c endif diff --git a/src/ec/lenovo/h8/h8.c b/src/ec/lenovo/h8/h8.c index 1f1655d..da216ec 100644 --- a/src/ec/lenovo/h8/h8.c +++ b/src/ec/lenovo/h8/h8.c @@ -128,6 +128,34 @@ } +void h8_usb_always_on_enable(enum usb_always_on on) +{ + u8 val; + + switch (on) { + case UAO_OFF: + val = ec_read(H8_USB_ALWAYS_ON); + // Clear bits 0,2,3 + val &= ~(H8_USB_ALWAYS_ON_ENABLE | H8_USB_ALWAYS_ON_AC_ONLY); + ec_write(H8_USB_ALWAYS_ON, val); + break; + + case UAO_AC_AND_BATTERY: + val = ec_read(H8_USB_ALWAYS_ON); + val |= H8_USB_ALWAYS_ON_ENABLE; // Set bit 0 + val &= ~H8_USB_ALWAYS_ON_AC_ONLY; // Clear bits 2 and 3 + ec_write(H8_USB_ALWAYS_ON, val); + break; + + case UAO_AC_ONLY: + val = ec_read(H8_USB_ALWAYS_ON); + // Set bits 0,2,3 + val |= (H8_USB_ALWAYS_ON_ENABLE | H8_USB_ALWAYS_ON_AC_ONLY); + ec_write(H8_USB_ALWAYS_ON, val); + break; + } +} + void h8_usb_power_enable(int onoff) { if (onoff) @@ -270,8 +298,10 @@ ec_write(0x1f, conf->eventf_enable); ec_write(H8_FAN_CONTROL, H8_FAN_CONTROL_AUTO); - ec_write(H8_USB_ALWAYS_ON, ec_read(H8_USB_ALWAYS_ON) & - ~H8_USB_ALWAYS_ON_ENABLE); + + if (get_option(&val, "usb_always_on") != CB_SUCCESS) + val = 0; + h8_usb_always_on_enable(val); if (get_option(&val, "wlan") != CB_SUCCESS) val = 1; diff --git a/src/ec/lenovo/h8/h8.h b/src/ec/lenovo/h8/h8.h index 4ac395a..a46ba1f 100644 --- a/src/ec/lenovo/h8/h8.h +++ b/src/ec/lenovo/h8/h8.h @@ -19,9 +19,16 @@ #include <stdint.h> #include <device/device.h> +enum usb_always_on { + UAO_OFF = 0, + UAO_AC_AND_BATTERY = 1, + UAO_AC_ONLY = 2 +}; + void h8_trackpoint_enable(int on); void h8_wlan_enable(int on); void h8_set_audio_mute(int on); +void h8_usb_always_on_enable(enum usb_always_on on); void h8_usb_power_enable(int on); void h8_enable_event(int event); void h8_disable_event(int event); diff --git a/src/ec/lenovo/h8/smm.c b/src/ec/lenovo/h8/smm.c deleted file mode 100644 index 6005c31..0000000 --- a/src/ec/lenovo/h8/smm.c +++ /dev/null @@ -1,47 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2016 Nicola Corna <nicola(a)corna.info> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include <ec/acpi/ec.h> -#include <pc80/mc146818rtc.h> - -#include "h8.h" - -enum usb_always_on { - UAO_OFF = 0, - UAO_AC_AND_BATTERY, - UAO_AC_ONLY -}; - -void h8_usb_always_on(void) -{ - enum usb_always_on val; - u8 reg; - - if (get_option(&val, "usb_always_on") != CB_SUCCESS) - val = UAO_OFF; - - if (val == UAO_AC_AND_BATTERY) { - reg = ec_read(H8_USB_ALWAYS_ON); - reg &= ~H8_USB_ALWAYS_ON_AC_ONLY; - reg |= H8_USB_ALWAYS_ON_ENABLE; - ec_write(H8_USB_ALWAYS_ON, reg); - } else if (val == UAO_AC_ONLY) { - reg = ec_read(H8_USB_ALWAYS_ON); - reg |= H8_USB_ALWAYS_ON_AC_ONLY; - reg |= H8_USB_ALWAYS_ON_ENABLE; - ec_write(H8_USB_ALWAYS_ON, reg); - ec_set_bit(0x2, 3); - } -} diff --git a/src/mainboard/lenovo/l520/smihandler.c b/src/mainboard/lenovo/l520/smihandler.c index fa038ed..982233d 100644 --- a/src/mainboard/lenovo/l520/smihandler.c +++ b/src/mainboard/lenovo/l520/smihandler.c @@ -73,8 +73,6 @@ void mainboard_smi_sleep(u8 slp_typ) { - h8_usb_always_on(); - if (slp_typ == 3) { u8 ec_wake = ec_read(0x32); /* If EC wake events are enabled, enable wake on EC WAKE GPE. */ diff --git a/src/mainboard/lenovo/t420/smihandler.c b/src/mainboard/lenovo/t420/smihandler.c index dd29232..bc92cf1 100644 --- a/src/mainboard/lenovo/t420/smihandler.c +++ b/src/mainboard/lenovo/t420/smihandler.c @@ -72,8 +72,6 @@ void mainboard_smi_sleep(u8 slp_typ) { - h8_usb_always_on(); - if (slp_typ == 3) { u8 ec_wake = ec_read(0x32); /* If EC wake events are enabled, enable wake on EC WAKE GPE. */ diff --git a/src/mainboard/lenovo/t420s/smihandler.c b/src/mainboard/lenovo/t420s/smihandler.c index 578aee8..0e8e6d0 100644 --- a/src/mainboard/lenovo/t420s/smihandler.c +++ b/src/mainboard/lenovo/t420s/smihandler.c @@ -102,8 +102,6 @@ void mainboard_smi_sleep(u8 slp_typ) { - h8_usb_always_on(); - if (slp_typ == 3) { u8 ec_wake = ec_read(0x32); /* If EC wake events are enabled, enable wake on EC WAKE GPE. */ diff --git a/src/mainboard/lenovo/t430/smihandler.c b/src/mainboard/lenovo/t430/smihandler.c index 910fc1a..9a567ab 100644 --- a/src/mainboard/lenovo/t430/smihandler.c +++ b/src/mainboard/lenovo/t430/smihandler.c @@ -72,8 +72,6 @@ void mainboard_smi_sleep(u8 slp_typ) { - h8_usb_always_on(); - if (slp_typ == 3) { u8 ec_wake = ec_read(0x32); /* If EC wake events are enabled, enable wake on EC WAKE GPE. */ diff --git a/src/mainboard/lenovo/t430s/smihandler.c b/src/mainboard/lenovo/t430s/smihandler.c index 79679dc..8831e9d 100644 --- a/src/mainboard/lenovo/t430s/smihandler.c +++ b/src/mainboard/lenovo/t430s/smihandler.c @@ -102,8 +102,6 @@ void mainboard_smi_sleep(u8 slp_typ) { - h8_usb_always_on(); - if (slp_typ == 3) { u8 ec_wake = ec_read(0x32); /* If EC wake events are enabled, enable wake on EC WAKE GPE. */ diff --git a/src/mainboard/lenovo/t520/smihandler.c b/src/mainboard/lenovo/t520/smihandler.c index 2c50e23..f8400dd 100644 --- a/src/mainboard/lenovo/t520/smihandler.c +++ b/src/mainboard/lenovo/t520/smihandler.c @@ -102,8 +102,6 @@ void mainboard_smi_sleep(u8 slp_typ) { - h8_usb_always_on(); - if (slp_typ == 3) { u8 ec_wake = ec_read(0x32); /* If EC wake events are enabled, enable wake on EC WAKE GPE. */ diff --git a/src/mainboard/lenovo/t530/smihandler.c b/src/mainboard/lenovo/t530/smihandler.c index c967e40..150232f 100644 --- a/src/mainboard/lenovo/t530/smihandler.c +++ b/src/mainboard/lenovo/t530/smihandler.c @@ -102,8 +102,6 @@ void mainboard_smi_sleep(u8 slp_typ) { - h8_usb_always_on(); - if (slp_typ == 3) { u8 ec_wake = ec_read(0x32); /* If EC wake events are enabled, enable wake on EC WAKE GPE. */ diff --git a/src/mainboard/lenovo/x201/cmos.layout b/src/mainboard/lenovo/x201/cmos.layout index d8d8794..0cda679 100644 --- a/src/mainboard/lenovo/x201/cmos.layout +++ b/src/mainboard/lenovo/x201/cmos.layout @@ -70,7 +70,7 @@ 419 1 e 1 power_management_beeps 420 1 e 1 low_battery_beep 421 1 e 9 sata_mode -422 1 e 11 usb_always_on +422 2 e 11 usb_always_on #423 1 r 1 unused # coreboot config options: northbridge diff --git a/src/mainboard/lenovo/x201/smihandler.c b/src/mainboard/lenovo/x201/smihandler.c index 10ca4d4..f1e2c3f 100644 --- a/src/mainboard/lenovo/x201/smihandler.c +++ b/src/mainboard/lenovo/x201/smihandler.c @@ -178,8 +178,6 @@ void mainboard_smi_sleep(u8 slp_typ) { - h8_usb_always_on(); - if (slp_typ == 3) { u8 ec_wake = ec_read(0x32); /* If EC wake events are enabled, enable wake on EC WAKE GPE. */ diff --git a/src/mainboard/lenovo/x220/cmos.layout b/src/mainboard/lenovo/x220/cmos.layout index c6e270a..d4a4ed3 100644 --- a/src/mainboard/lenovo/x220/cmos.layout +++ b/src/mainboard/lenovo/x220/cmos.layout @@ -69,7 +69,7 @@ 418 1 e 1 sticky_fn 419 1 e 1 power_management_beeps 421 1 e 9 sata_mode -422 1 e 12 usb_always_on +422 2 e 12 usb_always_on #423 1 r 1 unused # coreboot config options: cpu diff --git a/src/mainboard/lenovo/x220/smihandler.c b/src/mainboard/lenovo/x220/smihandler.c index c967e40..150232f 100644 --- a/src/mainboard/lenovo/x220/smihandler.c +++ b/src/mainboard/lenovo/x220/smihandler.c @@ -102,8 +102,6 @@ void mainboard_smi_sleep(u8 slp_typ) { - h8_usb_always_on(); - if (slp_typ == 3) { u8 ec_wake = ec_read(0x32); /* If EC wake events are enabled, enable wake on EC WAKE GPE. */ diff --git a/src/mainboard/lenovo/x230/smihandler.c b/src/mainboard/lenovo/x230/smihandler.c index a69b78f..2425927 100644 --- a/src/mainboard/lenovo/x230/smihandler.c +++ b/src/mainboard/lenovo/x230/smihandler.c @@ -72,8 +72,6 @@ void mainboard_smi_sleep(u8 slp_typ) { - h8_usb_always_on(); - if (slp_typ == 3) { u8 ec_wake = ec_read(0x32); /* If EC wake events are enabled, enable wake on EC WAKE GPE. */ -- To view, visit https://review.coreboot.org/c/coreboot/+/29565 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: If812cd1ef8fb1a24d7fadbe834f574b40cbcd56a Gerrit-Change-Number: 29565 Gerrit-PatchSet: 7 Gerrit-Owner: Nathaniel Roach <nroach44(a)gmail.com> Gerrit-Reviewer: Alexander Couzens <lynxis(a)fe80.eu> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Nathaniel Roach <nroach44(a)gmail.com> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: Philipp Deppenwiese <zaolin.daisuki(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Peter Lemenkov <lemenkov(a)gmail.com> Gerrit-MessageType: merged

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit December 2018