coreboot-gerrit July 2018

coreboot-gerrit@coreboot.org

1 participants
877 discussions

Change in coreboot[master]: src: rename EC_ENABLE_TBMC_DEVICE to _TABLET_
by Furquan Shaikh (Code Review) 23 Jul '18

23 Jul '18

Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/27608 ) Change subject: src: rename EC_ENABLE_TBMC_DEVICE to _TABLET_ ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/27608 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie1e99ff6a9689dc9fc0236f060cb7d6da8821c11 Gerrit-Change-Number: 27608 Gerrit-PatchSet: 1 Gerrit-Owner: Matt Delco <delco(a)chromium.org> Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Mon, 23 Jul 2018 19:05:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes

1 0

Change in coreboot[master]: src: rename EC_ENABLE_TBMC_DEVICE to _TABLET_
by Matt Delco (Code Review) 23 Jul '18

23 Jul '18

Matt Delco has uploaded this change for review. ( https://review.coreboot.org/27608 Change subject: src: rename EC_ENABLE_TBMC_DEVICE to _TABLET_ ...................................................................... src: rename EC_ENABLE_TBMC_DEVICE to _TABLET_ The TBMC device was replaced with a different tablet device. This change renames the instances of EC_ENABLE_TBMC_DEVICE to be a more generic EC_ENABLE_TABLET_DEVICE. Change-Id: Ie1e99ff6a9689dc9fc0236f060cb7d6da8821c11 Signed-off-by: Matt Delco <delco(a)chromium.org> --- M src/ec/google/chromeec/acpi/ec.asl M src/mainboard/google/eve/ec.h M src/mainboard/google/octopus/variants/phaser/include/variant/ec.h M src/mainboard/google/octopus/variants/yorp/include/variant/ec.h M src/mainboard/google/poppy/variants/nami/include/variant/ec.h M src/mainboard/google/poppy/variants/nautilus/include/variant/ec.h M src/mainboard/google/reef/variants/baseboard/include/baseboard/ec.h 7 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/27608/1 diff --git a/src/ec/google/chromeec/acpi/ec.asl b/src/ec/google/chromeec/acpi/ec.asl index 36cfcde..1e13a95 100644 --- a/src/ec/google/chromeec/acpi/ec.asl +++ b/src/ec/google/chromeec/acpi/ec.asl @@ -374,7 +374,7 @@ #ifdef EC_ENABLE_TABLET_EVENT \_SB.DPTF.TPET() #endif -#ifdef EC_ENABLE_TBMC_DEVICE +#ifdef EC_ENABLE_TABLET_DEVICE If (LEqual ((^TBMD), One)) { Notify (VBTN, 0xCC) } Else { @@ -551,7 +551,7 @@ #include "pd.asl" #endif -#ifdef EC_ENABLE_TBMC_DEVICE +#ifdef EC_ENABLE_TABLET_DEVICE #include "vbtn.asl" #endif } diff --git a/src/mainboard/google/eve/ec.h b/src/mainboard/google/eve/ec.h index 1b55248..0f3117f 100644 --- a/src/mainboard/google/eve/ec.h +++ b/src/mainboard/google/eve/ec.h @@ -79,7 +79,7 @@ /* Enable Tablet switch */ #define EC_ENABLE_TABLET_EVENT -#define EC_ENABLE_TBMC_DEVICE +#define EC_ENABLE_TABLET_DEVICE #define SIO_EC_MEMMAP_ENABLE /* EC Memory Map Resources */ #define SIO_EC_HOST_ENABLE /* EC Host Interface Resources */ diff --git a/src/mainboard/google/octopus/variants/phaser/include/variant/ec.h b/src/mainboard/google/octopus/variants/phaser/include/variant/ec.h index 48cb584..00b9efb 100644 --- a/src/mainboard/google/octopus/variants/phaser/include/variant/ec.h +++ b/src/mainboard/google/octopus/variants/phaser/include/variant/ec.h @@ -19,6 +19,6 @@ #include <baseboard/ec.h> /* Enable Tablet switch */ -#define EC_ENABLE_TBMC_DEVICE +#define EC_ENABLE_TABLET_DEVICE #endif diff --git a/src/mainboard/google/octopus/variants/yorp/include/variant/ec.h b/src/mainboard/google/octopus/variants/yorp/include/variant/ec.h index 48cb584..00b9efb 100644 --- a/src/mainboard/google/octopus/variants/yorp/include/variant/ec.h +++ b/src/mainboard/google/octopus/variants/yorp/include/variant/ec.h @@ -19,6 +19,6 @@ #include <baseboard/ec.h> /* Enable Tablet switch */ -#define EC_ENABLE_TBMC_DEVICE +#define EC_ENABLE_TABLET_DEVICE #endif diff --git a/src/mainboard/google/poppy/variants/nami/include/variant/ec.h b/src/mainboard/google/poppy/variants/nami/include/variant/ec.h index a5a0196..72625d5 100644 --- a/src/mainboard/google/poppy/variants/nami/include/variant/ec.h +++ b/src/mainboard/google/poppy/variants/nami/include/variant/ec.h @@ -70,7 +70,7 @@ /* Enable Tablet switch */ #define EC_ENABLE_TABLET_EVENT -#define EC_ENABLE_TBMC_DEVICE +#define EC_ENABLE_TABLET_DEVICE #define SIO_EC_MEMMAP_ENABLE /* EC Memory Map Resources */ #define SIO_EC_HOST_ENABLE /* EC Host Interface Resources */ diff --git a/src/mainboard/google/poppy/variants/nautilus/include/variant/ec.h b/src/mainboard/google/poppy/variants/nautilus/include/variant/ec.h index 70f12d5..5d15adb 100644 --- a/src/mainboard/google/poppy/variants/nautilus/include/variant/ec.h +++ b/src/mainboard/google/poppy/variants/nautilus/include/variant/ec.h @@ -72,7 +72,7 @@ #define EC_ENABLE_LID_SWITCH #define EC_ENABLE_WAKE_PIN GPE_EC_WAKE #define EC_ENABLE_TABLET_EVENT -#define EC_ENABLE_TBMC_DEVICE +#define EC_ENABLE_TABLET_DEVICE #define SIO_EC_MEMMAP_ENABLE /* EC Memory Map Resources */ #define SIO_EC_HOST_ENABLE /* EC Host Interface Resources */ diff --git a/src/mainboard/google/reef/variants/baseboard/include/baseboard/ec.h b/src/mainboard/google/reef/variants/baseboard/include/baseboard/ec.h index 6e1de7a..f89afd8 100644 --- a/src/mainboard/google/reef/variants/baseboard/include/baseboard/ec.h +++ b/src/mainboard/google/reef/variants/baseboard/include/baseboard/ec.h @@ -71,7 +71,7 @@ #define EC_ENABLE_LID_SWITCH #define EC_ENABLE_WAKE_PIN GPE_EC_WAKE -#define EC_ENABLE_TBMC_DEVICE +#define EC_ENABLE_TABLET_DEVICE #define SIO_EC_MEMMAP_ENABLE /* EC Memory Map Resources */ #define SIO_EC_HOST_ENABLE /* EC Host Interface Resources */ -- To view, visit https://review.coreboot.org/27608 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie1e99ff6a9689dc9fc0236f060cb7d6da8821c11 Gerrit-Change-Number: 27608 Gerrit-PatchSet: 1 Gerrit-Owner: Matt Delco <delco(a)chromium.org>

1 0

Change in coreboot[master]: ec/google/chromeec/acpi: Replace TBMC device with Intel Device
by Matt Delco (Code Review) 23 Jul '18

23 Jul '18

Matt Delco has uploaded this change for review. ( https://review.coreboot.org/27607 Change subject: ec/google/chromeec/acpi: Replace TBMC device with Intel Device ...................................................................... ec/google/chromeec/acpi: Replace TBMC device with Intel Device The TBMC device has a subset of the functionality of Intel's Virtual Buttons device. Replacing the former with the latter will help to avoid the need to support a separate and dedicated driver in the future. I tested on eve that a change works with a kernel that contains a driver for the device. Change-Id: Id486c540ecbb4c0b7a045e05405ef589aebe03c8 Signed-off-by: Matt Delco <delco(a)chromium.org> --- M src/ec/google/chromeec/acpi/ec.asl D src/ec/google/chromeec/acpi/tbmc.asl A src/ec/google/chromeec/acpi/vbtn.asl 3 files changed, 53 insertions(+), 31 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/07/27607/1 diff --git a/src/ec/google/chromeec/acpi/ec.asl b/src/ec/google/chromeec/acpi/ec.asl index 94917dd..36cfcde 100644 --- a/src/ec/google/chromeec/acpi/ec.asl +++ b/src/ec/google/chromeec/acpi/ec.asl @@ -375,7 +375,11 @@ \_SB.DPTF.TPET() #endif #ifdef EC_ENABLE_TBMC_DEVICE - Notify (TBMC, 0x80) + If (LEqual ((^TBMD), One)) { + Notify (VBTN, 0xCC) + } Else { + Notify (VBTN, 0xCD) + } #endif } @@ -548,6 +552,6 @@ #endif #ifdef EC_ENABLE_TBMC_DEVICE - #include "tbmc.asl" + #include "vbtn.asl" #endif } diff --git a/src/ec/google/chromeec/acpi/tbmc.asl b/src/ec/google/chromeec/acpi/tbmc.asl deleted file mode 100644 index 25a27ef1b..0000000 --- a/src/ec/google/chromeec/acpi/tbmc.asl +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 2017 Google Inc. - * - * 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. - */ - -Device (TBMC) -{ - Name (_HID, "GOOG0006") - Name (_UID, 1) - Name (_DDN, "Tablet Motion Control") - Method (TBMC) - { - If (LEqual (^^RCTM, One)) { - Return (0x1) - } Else { - Return (0x0) - } - } -} diff --git a/src/ec/google/chromeec/acpi/vbtn.asl b/src/ec/google/chromeec/acpi/vbtn.asl new file mode 100644 index 0000000..83eb092 --- /dev/null +++ b/src/ec/google/chromeec/acpi/vbtn.asl @@ -0,0 +1,47 @@ +/* + * This file is part of the coreboot project. + * + * Copyright 2017 Google Inc. + * + * 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. + */ + +// VGBS reports 0x40 when NOT in tablet mode. +// Device is sent event 0xCB/0xCC for tablet mode, 0xCA/0xCD for laptop mode +Device (VBTN) +{ + Name (_HID, "INT33D6") + Name (_DDN, "Tablet Virtual Buttons") + Method (_STA, 0, Serialized) + { + Return (0x0f) + } + Method (VBDL, 0, Serialized) + { + } + Method (VGBS) + { + If (LEqual (^^RCTM, One)) { + Return (0x0) + } Else { + Return (0x40) + } + } +} + +Device (VBTO) +{ + Name (_HID, "INT33D3") + Name (_CID, "PNP0C60") + Method (_STA, 0, Serialized) + { + Return (0x0f) + } +} -- To view, visit https://review.coreboot.org/27607 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id486c540ecbb4c0b7a045e05405ef589aebe03c8 Gerrit-Change-Number: 27607 Gerrit-PatchSet: 1 Gerrit-Owner: Matt Delco <delco(a)chromium.org>

1 0

Change in coreboot[master]: mainboard/google: set type to convertible
by Matt Delco (Code Review) 23 Jul '18

23 Jul '18

Matt Delco has uploaded this change for review. ( https://review.coreboot.org/27606 Change subject: mainboard/google: set type to convertible ...................................................................... mainboard/google: set type to convertible A subsequent change will change which acpi device is used to signal tablet mode changes. The intel-vbtn driver on Linux has a workaround that checks that the type is a chasis, so systems that will use this driver need to specify they're a convertible. Change-Id: I05772d9d822ea5756e9dd8bf5b478046c5de3c5f Signed-off-by: Matt Delco <delco(a)chromium.org> --- M src/mainboard/google/eve/Kconfig M src/mainboard/google/octopus/Kconfig M src/mainboard/google/poppy/Kconfig M src/mainboard/google/reef/Kconfig 4 files changed, 46 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/06/27606/1 diff --git a/src/mainboard/google/eve/Kconfig b/src/mainboard/google/eve/Kconfig index 7c98339..8da66fe 100644 --- a/src/mainboard/google/eve/Kconfig +++ b/src/mainboard/google/eve/Kconfig @@ -69,6 +69,11 @@ int default 8 +# This type is checked by Linux tablet mode driver (intel-vbtn) +config SMBIOS_ENCLOSURE_TYPE + hex + default 0x1f # SMBIOS_ENCLOSURE_CONVERTIBLE + config INCLUDE_NHLT_BLOBS bool "Include blobs for audio." select NHLT_RT5514 diff --git a/src/mainboard/google/octopus/Kconfig b/src/mainboard/google/octopus/Kconfig index dc58ec8..ebbcd4f 100644 --- a/src/mainboard/google/octopus/Kconfig +++ b/src/mainboard/google/octopus/Kconfig @@ -100,4 +100,22 @@ int default 63 # GPE0_DW1_31 (GPIO_63) +if BOARD_GOOGLE_PHASER + +# This type is checked by Linux tablet mode driver (intel-vbtn) +config SMBIOS_ENCLOSURE_TYPE + hex + default 0x1f # SMBIOS_ENCLOSURE_CONVERTIBLE + +endif # BOARD_GOOGLE_PHASER + +if BOARD_GOOGLE_YORP + +# This type is checked by Linux tablet mode driver (intel-vbtn) +config SMBIOS_ENCLOSURE_TYPE + hex + default 0x1f # SMBIOS_ENCLOSURE_CONVERTIBLE + +endif # BOARD_GOOGLE_YORP + endif # BOARD_GOOGLE_OCTOPUS diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig index 06501f7..54622dd 100644 --- a/src/mainboard/google/poppy/Kconfig +++ b/src/mainboard/google/poppy/Kconfig @@ -118,6 +118,24 @@ string "OEM ID table" default "" +if BOARD_GOOGLE_NAUTILUS + +# This type is checked by Linux tablet mode driver (intel-vbtn) +config SMBIOS_ENCLOSURE_TYPE + hex + default 0x1f # SMBIOS_ENCLOSURE_CONVERTIBLE + +endif # BOARD_GOOGLE_NAUTILUS + +if BOARD_GOOGLE_NAMI + +# This type is checked by Linux tablet mode driver (intel-vbtn) +config SMBIOS_ENCLOSURE_TYPE + hex + default 0x1f # SMBIOS_ENCLOSURE_CONVERTIBLE + +endif # BOARD_GOOGLE_NAMI + config TPM_TIS_ACPI_INTERRUPT int default 64 # GPE0_DW2_00 (GPP_E0) diff --git a/src/mainboard/google/reef/Kconfig b/src/mainboard/google/reef/Kconfig index 09b2e61..d1a0632 100644 --- a/src/mainboard/google/reef/Kconfig +++ b/src/mainboard/google/reef/Kconfig @@ -109,4 +109,9 @@ default 0xe00 if CHROMEOS default 0xc00 +# This type is checked by Linux tablet mode driver (intel-vbtn) +config SMBIOS_ENCLOSURE_TYPE + hex + default 0x1f # SMBIOS_ENCLOSURE_CONVERTIBLE + endif # BOARD_GOOGLE_REEF -- To view, visit https://review.coreboot.org/27606 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I05772d9d822ea5756e9dd8bf5b478046c5de3c5f Gerrit-Change-Number: 27606 Gerrit-PatchSet: 1 Gerrit-Owner: Matt Delco <delco(a)chromium.org>

1 0

Change in coreboot[master]: mainboard/google/nocturne: simplify camera power references
by Lijian Zhao (Code Review) 23 Jul '18

23 Jul '18

Lijian Zhao has posted comments on this change. ( https://review.coreboot.org/27605 ) Change subject: mainboard/google/nocturne: simplify camera power references ...................................................................... Patch Set 1: Either one is fine, you can see ACPI spec chapter 19 for ASL 2.0 operator, that can make it more simple and closer to regular C -- To view, visit https://review.coreboot.org/27605 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9c9f6c712b075450539d5b84ac5bb221b3cbb57e Gerrit-Change-Number: 27605 Gerrit-PatchSet: 1 Gerrit-Owner: Matt Delco <delco(a)chromium.org> Gerrit-Assignee: Furquan Shaikh <furquan(a)google.com> Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com> Gerrit-Reviewer: Lijian Zhao <lijian.zhao(a)intel.com> Gerrit-Reviewer: Rajmohan Mani <rajmohan.mani(a)intel.com> Gerrit-Reviewer: Tomasz Figa <tfiga(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Mon, 23 Jul 2018 18:19:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No

1 0

Change in coreboot[master]: nb/i945: Fix sdram_rcomp_buffer_strength_and_slew for i945gc
by build bot (Jenkins) (Code Review) 23 Jul '18

23 Jul '18

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/27590 ) Change subject: nb/i945: Fix sdram_rcomp_buffer_strength_and_slew for i945gc ...................................................................... Patch Set 3: (1 comment) https://review.coreboot.org/#/c/27590/3/src/northbridge/intel/i945/raminit.c File src/northbridge/intel/i945/raminit.c: https://review.coreboot.org/#/c/27590/3/src/northbridge/intel/i945/raminit.… PS3, Line 1048: int offset = IS_ENABLED(CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM) ? 1 : 0; line over 80 characters -- To view, visit https://review.coreboot.org/27590 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iff1705788fdffeacd94fe5e50507733ff7c0f96b Gerrit-Change-Number: 27590 Gerrit-PatchSet: 3 Gerrit-Owner: Elyes HAOUAS <ehaouas(a)noos.fr> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Elyes HAOUAS <ehaouas(a)noos.fr> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Mon, 23 Jul 2018 18:07:51 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No

1 0

Change in coreboot[master]: mainboard/google/nocturne: simplify camera power references
by Furquan Shaikh (Code Review) 23 Jul '18

23 Jul '18

Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/27605 ) Change subject: mainboard/google/nocturne: simplify camera power references ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/27605 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9c9f6c712b075450539d5b84ac5bb221b3cbb57e Gerrit-Change-Number: 27605 Gerrit-PatchSet: 1 Gerrit-Owner: Matt Delco <delco(a)chromium.org> Gerrit-Assignee: Furquan Shaikh <furquan(a)google.com> Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com> Gerrit-Reviewer: Lijian Zhao <lijian.zhao(a)intel.com> Gerrit-Reviewer: Rajmohan Mani <rajmohan.mani(a)intel.com> Gerrit-Reviewer: Tomasz Figa <tfiga(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Mon, 23 Jul 2018 18:04:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes

1 0

Change in coreboot[master]: mainboard/google/nocturne: simplify camera power references
by Furquan Shaikh (Code Review) 23 Jul '18

23 Jul '18

Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/27605 ) Change subject: mainboard/google/nocturne: simplify camera power references ...................................................................... Patch Set 1: > Patch Set 1: > > +Rajmohan, +Tomasz to comment on the reference count and how the kernel driver is handling it. Looking at the linux kernel side of implementation: https://github.com/torvalds/linux/blob/master/drivers/acpi/power.c#L280, I agree with Matt, that this is already handled by acpi_power_off_unlocked to ensure that the power resource doesn't get turned off before its refcount drops to 0. So, the check in coreboot ACPI table seems redundant. -- To view, visit https://review.coreboot.org/27605 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9c9f6c712b075450539d5b84ac5bb221b3cbb57e Gerrit-Change-Number: 27605 Gerrit-PatchSet: 1 Gerrit-Owner: Matt Delco <delco(a)chromium.org> Gerrit-Assignee: Furquan Shaikh <furquan(a)google.com> Gerrit-Reviewer: Lijian Zhao <lijian.zhao(a)intel.com> Gerrit-Reviewer: Rajmohan Mani <rajmohan.mani(a)intel.com> Gerrit-Reviewer: Tomasz Figa <tfiga(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Furquan Shaikh <furquan(a)google.com> Gerrit-Comment-Date: Mon, 23 Jul 2018 18:00:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No

1 0

Change in coreboot[master]: mainboard/google/nocturne: simplify camera power references
by Furquan Shaikh (Code Review) 23 Jul '18

23 Jul '18

Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/27605 ) Change subject: mainboard/google/nocturne: simplify camera power references ...................................................................... Patch Set 1: +Rajmohan, +Tomasz to comment on the reference count and how the kernel driver is handling it. -- To view, visit https://review.coreboot.org/27605 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9c9f6c712b075450539d5b84ac5bb221b3cbb57e Gerrit-Change-Number: 27605 Gerrit-PatchSet: 1 Gerrit-Owner: Matt Delco <delco(a)chromium.org> Gerrit-Assignee: Furquan Shaikh <furquan(a)google.com> Gerrit-Reviewer: Lijian Zhao <lijian.zhao(a)intel.com> Gerrit-Reviewer: Rajmohan Mani <rajmohan.mani(a)intel.com> Gerrit-Reviewer: Tomasz Figa <tfiga(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Furquan Shaikh <furquan(a)google.com> Gerrit-Comment-Date: Mon, 23 Jul 2018 17:55:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No

1 0

Change in coreboot[master]: mainboard/google/nocturne: simplify camera power references
by Matt Delco (Code Review) 23 Jul '18

23 Jul '18

Matt Delco has uploaded this change for review. ( https://review.coreboot.org/27605 Change subject: mainboard/google/nocturne: simplify camera power references ...................................................................... mainboard/google/nocturne: simplify camera power references This change primarily moves the PowerResource up to a more common scope so that the _PRx references are simpler (the ^ scope modifier isn't well supported everywhere amongst OSes and drivers, and I've got an OS that can't boot with the way things are currently laid out). I've also not seen a firmware outside of coreboot that tries to reference count _ON and _OFF. Isn't it up to the OS to deference count, and whatever it tells ACPI is what should happen (i.e., on means on and off means off)? I could do basic comparison for 1 and 0 but LEqual seems to be what other firmwares use (I presume to permit subsequent attempts at _OFF to affect potentially problematic hardware). Some of the _UIDs are also duplicated, so I've made them unique. A few cosmetic changes were made so that diffing cam0.asl against cam1.asl has fewer extraneous differences. Change-Id: I9c9f6c712b075450539d5b84ac5bb221b3cbb57e Signed-off-by: Matt Delco <delco(a)chromium.org> --- M src/mainboard/google/poppy/variants/nocturne/include/variant/acpi/cam0.asl M src/mainboard/google/poppy/variants/nocturne/include/variant/acpi/cam1.asl 2 files changed, 88 insertions(+), 123 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/05/27605/1 diff --git a/src/mainboard/google/poppy/variants/nocturne/include/variant/acpi/cam0.asl b/src/mainboard/google/poppy/variants/nocturne/include/variant/acpi/cam0.asl index 27f1275..ec4430d 100644 --- a/src/mainboard/google/poppy/variants/nocturne/include/variant/acpi/cam0.asl +++ b/src/mainboard/google/poppy/variants/nocturne/include/variant/acpi/cam0.asl @@ -15,6 +15,42 @@ Scope (\_SB.PCI0.I2C3) { + PowerResource (FCPR, 0, 0) + { + Name (STA, 0) + Method (_ON, 0, Serialized) { + If (LEqual(STA, 0)) { + CTXS (GPIO_FCAM_RST_L) + STXS (GPIO_FCAM_PWR_EN) + STXS (GPIO_PCH_FCAM_CLK_EN) + Sleep (3) + STXS (GPIO_FCAM_RST_L) + + /* + * A delay of T7 (minimum of 5 ms) + T8 + * (max 5 ms + delay of coarse integration + * time value + 14 H, time for 14 horizontal + * lines) is needed to have the sensor ready + * for streaming, as soon as the power on + * sequence completes + */ + Sleep (11) + Store (1, STA) + } + } + Method (_OFF, 0, Serialized) { + If (LEqual(STA, 1)) { + CTXS (GPIO_PCH_FCAM_CLK_EN) + CTXS (GPIO_FCAM_RST_L) + CTXS (GPIO_FCAM_PWR_EN) + Store (0, STA) + } + } + Method (_STA, 0, NotSerialized) { + Return (STA) + } + } + Device (CAM0) { Name (_HID, "SONY319A") /* _HID: Hardware ID */ @@ -29,65 +65,13 @@ Name (_CRS, ResourceTemplate () { I2cSerialBus (0x0010, ControllerInitiated, 0x00061A80, - AddressingMode7Bit, "\\_SB.PCI0.I2C3", - 0x00, ResourceConsumer, , - ) + AddressingMode7Bit, "\\_SB.PCI0.I2C3", + 0x00, ResourceConsumer, , + ) }) - Name (STA, 0) - Method (PMON, 0, Serialized) { - If (STA == 0) { - CTXS (GPIO_FCAM_RST_L) - STXS (GPIO_FCAM_PWR_EN) - STXS (GPIO_PCH_FCAM_CLK_EN) - Sleep(3) - STXS (GPIO_FCAM_RST_L) - - /* - * A delay of T7 (minimum of 5 ms) + T8 - * (max 5 ms + delay of coarse integration - * time value + 14 H, time for 14 horizontal - * lines) is needed to have the sensor ready - * for streaming, as soon as the power on - * sequence completes - */ - Sleep(11); - } - STA++ - } - - Method (PMOF, 0, Serialized) { - If (STA == 0) { - Return - } - STA-- - If (STA == 0) { - CTXS (GPIO_PCH_FCAM_CLK_EN) - CTXS (GPIO_FCAM_RST_L) - CTXS (GPIO_FCAM_PWR_EN) - } - } - - Name (_PR0, Package (0x01) { FCPR }) - Name (_PR3, Package (0x01) { FCPR }) - - /* Power resource methods for Rear Camera */ - PowerResource (FCPR, 0, 0) { - Method (_ON, 0, Serialized) { - PMON () - } - Method (_OFF, 0, Serialized) { - PMOF () - } - Method (_STA, 0, Serialized) { - If (LGreater(STA,0)) { - Return (0x1) - } - Else { - Return (0x0) - } - } - } + Name (_PR0, Package () { FCPR }) + Name (_PR3, Package () { FCPR }) /* Port0 of CAM0 is connected to port0 of CIO2 device */ Name (_DSD, Package () { @@ -147,11 +131,10 @@ AddressingMode7Bit, "\\_SB.PCI0.I2C3", 0x00, ResourceConsumer, ,) }) + Name (_DEP, Package () { CAM0 }) - Name (_DEP, Package() { ^^I2C3.CAM0 }) - - Name (_PR0, Package (0x01) { ^^I2C3.CAM0.FCPR }) - Name (_PR3, Package (0x01) { ^^I2C3.CAM0.FCPR }) + Name (_PR0, Package () { FCPR }) + Name (_PR3, Package () { FCPR }) Name (_DSD, Package () { diff --git a/src/mainboard/google/poppy/variants/nocturne/include/variant/acpi/cam1.asl b/src/mainboard/google/poppy/variants/nocturne/include/variant/acpi/cam1.asl index ca2fee4..19146dc 100644 --- a/src/mainboard/google/poppy/variants/nocturne/include/variant/acpi/cam1.asl +++ b/src/mainboard/google/poppy/variants/nocturne/include/variant/acpi/cam1.asl @@ -15,6 +15,40 @@ Scope (\_SB.PCI0.I2C5) { + PowerResource (RCPR, 0, 0) + { + Name (STA, 0) + Method (_ON, 0, Serialized) { + If (LEqual(STA, 0)) { + CTXS (GPIO_RCAM_RST_L) + STXS (GPIO_RCAM_PWR_EN) + STXS (GPIO_PCH_RCAM_CLK_EN) + Sleep (3) + STXS (GPIO_RCAM_RST_L) + + /* + * A delay of T7 (minimum of 10 ms) + T8 + * (max 1.4 ms + delay of coarse integration + * time value) is needed to have the sensor + * ready for streaming, as soon as the power + * on sequence completes + */ + Sleep (12) + Store (1, STA) + } + } + Method (_OFF, 0, Serialized) { + If (LEqual(STA, 1)) { + CTXS (GPIO_PCH_RCAM_CLK_EN) + CTXS (GPIO_RCAM_RST_L) + CTXS (GPIO_RCAM_PWR_EN) + Store (0, STA) + } + } + Method (_STA, 0, NotSerialized) { + Return (STA) + } + } Device (CAM1) { @@ -35,59 +69,8 @@ ) }) - Name (STA, 0) - Method (PMON, 0, Serialized) { - If (STA == 0) { - CTXS(GPIO_RCAM_RST_L) - STXS(GPIO_RCAM_PWR_EN) - STXS(GPIO_PCH_RCAM_CLK_EN) - Sleep(3) - STXS(GPIO_RCAM_RST_L) - - /* - * A delay of T7 (minimum of 10 ms) + T8 - * (max 1.4 ms + delay of coarse integration - * time value) is needed to have the sensor - * ready for streaming, as soon as the power - * on sequence completes - */ - Sleep(12) - } - STA++ - } - - Method (PMOF, 0, Serialized) { - If (STA == 0) { - Return - } - STA-- - If (STA == 0) { - CTXS(GPIO_PCH_RCAM_CLK_EN) - CTXS(GPIO_RCAM_RST_L) - CTXS(GPIO_RCAM_PWR_EN) - } - } - - Name (_PR0, Package (0x01) { RCPR }) - Name (_PR3, Package (0x01) { RCPR }) - - /* Power resource methods for Rear Camera */ - PowerResource (RCPR, 0, 0) { - Method (_ON, 0, Serialized) { - PMON () - } - Method (_OFF, 0, Serialized) { - PMOF () - } - Method (_STA, 0, Serialized) { - If (LGreater(STA,0)) { - Return (0x1) - } - Else { - Return (0x0) - } - } - } + Name (_PR0, Package () { RCPR }) + Name (_PR3, Package () { RCPR }) /* Port0 of CAM1 is connected to port1 of CIO2 device */ Name (_DSD, Package () { @@ -136,7 +119,7 @@ Device (VCM1) { Name (_HID, "PRP0001") /* _HID: Hardware ID */ - Name (_UID, Zero) /* _UID: Unique ID */ + Name (_UID, 3) /* _UID: Unique ID */ Name (_DDN, "AKM AF DAC") /* _DDN: DOS Device Name */ Method (_STA, 0, NotSerialized) /* _STA: Status */ @@ -152,10 +135,10 @@ ) }) - Name (_DEP, Package() { ^^I2C5.CAM1 }) + Name (_DEP, Package() { CAM1 }) - Name (_PR0, Package (0x01) { ^^I2C5.CAM1.RCPR }) - Name (_PR3, Package (0x01) { ^^I2C5.CAM1.RCPR }) + Name (_PR0, Package () { RCPR }) + Name (_PR3, Package () { RCPR }) Name (_DSD, Package () { ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), @@ -168,7 +151,7 @@ Device (NVM1) { Name (_HID, "INT3499") /* _HID: Hardware ID */ - Name (_UID, Zero) /* _UID: Unique ID */ + Name (_UID, 1) /* _UID: Unique ID */ Name (_DDN, "M24C64S") /* _DDN: DOS Device Name */ Method (_STA, 0, NotSerialized) /* _STA: Status */ @@ -182,11 +165,10 @@ AddressingMode7Bit, "\\_SB.PCI0.I2C5", 0x00, ResourceConsumer, ,) }) + Name (_DEP, Package () { CAM1 }) - Name (_DEP, Package () { ^^I2C5.CAM1 }) - - Name (_PR0, Package (0x01) { ^^I2C5.CAM1.RCPR }) - Name (_PR3, Package (0x01) { ^^I2C5.CAM1.RCPR }) + Name (_PR0, Package () { RCPR }) + Name (_PR3, Package () { RCPR }) Name (_DSD, Package () { -- To view, visit https://review.coreboot.org/27605 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9c9f6c712b075450539d5b84ac5bb221b3cbb57e Gerrit-Change-Number: 27605 Gerrit-PatchSet: 1 Gerrit-Owner: Matt Delco <delco(a)chromium.org>

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
88
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit July 2018