[coreboot-gerrit] Change in coreboot[master]: mb/lenovo/*/cmos: Port USB Always On
Patrick Rudolph (Code Review)
gerrit at coreboot.org
Thu Jun 8 11:38:13 CEST 2017
Patrick Rudolph has uploaded this change for review. ( https://review.coreboot.org/20106
Change subject: mb/lenovo/*/cmos: Port USB Always On
......................................................................
mb/lenovo/*/cmos: Port USB Always On
Port commit f1395d82: "ec/lenovo/h8: Add USB Always On"
to other Thinkpad boards, as it seems to work fine on all
generations.
Change-Id: I6dcbfaae2a444d9a679ecb64a87dc2a59b8fd281
Signed-off-by: Patrick Rudolph <siro at das-labor.org>
---
M src/mainboard/lenovo/l520/cmos.default
M src/mainboard/lenovo/l520/cmos.layout
M src/mainboard/lenovo/l520/smihandler.c
M src/mainboard/lenovo/t420/cmos.default
M src/mainboard/lenovo/t420/cmos.layout
M src/mainboard/lenovo/t420/smihandler.c
M src/mainboard/lenovo/t420s/cmos.default
M src/mainboard/lenovo/t420s/cmos.layout
M src/mainboard/lenovo/t420s/smihandler.c
M src/mainboard/lenovo/t430s/cmos.default
M src/mainboard/lenovo/t430s/cmos.layout
M src/mainboard/lenovo/t430s/smihandler.c
M src/mainboard/lenovo/t520/cmos.default
M src/mainboard/lenovo/t520/cmos.layout
M src/mainboard/lenovo/t520/smihandler.c
M src/mainboard/lenovo/t530/cmos.default
M src/mainboard/lenovo/t530/cmos.layout
M src/mainboard/lenovo/t530/smihandler.c
M src/mainboard/lenovo/x230/cmos.default
M src/mainboard/lenovo/x230/cmos.layout
M src/mainboard/lenovo/x230/smihandler.c
21 files changed, 39 insertions(+), 11 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/06/20106/1
diff --git a/src/mainboard/lenovo/l520/cmos.default b/src/mainboard/lenovo/l520/cmos.default
index 92dc2e1..f38beb4 100644
--- a/src/mainboard/lenovo/l520/cmos.default
+++ b/src/mainboard/lenovo/l520/cmos.default
@@ -15,3 +15,4 @@
trackpoint=Enable
backlight=Both
hybrid_graphics_mode=Integrated Only
+usb_always_on=Disable
\ No newline at end of file
diff --git a/src/mainboard/lenovo/l520/cmos.layout b/src/mainboard/lenovo/l520/cmos.layout
index 3c450c7..4ea91d4 100644
--- a/src/mainboard/lenovo/l520/cmos.layout
+++ b/src/mainboard/lenovo/l520/cmos.layout
@@ -67,9 +67,10 @@
416 1 e 1 trackpoint
417 1 e 1 fn_ctrl_swap
418 1 e 1 sticky_fn
-#419 2 r 0 unused
+419 1 e 1 usb_always_on
+#420 1 r 0 unused
421 1 e 9 sata_mode
-422 2 e 10 backlight
+422 2 e 10 backlight
# coreboot config options: cpu
#424 8 r 0 unused
diff --git a/src/mainboard/lenovo/l520/smihandler.c b/src/mainboard/lenovo/l520/smihandler.c
index d2f7cb3..f0c7a04 100644
--- a/src/mainboard/lenovo/l520/smihandler.c
+++ b/src/mainboard/lenovo/l520/smihandler.c
@@ -72,6 +72,8 @@
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/cmos.default b/src/mainboard/lenovo/t420/cmos.default
index 0fc3e55..d1fbcf6 100644
--- a/src/mainboard/lenovo/t420/cmos.default
+++ b/src/mainboard/lenovo/t420/cmos.default
@@ -14,3 +14,4 @@
sticky_fn=Disable
trackpoint=Enable
hybrid_graphics_mode=Integrated Only
+usb_always_on=Disable
\ No newline at end of file
diff --git a/src/mainboard/lenovo/t420/cmos.layout b/src/mainboard/lenovo/t420/cmos.layout
index 924b0f1..7e05a22 100644
--- a/src/mainboard/lenovo/t420/cmos.layout
+++ b/src/mainboard/lenovo/t420/cmos.layout
@@ -69,7 +69,8 @@
418 1 e 1 sticky_fn
419 1 e 1 power_management_beeps
421 1 e 9 sata_mode
-#422 2 r 1 unused
+422 1 e 1 usb_always_on
+#423 1 r 1 unused
# coreboot config options: cpu
#424 8 r 0 unused
diff --git a/src/mainboard/lenovo/t420/smihandler.c b/src/mainboard/lenovo/t420/smihandler.c
index eff0daf..825a20b 100644
--- a/src/mainboard/lenovo/t420/smihandler.c
+++ b/src/mainboard/lenovo/t420/smihandler.c
@@ -71,6 +71,8 @@
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/cmos.default b/src/mainboard/lenovo/t420s/cmos.default
index 0fc3e55..d1fbcf6 100644
--- a/src/mainboard/lenovo/t420s/cmos.default
+++ b/src/mainboard/lenovo/t420s/cmos.default
@@ -14,3 +14,4 @@
sticky_fn=Disable
trackpoint=Enable
hybrid_graphics_mode=Integrated Only
+usb_always_on=Disable
\ No newline at end of file
diff --git a/src/mainboard/lenovo/t420s/cmos.layout b/src/mainboard/lenovo/t420s/cmos.layout
index e9e582d..c135113 100644
--- a/src/mainboard/lenovo/t420s/cmos.layout
+++ b/src/mainboard/lenovo/t420s/cmos.layout
@@ -69,7 +69,8 @@
418 1 e 1 sticky_fn
419 1 e 1 power_management_beeps
421 1 e 9 sata_mode
-#422 2 r 1 unused
+422 1 e 1 usb_always_on
+#423 1 r 1 unused
# coreboot config options: cpu
#424 8 r 0 unused
diff --git a/src/mainboard/lenovo/t420s/smihandler.c b/src/mainboard/lenovo/t420s/smihandler.c
index 2b6e6cd..471095e 100644
--- a/src/mainboard/lenovo/t420s/smihandler.c
+++ b/src/mainboard/lenovo/t420s/smihandler.c
@@ -107,6 +107,8 @@
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/cmos.default b/src/mainboard/lenovo/t430s/cmos.default
index f7e38d2..a0abaed 100644
--- a/src/mainboard/lenovo/t430s/cmos.default
+++ b/src/mainboard/lenovo/t430s/cmos.default
@@ -14,3 +14,4 @@
sticky_fn=Disable
trackpoint=Enable
backlight=Both
+usb_always_on=Disable
\ No newline at end of file
diff --git a/src/mainboard/lenovo/t430s/cmos.layout b/src/mainboard/lenovo/t430s/cmos.layout
index f116bab..40b3998 100644
--- a/src/mainboard/lenovo/t430s/cmos.layout
+++ b/src/mainboard/lenovo/t430s/cmos.layout
@@ -67,7 +67,8 @@
416 1 e 1 trackpoint
417 1 e 1 fn_ctrl_swap
418 1 e 1 sticky_fn
-#419 2 r 0 unused
+419 1 e 1 usb_always_on
+#420 1 r 0 unused
421 1 e 9 sata_mode
422 2 e 10 backlight
diff --git a/src/mainboard/lenovo/t430s/smihandler.c b/src/mainboard/lenovo/t430s/smihandler.c
index 70ecab2..512e631 100644
--- a/src/mainboard/lenovo/t430s/smihandler.c
+++ b/src/mainboard/lenovo/t430s/smihandler.c
@@ -105,6 +105,8 @@
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/cmos.default b/src/mainboard/lenovo/t520/cmos.default
index 92dc2e1..5c21f9c 100644
--- a/src/mainboard/lenovo/t520/cmos.default
+++ b/src/mainboard/lenovo/t520/cmos.default
@@ -15,3 +15,4 @@
trackpoint=Enable
backlight=Both
hybrid_graphics_mode=Integrated Only
+usb_always_on=Disable
diff --git a/src/mainboard/lenovo/t520/cmos.layout b/src/mainboard/lenovo/t520/cmos.layout
index 3c450c7..4ea91d4 100644
--- a/src/mainboard/lenovo/t520/cmos.layout
+++ b/src/mainboard/lenovo/t520/cmos.layout
@@ -67,9 +67,10 @@
416 1 e 1 trackpoint
417 1 e 1 fn_ctrl_swap
418 1 e 1 sticky_fn
-#419 2 r 0 unused
+419 1 e 1 usb_always_on
+#420 1 r 0 unused
421 1 e 9 sata_mode
-422 2 e 10 backlight
+422 2 e 10 backlight
# coreboot config options: cpu
#424 8 r 0 unused
diff --git a/src/mainboard/lenovo/t520/smihandler.c b/src/mainboard/lenovo/t520/smihandler.c
index c48cf3d..3fa8e30 100644
--- a/src/mainboard/lenovo/t520/smihandler.c
+++ b/src/mainboard/lenovo/t520/smihandler.c
@@ -107,6 +107,8 @@
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/cmos.default b/src/mainboard/lenovo/t530/cmos.default
index 92dc2e1..f38beb4 100644
--- a/src/mainboard/lenovo/t530/cmos.default
+++ b/src/mainboard/lenovo/t530/cmos.default
@@ -15,3 +15,4 @@
trackpoint=Enable
backlight=Both
hybrid_graphics_mode=Integrated Only
+usb_always_on=Disable
\ No newline at end of file
diff --git a/src/mainboard/lenovo/t530/cmos.layout b/src/mainboard/lenovo/t530/cmos.layout
index cdcc896..c31a905 100644
--- a/src/mainboard/lenovo/t530/cmos.layout
+++ b/src/mainboard/lenovo/t530/cmos.layout
@@ -67,9 +67,10 @@
416 1 e 1 trackpoint
417 1 e 1 fn_ctrl_swap
418 1 e 1 sticky_fn
-#419 2 r 0 unused
+419 1 e 1 usb_always_on
+#420 1 r 0 unused
421 1 e 9 sata_mode
-422 2 e 10 backlight
+422 2 e 10 backlight
# coreboot config options: cpu
#424 8 r 0 unused
diff --git a/src/mainboard/lenovo/t530/smihandler.c b/src/mainboard/lenovo/t530/smihandler.c
index c7ca206..1dfd87e 100644
--- a/src/mainboard/lenovo/t530/smihandler.c
+++ b/src/mainboard/lenovo/t530/smihandler.c
@@ -107,6 +107,8 @@
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/cmos.default b/src/mainboard/lenovo/x230/cmos.default
index f7e38d2..a0abaed 100644
--- a/src/mainboard/lenovo/x230/cmos.default
+++ b/src/mainboard/lenovo/x230/cmos.default
@@ -14,3 +14,4 @@
sticky_fn=Disable
trackpoint=Enable
backlight=Both
+usb_always_on=Disable
\ No newline at end of file
diff --git a/src/mainboard/lenovo/x230/cmos.layout b/src/mainboard/lenovo/x230/cmos.layout
index 3766453..b0c9e06 100644
--- a/src/mainboard/lenovo/x230/cmos.layout
+++ b/src/mainboard/lenovo/x230/cmos.layout
@@ -67,9 +67,10 @@
416 1 e 1 trackpoint
417 1 e 1 fn_ctrl_swap
418 1 e 1 sticky_fn
-#419 2 r 0 unused
+419 1 e 1 usb_always_on
+#420 1 r 0 unused
421 1 e 9 sata_mode
-422 2 e 10 backlight
+422 2 e 10 backlight
# coreboot config options: cpu
#424 8 r 0 unused
diff --git a/src/mainboard/lenovo/x230/smihandler.c b/src/mainboard/lenovo/x230/smihandler.c
index 09dcbf2..4572cae 100644
--- a/src/mainboard/lenovo/x230/smihandler.c
+++ b/src/mainboard/lenovo/x230/smihandler.c
@@ -71,6 +71,8 @@
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/20106
To unsubscribe, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6dcbfaae2a444d9a679ecb64a87dc2a59b8fd281
Gerrit-Change-Number: 20106
Gerrit-PatchSet: 1
Gerrit-Owner: Patrick Rudolph <siro at das-labor.org>
More information about the coreboot-gerrit
mailing list