Patrick Rudolph has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/32441
Change subject: device: ignore NONE devices behind bridge
......................................................................
device: ignore NONE devices behind bridge
Ignore NONE devices in dev_is_active_bridge that are commonly used to
indicate hotplug capable ports.
Tested on Lenovo T520:
The empty ExpressCard Slot is no longer marked as active bridge.
Change-Id: I23347270aaab17647023969091ce4bcdd41dd57a
Signed-off-by: Patrick Rudolph <patrick.rudolph(a)9elements.com>
---
M src/device/device_util.c
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/41/32441/1
diff --git a/src/device/device_util.c b/src/device/device_util.c
index 5c4f911..47df305 100644
--- a/src/device/device_util.c
+++ b/src/device/device_util.c
@@ -628,7 +628,7 @@
/*
* Returns true if the device is an enabled bridge that has at least
- * one enabled device on its secondary bus.
+ * one enabled device on its secondary bus that is not of type NONE.
*/
bool dev_is_active_bridge(struct device *dev)
{
@@ -643,6 +643,9 @@
for (link = dev->link_list; link; link = link->next) {
for (child = link->children; child; child = child->sibling) {
+ if (child->path.type == DEVICE_PATH_NONE)
+ continue;
+
if (child->enabled)
return 1;
}
--
To view, visit https://review.coreboot.org/c/coreboot/+/32441
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I23347270aaab17647023969091ce4bcdd41dd57a
Gerrit-Change-Number: 32441
Gerrit-PatchSet: 1
Gerrit-Owner: Patrick Rudolph <patrick.rudolph(a)9elements.com>
Gerrit-MessageType: newchange
EricR Lai has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/32519
Change subject: mb/google/sarien: Turn off camera power when s0ix
......................................................................
mb/google/sarien: Turn off camera power when s0ix
Turn off camera power when s0ix for power saving.
ACPI _ON/_OFF is not taken by UVC driver, so invoke
s0ix method from LPIT.
BUG=b:129177593
TEST= measure camera power comsumption is 0mV under s0ix
Change-Id: I5a9b7ec1e95cc9931d8d5f2dc1254805c9d0ffed
Signed-off-by: Eric Lai <ericr_lai(a)compal.corp-partner.google.com>
---
M src/mainboard/google/sarien/dsdt.asl
A src/mainboard/google/sarien/variants/arcada/include/variant/acpi/mainboard.asl
A src/mainboard/google/sarien/variants/sarien/include/variant/acpi/mainboard.asl
M src/soc/intel/cannonlake/acpi/lpit.asl
4 files changed, 62 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/19/32519/1
diff --git a/src/mainboard/google/sarien/dsdt.asl b/src/mainboard/google/sarien/dsdt.asl
index e5b0cca..58e0704 100644
--- a/src/mainboard/google/sarien/dsdt.asl
+++ b/src/mainboard/google/sarien/dsdt.asl
@@ -40,6 +40,8 @@
#include <soc/intel/cannonlake/acpi/northbridge.asl>
#include <soc/intel/cannonlake/acpi/southbridge.asl>
}
+ /* Per board variant mainboard hooks. */
+ #include <variant/acpi/mainboard.asl>
}
#if CONFIG(CHROMEOS)
diff --git a/src/mainboard/google/sarien/variants/arcada/include/variant/acpi/mainboard.asl b/src/mainboard/google/sarien/variants/arcada/include/variant/acpi/mainboard.asl
new file mode 100644
index 0000000..7c22710
--- /dev/null
+++ b/src/mainboard/google/sarien/variants/arcada/include/variant/acpi/mainboard.asl
@@ -0,0 +1,29 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2019 Intel Corp.
+ *
+ * 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.
+ */
+
+#define CAM_EN GPP_B11
+
+/* Method called from LPIT prior to enter s0ix state */
+Method (MS0X, 1) {
+ If (Arg0) {
+ Printf ("OS Enter S0ix")
+ /* Turn on camera power */
+ \_SB.PCI0.STXS (GPP_B11)
+ } Else {
+ Printf ("OS Exit S0ix")
+ /* Turn off camera power */
+ \_SB.PCI0.CTXS (GPP_B11)
+ }
+}
diff --git a/src/mainboard/google/sarien/variants/sarien/include/variant/acpi/mainboard.asl b/src/mainboard/google/sarien/variants/sarien/include/variant/acpi/mainboard.asl
new file mode 100644
index 0000000..7c22710
--- /dev/null
+++ b/src/mainboard/google/sarien/variants/sarien/include/variant/acpi/mainboard.asl
@@ -0,0 +1,29 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2019 Intel Corp.
+ *
+ * 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.
+ */
+
+#define CAM_EN GPP_B11
+
+/* Method called from LPIT prior to enter s0ix state */
+Method (MS0X, 1) {
+ If (Arg0) {
+ Printf ("OS Enter S0ix")
+ /* Turn on camera power */
+ \_SB.PCI0.STXS (GPP_B11)
+ } Else {
+ Printf ("OS Exit S0ix")
+ /* Turn off camera power */
+ \_SB.PCI0.CTXS (GPP_B11)
+ }
+}
diff --git a/src/soc/intel/cannonlake/acpi/lpit.asl b/src/soc/intel/cannonlake/acpi/lpit.asl
index 8515806..00115a5 100644
--- a/src/soc/intel/cannonlake/acpi/lpit.asl
+++ b/src/soc/intel/cannonlake/acpi/lpit.asl
@@ -62,12 +62,14 @@
*/
If(Arg2 == 5) {
\_SB.PCI0.LPCB.EC0.S0IX(1)
+ \_SB.MS0X(1)
}
/*
* Function 6.
*/
If(Arg2 == 6) {
\_SB.PCI0.LPCB.EC0.S0IX(0)
+ \_SB.MS0X(0)
}
}
Return(Buffer(One) {0x00})
--
To view, visit https://review.coreboot.org/c/coreboot/+/32519
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I5a9b7ec1e95cc9931d8d5f2dc1254805c9d0ffed
Gerrit-Change-Number: 32519
Gerrit-PatchSet: 1
Gerrit-Owner: EricR Lai <ericr_lai(a)compal.corp-partner.google.com>
Gerrit-MessageType: newchange
Martin Roth has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/32344
Change subject: Update vboot submodule to upstream master
......................................................................
Update vboot submodule to upstream master
Updating from commit id 304aa429:
2019-03-12 10:38:56 -0700 - (futility: updater: Unit test for preserving sections using FMAP flags)
to commit id dccea9ae:
2019-04-15 02:06:22 -0700 - (vboot: add magic and version to vb2_shared_data)
This brings in 37 new commits.
Change-Id: Ia91fadf4f50d9b7ce14143aaa0a1e2e1c5cbef07
Signed-off-by: Martin Roth <martinroth(a)google.com>
---
M 3rdparty/vboot
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/44/32344/1
diff --git a/3rdparty/vboot b/3rdparty/vboot
index 304aa42..dccea9a 160000
--- a/3rdparty/vboot
+++ b/3rdparty/vboot
@@ -1 +1 @@
-Subproject commit 304aa429c1a04cda3ab2ce37b9e31af84405bfca
+Subproject commit dccea9ae88059c8cb7dff76d2682835184fc8338
--
To view, visit https://review.coreboot.org/c/coreboot/+/32344
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ia91fadf4f50d9b7ce14143aaa0a1e2e1c5cbef07
Gerrit-Change-Number: 32344
Gerrit-PatchSet: 1
Gerrit-Owner: Martin Roth <martinroth(a)google.com>
Gerrit-MessageType: newchange