Martin Roth has submitted this change and it was merged. ( https://review.coreboot.org/28387 )
Change subject: src/drivers/spi/tpm: Fix typo & capitalize TPM and IRQ
......................................................................
src/drivers/spi/tpm: Fix typo & capitalize TPM and IRQ
Change-Id: Ifb1e024821153865dd4a27a100f8a9c61151e0e1
Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr>
Reviewed-on: https://review.coreboot.org/28387
Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org>
Reviewed-by: Angel Pons <th3fanbus(a)gmail.com>
---
M src/drivers/spi/tpm/tpm.c
1 file changed, 9 insertions(+), 9 deletions(-)
Approvals:
build bot (Jenkins): Verified
Angel Pons: Looks good to me, approved
diff --git a/src/drivers/spi/tpm/tpm.c b/src/drivers/spi/tpm/tpm.c
index 3206ba1..bdd40a8 100644
--- a/src/drivers/spi/tpm/tpm.c
+++ b/src/drivers/spi/tpm/tpm.c
@@ -79,8 +79,8 @@
}
/*
- * TPM may trigger a irq after finish processing previous transfer.
- * Waiting for this irq to sync tpm status.
+ * TPM may trigger a IRQ after finish processing previous transfer.
+ * Waiting for this IRQ to sync TPM status.
*
* Returns 1 on success, 0 on failure (timeout).
*/
@@ -91,7 +91,7 @@
stopwatch_init_msecs_expire(&sw, 10);
while (!tis_plat_irq_status()) {
if (stopwatch_expired(&sw)) {
- printk(BIOS_ERR, "Timeout wait for tpm irq!\n");
+ printk(BIOS_ERR, "Timeout wait for TPM IRQ!\n");
return 0;
}
}
@@ -119,7 +119,7 @@
*/
int wakeup_needed = 1;
- /* Wait for tpm to finish previous transaction if needed */
+ /* Wait for TPM to finish previous transaction if needed */
if (car_get_var(tpm_sync_needed)) {
tpm_sync();
/*
@@ -430,7 +430,7 @@
memcpy(spi_slave, spi_if, sizeof(*spi_if));
- /* clear any pending irqs */
+ /* clear any pending IRQs */
tis_plat_irq_status();
/*
@@ -442,12 +442,12 @@
for (retries = 15; retries > 0; retries--) {
int i;
- /* In case of falure to read div_vid is set to zero. */
+ /* In case of failure to read div_vid is set to zero. */
tpm2_read_reg(TPM_DID_VID_REG, &did_vid, sizeof(did_vid));
for (i = 0; i < ARRAY_SIZE(supported_did_vids); i++)
if (did_vid == supported_did_vids[i])
- break; /* Tpm is up and ready. */
+ break; /* TPM is up and ready. */
if (i < ARRAY_SIZE(supported_did_vids))
break;
@@ -643,7 +643,7 @@
write_tpm_sts(TPM_STS_COMMAND_READY);
/*
- * Tpm commands and responses written to and read from the FIFO
+ * TPM commands and responses written to and read from the FIFO
* register (0x24) are datagrams of variable size, prepended by a 6
* byte header.
*
@@ -687,7 +687,7 @@
* TODO(vbendeb): at least drain the FIFO here or somehow let
* the TPM know that the response can be dropped.
*/
- printk(BIOS_ERR, " tpm response too long (%zd bytes)",
+ printk(BIOS_ERR, " TPM response too long (%zd bytes)",
payload_size);
return 0;
}
--
To view, visit https://review.coreboot.org/28387
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifb1e024821153865dd4a27a100f8a9c61151e0e1
Gerrit-Change-Number: 28387
Gerrit-PatchSet: 3
Gerrit-Owner: Elyes HAOUAS <ehaouas(a)noos.fr>
Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com>
Gerrit-Reviewer: Martin Roth <martinroth(a)google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Martin Roth has submitted this change and it was merged. ( https://review.coreboot.org/28400 )
Change subject: mb/google/poppy/Kconfig: Fix missing device node /dev/tpm0 for H1
......................................................................
mb/google/poppy/Kconfig: Fix missing device node /dev/tpm0 for H1
This patch adds the DRIVERS_SPI_ACPI to enable the tpm device node.
Without DRIVERS_SPI_ACPI, the kernel will popped out the below error:
cr50-update[592]: Starting cr50 update
cr50_get_name[595]: updater is /usr/sbin/gsctool -s
cr50-update[609]: exit status: 3
cr50-update[613]: output: Could not open TPM: No such file or directory
cr50_get_name[615]: board_id: '' board_flags: '0x', extension: 'prod'
cr50-update[617]: hashing /opt/google/cr50/firmware/cr50.bin.prod
cr50-update[678]: current state 3 in /var/cache/cr50.a3055efbc9.state
cr50-update[682]: not running
cr50-result[782]: Not running normal image. Skip setting Board ID
trunksd[795]: TPM: Error opening tpm0 file descriptor at /dev/tpm0: No such file or directory
BUG=none
BRANCH=master
TEST=/dev/tpm0 is created
Change-Id: I35287c6c54299c2677c41fc830675570b9d45a94
Signed-off-by: Zhuohao Lee <zhuohao(a)chromium.org>
Reviewed-on: https://review.coreboot.org/28400
Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org>
Reviewed-by: Furquan Shaikh <furquan(a)google.com>
---
M src/mainboard/google/poppy/Kconfig
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
build bot (Jenkins): Verified
Furquan Shaikh: Looks good to me, approved
diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig
index 1645451..df59c5e 100644
--- a/src/mainboard/google/poppy/Kconfig
+++ b/src/mainboard/google/poppy/Kconfig
@@ -196,6 +196,7 @@
select CHROMEOS_WIFI_SAR if CHROMEOS
select DRIVERS_I2C_MAX98927
select DRIVERS_I2C_DA7219
+ select DRIVERS_SPI_ACPI
select MAINBOARD_HAS_SPI_TPM_CR50
config VARIANT_SPECIFIC_OPTIONS_SORAKA
--
To view, visit https://review.coreboot.org/28400
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I35287c6c54299c2677c41fc830675570b9d45a94
Gerrit-Change-Number: 28400
Gerrit-PatchSet: 2
Gerrit-Owner: Zhuohao Lee <zhuohao(a)chromium.org>
Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com>
Gerrit-Reviewer: Martin Roth <martinroth(a)google.com>
Gerrit-Reviewer: Zhuohao Lee <zhuohao(a)chromium.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Martin Roth has uploaded this change for review. ( https://review.coreboot.org/28431
Change subject: util/lint: update whitespace checking rules
......................................................................
util/lint: update whitespace checking rules
- Check payloads, the root Makefiles and toolchain.inc
- 3rdparty is already not checked, so remove
- The marks around COPYING, LICENSE, and README were not needed
- Skip checking .ico files
Change-Id: Ic4a1709224604b36362d82e249c2916fca0336a2
Signed-off-by: Martin Roth <martinr(a)coreboot.org>
---
M util/lint/lint-stable-003-whitespace
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/31/28431/1
diff --git a/util/lint/lint-stable-003-whitespace b/util/lint/lint-stable-003-whitespace
index 1a7dc7b..4a7b661 100755
--- a/util/lint/lint-stable-003-whitespace
+++ b/util/lint/lint-stable-003-whitespace
@@ -15,8 +15,8 @@
# DESCR: Check for superfluous whitespace in the tree
LC_ALL=C export LC_ALL
-EXCLUDELIST='^3rdparty|^src/vendorcode/|^util/kconfig/|^util/nvidia/cbootimage$|\<COPYING\>|\<LICENSE\>|\<README\>|_shipped$|\.patch$|\.bin$|\.hex$|\.jpg$|\.ttf$|\.woff$|\.png$|\.eot$|\.vbt$'
-INCLUDELIST="src util"
+EXCLUDELIST='^src/vendorcode/|^util/kconfig/|^util/nvidia/cbootimage$|COPYING|LICENSE|README|_shipped$|\.patch$|\.bin$|\.hex$|\.jpg$|\.ttf$|\.woff$|\.png$|\.eot$|\.vbt$|\.ico$'
+INCLUDELIST="src util payloads Make* toolchain.inc"
# shellcheck disable=SC2086,SC2046
if uname | grep -qi "linux"; then
--
To view, visit https://review.coreboot.org/28431
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: Ic4a1709224604b36362d82e249c2916fca0336a2
Gerrit-Change-Number: 28431
Gerrit-PatchSet: 1
Gerrit-Owner: Martin Roth <martinroth(a)google.com>
Martin Roth has uploaded this change for review. ( https://review.coreboot.org/28429
Change subject: util/lint: Update whitespace linter for FreeBSD
......................................................................
util/lint: Update whitespace linter for FreeBSD
On FreeBSD, this test was failing with the error:
"grep: Argument list too long"
I found that changing this to other forms takes MUCH longer, so I left
the original method mostly unchanged except for moving the include &
exclude lists into variables.
Currently, I'm setting all non-linux operating systems to use the second
version. I'll update that if I find other that other OSes support the
first.
Change-Id: I1c9281440d051dea8a8b3a3ddc04676ccea77c7a
Signed-off-by: Martin Roth <martinr(a)coreboot.org>
---
M util/lint/lint-stable-003-whitespace
1 file changed, 18 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/29/28429/1
diff --git a/util/lint/lint-stable-003-whitespace b/util/lint/lint-stable-003-whitespace
index d749f37..1a7dc7b 100755
--- a/util/lint/lint-stable-003-whitespace
+++ b/util/lint/lint-stable-003-whitespace
@@ -15,5 +15,21 @@
# DESCR: Check for superfluous whitespace in the tree
LC_ALL=C export LC_ALL
-grep -l "[[:space:]][[:space:]]*$" `git ls-files src util |egrep -v "(^3rdparty|^src/vendorcode/|^util/kconfig/|^util/nvidia/cbootimage$|\<COPYING\>|\<LICENSE\>|\<README\>|_shipped$|\.patch$|\.bin$|\.hex$|\.jpg$|\.ttf$|\.woff$|\.png$|\.eot$|\.vbt$)"` | \
- sed -e "s,^.*$,File & has lines ending with whitespace.,"
+EXCLUDELIST='^3rdparty|^src/vendorcode/|^util/kconfig/|^util/nvidia/cbootimage$|\<COPYING\>|\<LICENSE\>|\<README\>|_shipped$|\.patch$|\.bin$|\.hex$|\.jpg$|\.ttf$|\.woff$|\.png$|\.eot$|\.vbt$'
+INCLUDELIST="src util"
+
+# shellcheck disable=SC2086,SC2046
+if uname | grep -qi "linux"; then
+ grep -l "[[:space:]][[:space:]]*$" \
+ $(git ls-files $INCLUDELIST | \
+ grep -Ev "($EXCLUDELIST)" ) | \
+ sed -e "s,^.*$,File & has lines ending with whitespace.,"
+else
+ # The above form is much (100x) faster, but doesn't work
+ # on all systems. A for loop also works but takes 30% longer
+ git ls-files $INCLUDELIST | \
+ grep -Ev "($EXCLUDELIST)" | \
+ xargs -I % \
+ grep -l "[[:space:]][[:space:]]*$" % | \
+ sed -e "s,^.*$,File & has lines ending with whitespace.,"
+fi
--
To view, visit https://review.coreboot.org/28429
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: I1c9281440d051dea8a8b3a3ddc04676ccea77c7a
Gerrit-Change-Number: 28429
Gerrit-PatchSet: 1
Gerrit-Owner: Martin Roth <martinroth(a)google.com>
Hello Patrick Rudolph, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/28393
to look at the new patch set (#6).
Change subject: mb/lenovo: Dual Graphics for xx20/xx30 ThinkPads
......................................................................
mb/lenovo: Dual Graphics for xx20/xx30 ThinkPads
Add CMOS option that allows to use both integrated and discrete GPU.
Change-Id: I8842fef0fa1235eb91abf6b7e655ed4d8598adc7
Signed-off-by: Evgeny Zinoviev <me(a)ch1p.com>
---
M src/drivers/lenovo/hybrid_graphics/romstage.c
M src/ec/lenovo/pmh7/pmh7.c
M src/ec/lenovo/pmh7/pmh7.h
M src/mainboard/lenovo/t420/cmos.layout
M src/mainboard/lenovo/t420/romstage.c
M src/mainboard/lenovo/t420s/cmos.layout
M src/mainboard/lenovo/t420s/romstage.c
M src/mainboard/lenovo/t430/cmos.layout
M src/mainboard/lenovo/t430/romstage.c
M src/mainboard/lenovo/t430s/cmos.default
M src/mainboard/lenovo/t430s/cmos.layout
M src/mainboard/lenovo/t430s/romstage.c
M src/mainboard/lenovo/t520/romstage.c
M src/mainboard/lenovo/t530/cmos.layout
M src/mainboard/lenovo/t530/romstage.c
15 files changed, 68 insertions(+), 14 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/93/28393/6
--
To view, visit https://review.coreboot.org/28393
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I8842fef0fa1235eb91abf6b7e655ed4d8598adc7
Gerrit-Change-Number: 28393
Gerrit-PatchSet: 6
Gerrit-Owner: Evgeny Zinoviev <me(a)ch1p.com>
Gerrit-Reviewer: Evgeny Zinoviev <me(a)ch1p.com>
Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Hello Patrick Rudolph, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/28393
to look at the new patch set (#5).
Change subject: mb/lenovo: Dual Graphics for xx20/xx30 ThinkPads
......................................................................
mb/lenovo: Dual Graphics for xx20/xx30 ThinkPads
Add CMOS option that allows to use both integrated and discrete GPU.
Change-Id: I8842fef0fa1235eb91abf6b7e655ed4d8598adc7
Signed-off-by: Evgeny Zinoviev <me(a)ch1p.com>
---
M src/drivers/lenovo/hybrid_graphics/romstage.c
M src/ec/lenovo/pmh7/pmh7.c
M src/ec/lenovo/pmh7/pmh7.h
M src/mainboard/lenovo/t420/cmos.layout
M src/mainboard/lenovo/t420/romstage.c
M src/mainboard/lenovo/t420s/cmos.layout
M src/mainboard/lenovo/t420s/romstage.c
M src/mainboard/lenovo/t430/cmos.layout
M src/mainboard/lenovo/t430/romstage.c
M src/mainboard/lenovo/t430s/cmos.default
M src/mainboard/lenovo/t430s/cmos.layout
M src/mainboard/lenovo/t430s/romstage.c
M src/mainboard/lenovo/t520/romstage.c
M src/mainboard/lenovo/t530/cmos.layout
M src/mainboard/lenovo/t530/romstage.c
15 files changed, 69 insertions(+), 14 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/93/28393/5
--
To view, visit https://review.coreboot.org/28393
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I8842fef0fa1235eb91abf6b7e655ed4d8598adc7
Gerrit-Change-Number: 28393
Gerrit-PatchSet: 5
Gerrit-Owner: Evgeny Zinoviev <me(a)ch1p.com>
Gerrit-Reviewer: Evgeny Zinoviev <me(a)ch1p.com>
Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>