| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix errors from pylint. Use logging to print messages instead of print.
BUG=b:149405690
BRANCH=none
TEST=RMA open a device and enable testlab mode.
Change-Id: I63a8b108b0f436291659f2f787ebcf72e8f4a523
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2052269
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Wai-Hong Tam <waihong@google.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
BUG=b:149405690
BRANCH=none
TEST=run with python3
Change-Id: I42bcccec83c7c582450c0b599f46b3fbf0ab3f80
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2052268
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Wai-Hong Tam <waihong@google.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
C2D2 is a debug board bring that uses an 8-pin debug header that is pin
compatible with the em100 flash emulator.
BRANCH=none
BUG=b:145314772
TEST=UART communication for EC and H1
TEST=UART flashing of EC
TEST=SPI reading and writing
TEST=Automatic Vref detection for UART upon connect and disconnect
Change-Id: I023994ed78942f2307e4adb802b5cc96afdf7e24
Signed-off-by: Jett Rink <jettrink@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1991849
Reviewed-by: Diana Z <dzigterman@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Change $ to \s in regex.
BUG=None (tigertail serserialno fail
TEST=./tigertool.py --setserialno test
BRANCH=none
Change-Id: I006ff8e70b3d20be44590c2050f9e341f10a2d53
Signed-off-by: Nick Sanders <nsanders@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2008450
Reviewed-by: YH Lin <yueherngl@chromium.org>
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
BRANCH=none
BUG=none
TEST=none
Change-Id: Ibe34f5cb4e0dfe3a2aed70dec9de12d4b064ca89
Signed-off-by: Matthew Blecker <matthewb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1995607
Reviewed-by: Harry Cutts <hcutts@chromium.org>
Commit-Queue: Harry Cutts <hcutts@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
BRANCH=none
BUG=none
TEST=none
Change-Id: I3fcdfb065e5d2534e6ebcfb7cdd7d60401c8cce1
Signed-off-by: Matthew Blecker <matthewb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1968205
Reviewed-by: Harry Cutts <hcutts@chromium.org>
Commit-Queue: Harry Cutts <hcutts@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
cr50_rma_open can be run without servod. dut-control
cr50_uart_timestamp:off fails if the script isn't running through
servod. This change moves disabling timestamps, so it's only done on
servod.
BUG=none
BRANCH=none
TEST=run with and withoout servod
Change-Id: Icc80d021dd7cbad8ae3632625b32b30368e5a94c
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1960919
Reviewed-by: Evan Green <evgreen@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
By design gsctool does not update the inactive RO unless the running
RO version is lower than the version in the Cr50 image being
transferred.
With transition to the new RO version, keys and rollback map state,
there is a need to enforce that both ROs on the device are updated.
This patch adds a command line option which allows to update the
inactive RO to the contents of the Cr50 image.
BRANCH=none
BUG=b:136284186
TEST=running 'gsctool -q cr50.bin' updates the inactive RO section.
Change-Id: I79c21fc2cd41c40070352d8fbce0b71dd3ae2b1f
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1949547
Reviewed-by: Namyoon Woo <namyoon@chromium.org>
Reviewed-by: Andrey Pronin <apronin@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The log timestamps are unexpected by the script, and cause issues.
Send a dut-control command to disable UART timestamps.
Also fix the regex in the board ID portion to accept a colon as well as
a comma, whichever comes first.
BUG=None
TEST=Try cr50_rma_unlock.py
BRANCH=None
Change-Id: Ie9e54e65b86c52aef120fa3249453bfc090cf6f0
Signed-off-by: Evan Green <evgreen@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1921703
Reviewed-by: Mary Ruthven <mruthven@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
After this host command is called, the value is stored in
g_vboot_mode and never accessed again.
BUG=b:124141368, chromium:1014379
TEST=make buildall -j
BRANCH=none
Change-Id: I7923658139d15394c1c3c07baca7168e34c111e9
Signed-off-by: Joel Kitching <kitching@google.com>
Cq-Depend: chromium:1830239, chromium:1864533
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1865050
Tested-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If Cr50 is running older than 0.3.20, delay the RO update 1 minute after
the RW update, so Cr50 doesn't reject the RO blocks because their
offsets are less than the RW offsets.
BUG=b:144873413
BRANCH=none
TEST=update board running RO 0.0.10 RW 0.3.18 to the RO 0.0.11 RW 0.3.22
image.
Change-Id: I0179cc235c692133b08cd3430d71069b2f94bf69
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1929481
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This fixes a few issues in touchpad_updater, that is used only for
early bringup by Elan:
- Fix Makefile to correctly cross-compile
- Add support for 0x10 IC
- Improve debugging
- Remove manual fragmentation of USB bulk packets (this is not
required and actually breaks large transactions)
- Add timeout to libusb_bulk_transfer calls.
BRANCH=kukui
BUG=b:142333653
TEST=emerge-kukui -v ec-devutils && \
scp /build/kukui/usr/sbin/ec_touchpad_updater $IP:/usr/local/sbin
Ping-pong between 2 images:
ec_touchpad_updater -p 0x503c -f S8648A-15H0_FW01.bin
ec_touchpad_updater -p 0x503c -f S8648A-15H0_FWB1.bin
Change-Id: I78a8064002504ba4db15e202e516e7a2399bf648
Signed-off-by: Nicolas Boichat <drinkcat@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1906393
Reviewed-by: Eric Yilun Lin <yllin@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix the dimensions, and also the size, and make sure that updating
the FW actually works (it seems like increasing the timeout to
2000ms is needed).
BRANCH=kukui
BUG=b:140596094
TEST=Flash masterball, no warning in console on start
TEST=
Host:
make TOUCHPAD_FW=S8648A-15H0_FW01.bin BOARD=masterball -j
USE=updater_utils emerge-kukui -av ec-utils
cros deploy $IP ec-utils
DUT:
usb_updater2 -d 18d1:503c -r; sleep 0.5; \
usb_updater2 -d 18d1:503c -s; usb_updater2 -d 18d1:503c ec.bin
usb_updater2 -d 18d1:503c -p S8648A-15H0_FW01.bin
Change-Id: Ia473ac420b42f52ad1639f950a3f08ff5d32df09
Signed-off-by: Nicolas Boichat <drinkcat@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1847512
Reviewed-by: Eric Yilun Lin <yllin@chromium.org>
Reviewed-by: Joel Kitching <kitching@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Add annotations to allow the compiler to check printf-style format
strings in the EC.
BUG=chromium:984041
TEST=make -j buildall
BRANCH=None
Change-Id: Ic39f37f8362372de7d289becea684d9da535599a
Signed-off-by: Evan Green <evgreen@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1733101
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If the host command handler callback function returns an int, it's easy
to accidentally mix up the enum ec_error_list and enum ec_status types.
The host commands always expect an enum ec_status type, so we change the
return value to be of that explicit type. Compilation will then fail if
you accidentally try to return an enum ec_error_list value.
Ran the following commands and then manually fixed up a few remaining
instances that were not caught:
git grep --name-only 'static int .*(struct host_cmd_handler_args \*args)' |\
xargs sed -i 's#static int \(.*\)(struct host_cmd_handler_args \*args)#\
static enum ec_status \1(struct host_cmd_handler_args \*args)##'
git grep --name-only 'int .*(struct host_cmd_handler_args \*args)' |\
xargs sed -i 's#int \(.*\)(struct host_cmd_handler_args \*args)#\
enum ec_status \1(struct host_cmd_handler_args \*args)##'
BRANCH=none
BUG=chromium:1004831
TEST=make buildall -j
Cq-Depend: chrome-internal:1872675
Change-Id: Id93df9387ac53d016a1594dba86c6642babbfd1e
Signed-off-by: Tom Hughes <tomhughes@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1816865
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Right now we have several different versions of #! in
our python scripts. Unify them all and specify that we
are using python2.
Signed-off-by: Stefan Reinauer <reinauer@chromium.org>
BUG=none
BRANCH=none
TEST=make buildall
Change-Id: Iab33a3f5d4b827451a55542bcee8837b00da7867
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1817948
Commit-Queue: Stefan Reinauer <reinauer@chromium.org>
Tested-by: Stefan Reinauer <reinauer@chromium.org>
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
| |
BRANCH=none
BUG=none
TEST=Viewed the updated file in Gitiles.
Change-Id: Icd10a54500a2521e4d598997385916d59dd38ab3
Signed-off-by: Matthew Blecker <matthewb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1827239
Reviewed-by: Justin TerAvest <teravest@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This change adds some logic to find config and firmware files on test
images as well, where they end up being located at /usr/local/share
instead.
BUG=b:120921028
BRANCH=None
TEST=manual testing // on fizz-labstation test image
sudo servo_updater --board servo_v4
observe servo v4 getting updated
Note: Test images right now do not have usb_updater2 yet (WIP) hence the
test is done using fizz-labstation, a board that does come with
usb_updater2
Change-Id: I4838424ed17bad5c3e2911cb967193863cd0b231
Signed-off-by: Ruben Rodriguez Buchillon <coconutruben@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1760974
Reviewed-by: Nick Sanders <nsanders@chromium.org>
Reviewed-by: Todd Broch <tbroch@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The compiler complained about this, noting that
error: format string is not a string literal (potentially insecure)
[-Werror,-Wformat-security]. This seems to fix it.
BUG=b:120921028
BRANCH=None
TEST=manual testing
sudo emerge ec-devutils -j32
// warning disappears
Change-Id: I4a4392ec7e6bc7af06dc54b6382e52a1f2c91252
Signed-off-by: Ruben Rodriguez Buchillon <coconutruben@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1761467
Reviewed-by: Nick Sanders <nsanders@chromium.org>
Reviewed-by: Nicolas Boichat <drinkcat@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If the image is node locked to a devid, print that information in the
'-b' output.
BUG=none
BRANCH=none
TEST=get version output of node locked and prod signed image.
Change-Id: I0db2828d7bd699013ec84467c7e2a4b918bd7b27
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1742913
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Add support for getting and setting the endorsement key using the vendor
command.
BUG=b:138943966
BRANCH=none
TEST=Get/Set endorsement seed using vendor command.
Change-Id: I5c2f5d9efa0fbc236731430cac650785693c8db8
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1740076
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix the mutually exclusive check, so using 2 raises an error. Also fix
the error message to show -U instead of -u. Upstart isn't exclusive. CCD
unlock is.
BUG=none
BRANCH=none
TEST=gsctool -i -U raises an error.
Change-Id: Iaf43f18fefc1a8c4b6612b05daa5c82a7680b310
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1742220
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Ran the following command:
git grep -l 'Copyright (c)' | \
xargs sed -i 's/Copyright (c)/Copyright/g'
BRANCH=none
BUG=none
TEST=make buildall -j
Change-Id: I6cc4a0f7e8b30d5b5f97d53c031c299f3e164ca7
Signed-off-by: Tom Hughes <tomhughes@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1663262
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Adds back and uses the close method that was defined in change
1125354.
BRANCH=None
BUG=chromium:968700
TEST=ran servo updater on a servo that needed an update (so that the
version check was exercised twice).
Signed-off-by: Kevin Shelton <kmshelton@chromium.org>
Change-Id: I0ddce9749a3548d5019c138a2a2266fd93a85ca9
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1643658
Tested-by: Kevin Shelton <kmshelton@chromium.org>
Reviewed-by: Nick Sanders <nsanders@chromium.org>
Commit-Queue: Kevin Shelton <kmshelton@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Flash log access could be denied in case there is a previously started
log operation in progress.
Flash log by design is a 'the best effort' facility, let's re-try a
few times if Cr50 returns an error when flash log read is attempted.
Also, allow the -L optional parameter to be a decimal value, this is
better aligned with the output format where timestamp is reported as a
decimal value.
BRANCH=none
BUG=b:132287488
TEST=ran two concurrent processes, one constantly adding flash log
entries using Cr50 console command, and another one constantly
retrieving entries using 'gsctool -a -L' observed reliable
operation over long periods of time, with occasional flash log
lockup log entries reported by the Cr50 (as expected).
- verified proper operation when a decimal value is passed in as a
-L optional parameter.
Change-Id: I4510490c73d616e0d84776f483b9ee7bf11bcbc3
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1639094
Reviewed-by: Andrey Pronin <apronin@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This would allow to see up to 20 bytes of each packet sent to the TPM
when -v command line option is passed to gsctool.
BRANCH=none
BUG=none
TEST=ran 'gsctool -a -L -v' and observed expected traces.
Change-Id: If0988e71a3856b2e213b906315651a84051317ce
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1639095
Reviewed-by: Andrey Pronin <apronin@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
pyusb 1.0.2 changed two API calls upon which we depend:
b3ee6cdfef8f find function returns an iterator.
dac78933f6a6 Removed unnecessary length argument to util.get_string
This CL only updates callers of these APIs (the previous CL contained some
unrelated changes around kernel driver detach and closing stm32usb).
Signed-off-by: Nick Sanders <nsanders@chromium.org>
Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
Based-on: https://chromium-review.googlesource.com/1125354
BRANCH=None
BUG=chromium:958677
TEST=precq passes
TEST=chromiumos-sdk tryjob buildbucketId=8915374561970847360
TEST=using servo v2
servod -b grunt
=> no python exceptions when starting servod
TEST=using servo v4
servod -b grunt
=> no python exceptions when starting servod
TEST=using u-Servo:
servod -b grunt
=> no python exceptions when starting servod
for i in {1..10000} ; do echo $i $(dut-control ec_uart_en spi1_buf_en ); done
=> No stability regression versus pyusb-1.0.0b1
TEST=servo_updater, EC console via servo
Cq-Depend: chromium:1597548,chromium:1597156,chromium:1597157
Change-Id: Ic8101707838e5d19e901cf1f7125b97b5102f089
Reviewed-on: https://chromium-review.googlesource.com/1597156
Commit-Ready: Daniel Kurtz <djkurtz@chromium.org>
Tested-by: Daniel Kurtz <djkurtz@chromium.org>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Chris McDonald <cjmcdonald@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The recently introduced vendor command is used to get or set flash log
timestamp.
BRANCH=none
BUG=b:132287488
TEST=on the device ran various incarnations of the command (> prompt
on the Cr50 console, # is the DUT bash):
> flo 10 10
> flo
1:00
13:0a 0a 0b 0c 0d 0e 0f 10 11 12 13
==== afger a few seconds =====
# /var/tmp/gsctool -a -T
Current H1 time is 68
==== afger some more time =====
> flo 5 5
> flo
1:00
13:0a 0a 0b 0c 0d 0e 0f 10 11 12 13
398:05 05 06 07 08 09
# /var/tmp/gsctool -a -T 300
error: return value 1
# /var/tmp/gsctool -a -T 1000000
> flo 6 6
> flo
1:00
13:0a 0a 0b 0c 0d 0e 0f 10 11 12 13
398:05 05 06 07 08 09
1000022:06 06 07 08 09 0a 0b
# /var/tmp/gsctool -a -T
Current H1 time is 1000052
Change-Id: I16ceb97a32b4d452705f9df3826151f3e4e45832
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1610721
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Andrey Pronin <apronin@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There is no need to duplicate short and long option strings in the
.opt and .help_text fields, one is enough.
To properly format --help output in case the command line argument
expects a parameter, part of the .help_text string has to be printed
concatenated with the option strings.
Let's retrieve the short and long option strings form from the .opt
structure and use '%' as the formatting character to allow to indicate
that the the beginning of the help message needs to be printed
concatenated with the option strings.
Also correct the general description.
BRANCH=none
BUG=none
TEST=help text before this change:
vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
$ gsctool -h
Usage: gsctool [options] [<binary image>]
This utility allows to update Cr50 RW firmware, configure
various aspects of Cr50 operation, analyze Cr50 binary
images, etc.
The required argument is the file name of a full RO+RW
binary image.
A typical Chromebook use would expect -s -t options
included in the command line.
Options:
-a,--any Try any interfaces to find Cr50 (-d, -s, -t are all ignored)
-b,--binvers Report versions of Cr50 image's RW and RO headers, do not update
-c,--corrupt Corrupt the inactive rw
-d,--device VID:PID USB device (default 18d1:5014)
-f,--fwver Report running Cr50 firmware versions
-F,--factory [enable|disable]
Control factory mode
-h,--help Show this message
-I,--ccd_info Get information about CCD state
-i,--board_id [ID[:FLAGS]]
Get or set Info1 board ID fields
ID could be 32 bit hex or 4 character string.
-k,--ccd_lock Lock CCD
-L,--flog [prev entry] Retrieve contents of the flash log (newer than <prev entry> if specified)
-M,--machine Output in a machine-friendly way. Effective with -b, -f, -i, and -O.
-m,--tpm_mode [enable|disable]
Change or query tpm_mode
-n,--serial SERIAL Cr50 CCD serial number
-O,--openbox_rma <desc_file>
Verify other device's RO integrity
using information provided in <desc file>
-o,--ccd_open Start CCD open sequence
-P,--password
Set or clear CCD password. Use
'clear:<cur password>' to clear it
-p,--post_reset Request post reset after transfer
-R,--sn_rma_inc RMA_INC
Increment SN RMA count by RMA_INC.
RMA_INC should be 0-7.
-r,--rma_auth [auth_code]
Request RMA challenge, process RMA authentication code
-S,--sn_bits SN_BITS
Set Info1 SN bits fields.
SN_BITS should be 96 bit hex.
-s,--systemdev Use /dev/tpm0 (-d is ignored)
-T,--tstamp <stamp> Set flash log timestamp base
-t,--trunks_send Use `trunks_send --raw' (-d is ignored)
-U,--ccd_unlock Start CCD unlock sequence
-u,--upstart Upstart mode (strict header checks)
-V,--verbose Enable debug messages
-v,--version Report this utility version
-w,--wp Get the current wp setting
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
and after this change:
vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
$ ./extra/usb_updater/gsctool -h
Usage: gsctool [options] [<binary image>]
This utility allows to update Cr50 RW firmware, configure
various aspects of Cr50 operation, analyze Cr50 binary
images, etc.
<binary image> is the file name of a full RO+RW binary image.
Options:
-a,--any Try any interfaces to find Cr50 (-d, -s, -t are all ignored)
-B,--background_update_supported
Force background update mode (relevant only when interacting with Cr50 versions before 0.0.19)
-b,--binvers Report versions of Cr50 image's RW and RO headers, do not update
-c,--corrupt Corrupt the inactive rw
-d,--device VID:PID USB device (default 18d1:5014)
-f,--fwver Report running Cr50 firmware versions
-F,--factory [enable|disable]
Control factory mode
-h,--help Show this message
-I,--ccd_info Get information about CCD state
-i,--board_id [ID[:FLAGS]]
Get or set Info1 board ID fields. ID could be 32 bit hex or 4 character string.
-k,--ccd_lock Lock CCD
-L,--flog [prev entry] Retrieve contents of the flash log (newer than <prev entry> if specified)
-M,--machine Output in a machine-friendly way. Effective with -b, -f, -i, and -O.
-m,--tpm_mode [enable|disable]
Change or query tpm_mode
-n,--serial Cr50 CCD serial number
-O,--openbox_rma <desc_file>
Verify other device's RO integrity using information provided in <desc file>
-o,--ccd_open Start CCD open sequence
-P,--password Set or clear CCD password. Use 'clear:<cur password>' to clear it
-p,--post_reset Request post reset after transfer
-R,--sn_rma_inc RMA_INC Increment SN RMA count by RMA_INC. RMA_INC should be 0-7.
-r,--rma_auth [auth_code]
Request RMA challenge, process RMA authentication code
-S,--sn_bits SN_BITS Set Info1 SN bits fields. SN_BITS should be 96 bit hex.
-s,--systemdev Use /dev/tpm0 (-d is ignored)
-T,--tstamp [<tstamp>] Get or set flash log timestamp base
-t,--trunks_send Use `trunks_send --raw' (-d is ignored)
-U,--ccd_unlock Start CCD unlock sequence
-u,--upstart Upstart mode (strict header checks)
-V,--verbose Enable debug messages
-v,--version Report this utility version
-w,--wp Get the current wp setting
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Change-Id: I5afd2473dbdaf9edc515ee9f02b932effe3755c5
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1628113
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Andrey Pronin <apronin@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Standard libc getopt_long() and getopt() functions do not allow the
optional parameters to follow the command line option without the equal
sign ('='), but gsctool utility users expect this form to be
available, so additional processing is done for command line arguments
accepting optional parameters.
This additional processing code is duplicated for each such argument.
On top of that, some arguments which described as requiring the
parameter (not optional) still include code which looks for the
command line option.
Information about expected parameter type is included in the long
options descriptor table, so it is not readily available if the user
specified the short version of the argument in the command line.
To consolidate processing of the optional parameters in one place, in
case the user specified the short version of the command line
argument, the long_opts table is looked up to find the appropriate
long version, then the parameter type is checked, and if the parameter
is supposed to be optional, the next command line token is examined to
determine if this is the optional parameter.
BRANCH=none
BUG=none
TEST=tried the following commands:
- tried the following commands:
./extra/usb_updater/gsctool -b # reports missing file name error
# All the following succeed processing command line parameters:
./extra/usb_updater/gsctool -m
./extra/usb_updater/gsctool -m enable
./extra/usb_updater/gsctool --tpm_mode enable
./extra/usb_updater/gsctool --tpm_mode=enable
# All the following fail processing command line parameters
# reporting 'Invalid tpm mode arg: xxx.':
./extra/usb_updater/gsctool -m xxx
./extra/usb_updater/gsctool --tpm_mode xxx
./extra/usb_updater/gsctool --tpm_mode=xxx
Change-Id: I68e9cc312aa8a5a2cccbd78df66a24ac71f78c36
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1621185
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Andrey Pronin <apronin@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There are a couple of issues with command line processing code:
- command line options must be listed in two different places if we
want to allow both short and long forms of the same argument
- help text for commands is included in yet another place in the code
Indeed, from the libc getopt_long() point of view the long options
table and short options string are completely unrelated: the function
scans the command line arguments vector for -x[x[y]] or --word command
line options style and looks up either short_opts or long_opts
depending on the encountered command line token's style.
The standard way to cross reference long options table and the short
options string is to put the short option character in the long option
table's entries .val field. This is how it is done in gsctool.
What this means is that as long as all short command options are
referenced in the long_opts table, the short command option string
could be generated based no the long_opts table.
The help text and long_opts table would still remain separate and
require manual syncing.
To help with that problem this patch introduces a container structure,
which includes both long option contents and the help text for each
command line option.
This allows to build the long_opts table and then the short_opts
string on the fly, based on the contents of the single table, and also
generated the --help output, ensuring consistency of all
representations.
BRANCH=none
BUG=none
TEST=as follows:
- temporarily added debug code to print out the generated short
option string, got the following:
aBbcd:fF:hIikLMmn:O:oPpR:rS:stUuVvw
which is extended to include previously omitted 'f':
aBbcd:F:fhIikLMmn:O:oPpR:rS:stUuVvw
- verified that 'gsctool -h' outputs before and after this patch are
the same apart from including help text for -B
- verified that it is still possible to update a Cr50
- verified --board_id/-i command with various optional parameter
representations.
Change-Id: Ie8d409c6c8866247323cee93ce5b9bfbe22046fa
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1617077
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Andrey Pronin <apronin@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Add a serial number arg that can be used to specify which CCD device to
use. If there are multiple CCD devices, you can use this arg to pick
which device to update.
BUG=none
BRANCH=none
TEST='gsctool -f -n $SERIAL' can be used to get the cr50 version from
two chromebooks connected to the same machine. 'gsctool -f' still works
too.
Change-Id: I91cbfdc7d62bee2623919e4dded62f92ba7adb19
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1600501
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There might be multiple devices with the same VID:PID connected to the
host. Use the serial number to find the correct device if it is given.
BUG=none
BRANCH=none
TEST=none
Change-Id: I96f31e8e7ceb0dd2c3c643771b38752da88a2a9e
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1600500
Reviewed-by: Matthew Blecker <matthewb@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
As of pexpect 3.0, the fdexpect module was moved into the pexpect
package. Prior to 4.0, a wrapper module was installed along with
pexpect, so "import fdexpect" continued to work. In 4.0 this wrapper
was removed.
Importing fdexpect from pexpect works for our current pexpect 3.3, and
will continue to work when we update pexpect to 4.0+.
Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
BRANCH=none
BUG=chromium:958677
TEST=(0) with pexpect 3.3, (1) sudo servod --board=grunt
TEST=(0) Uprev pexpect to 4.2.1, (1) sudo servod --board=grunt
=> servod works in both cases
Change-Id: I9d21042713d0cc1826cf55da4af7a16f44b746bb
Reviewed-on: https://chromium-review.googlesource.com/1593419
Commit-Ready: Daniel Kurtz <djkurtz@chromium.org>
Tested-by: Daniel Kurtz <djkurtz@chromium.org>
Tested-by: Scott Collyer <scollyer@chromium.org>
Reviewed-by: Chris McDonald <cjmcdonald@chromium.org>
Reviewed-by: Scott Collyer <scollyer@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When both RO and RW updates are required, and the RO includes a new RW
signing key, to ensure recovery from failed updates, the RW section of
the image needs to be updated before the RO section,
In this case interrupted RO or RW update will result in the H1
rebooting still using the original RO and original RW.
If the RO was updated first and the RW update was interrupted, the
chip could end up with the newer RO with no RW to verify with the new
key.
BRANCH=none
BUG=b:74100307
TEST=created an image with fake RO_B version number of 0.0.106, and
then tried to update to this image. Observed that RW_B was
transferred before RO_B
[1067.694175 FW update: starting...]
at 0x84000
at 0x84400
at 0x84800
...
at 0xbb400
at 0x80000
at 0x80400
at 0x80800
at 0x80c00
at 0x81000
at 0x81400
at 0x81800
at 0x81c00
at 0x82000
at 0x82400
Change-Id: Ie5240c14c6b7d73c00baac693be724fab4636992
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1586590
Reviewed-by: Mary Ruthven <mruthven@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We should ensure that all custom task definition are non-zero and fit
with the globally defined events. Add compile time check and change
semantics to specify bit number (instead of making all callers use the
BIT macro).
This also fixes an error with TASK_EVENT_PHY_TX_DONE for ITE being 0.
The bug that made that happen hasn't landed on any firmware branches
that use it though.
BRANCH=none
BUG=none
TEST=builds
Cq-Depend:chrome-internal:1178968,chrome-internal:1178952
Change-Id: I5e1d1312382d200280c548e9128e53f4eddd3e61
Signed-off-by: Jett Rink <jettrink@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1570607
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The script now unconditionally attempts to (re)install the module, even if
it is already loaded. (This also removes a message which had a typo,
mistakingly referring to i2c-dev instead of i2c-pseudo.)
The script no longer attempts to load i2c-dev, since servod does that now.
The script now runs "make clean" before "make" .
The header comment no longer references a section of the README that was
never checked in.
BRANCH=none
BUG=b:79684405
TEST=I ran the install script in various scenarios:
1) No i2c-pseudo module loaded or installed.
2) i2c-pseudo module loaded but not installed.
3) i2c-pseudo module installed but not loaded
4) i2c-pseudo module loaded and installed.
In all cases the module was (re)installed and either left loaded
(if applicable), or loaded (if not previously loaded).
The script does not attempt to unload and re-load the module when
re-installing only for simplicity.
Change-Id: I5f2677b92406b8a49d229bc84d2efcca5504f501
Signed-off-by: Matthew Blecker <matthewb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1552245
Reviewed-by: Nick Sanders <nsanders@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This Linux kernel module provides I2C adapters that can be backed by
userspace programs. This allows for userspace implementations of
functionality such as tunneling I2C through another communication channel
to a remote I2C bus.
BRANCH=none
BUG=b:79684405
TEST=Used i2c-tools CLI to i2c-dev to issue I2C queries, and Python
interactive interpreter as the I2C pseudo adapter controller. The
i2c-pseudo module correctly proxied write, read, write+read, and multi-byte
reads through the controller character device, and it correctly proxied
back the responses from the character device, including the specific byte
values read. Later, I implemented an I2C pseudo controller in Servod and
used it to flash an ITE EC over I2C using both Servo Micro and Suzy-Q.
Change-Id: Idda764e56b9e9d577302b59286e873291ea36d25
Signed-off-by: Matthew Blecker <matthewb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1250029
Reviewed-by: Nick Sanders <nsanders@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Seen some logs where due to the regex cutting out too soon, the
servo_updater assumes an update might be needed whereas the version on
the v4/micro is actually already up to date.
This change tightens the regex used to query the version by requiring it
to match some sort of newline character after the version string as
well.
BRANCH=None
BUG=chromium:933978
TEST=manual testing
sudo servod_updater
[observe it working well]
Change-Id: I0b3139a120087d49d6f4bd52267d191716d3b541
Signed-off-by: Ruben Rodriguez Buchillon <coconutruben@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1481770
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Reviewed-by: Matthew Blecker <matthewb@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The new command line option accepts a single optional parameter, the
timestamp. If the parameter is not given, the entire log is retrieved
one entry at a time. If the parameter is given, only entries newer
than the passed in timestamp are retrieved.
BRANCH=none
BUG=b:63760920
TEST=tried retrieving log entries from an H1 running the updated Cr50
code.
Change-Id: I317a659dfc7ebe24cf6f1d957bf0b6d29fb94518
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1525149
Reviewed-by: Namyoon Woo <namyoon@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This makes the argument simpler to understand and produce.
BUG=chromium:940327
TEST=manual on a device
Change-Id: I9226116f52011dab1967196e1c236dd36b11e4c4
Signed-off-by: Yves Arrouye <drcrash@google.com>
Reviewed-on: https://chromium-review.googlesource.com/1514215
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Yves Arrouye <drcrash@chromium.org>
Reviewed-by: Andrey Pronin <apronin@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When doing RMA reset and the auth code is rejected, gsctool only reports
the error code, which is not clear for the user. This CL adds the
failure reason to make the message clearer.
BUG=b:128801501
TEST=make gsctool; manually test on DUT
BRANCH=none
[Before fix]
localhost $ gsctool -a -r "A"
rma unlock failed, code 1
Processing response...
localhost $ gsctool -a -r "ABCDEFGH"
rma unlock failed, code 6
Processing response...
[After fix]
localhost $ gsctool -a -r "A"
Processing response...
rma unlock failed, code 1 (wrong authcode size)
localhost $ gsctool -a -r "ABCDEFGH"
Processing response...
rma unlock failed, code 6 (authcode mismatch)
Change-Id: I5db4d8f7cffe5b582f48fdc3b7fb27493b3715ff
Signed-off-by: Cheng-Han Yang <chenghan@google.com>
Reviewed-on: https://chromium-review.googlesource.com/1527905
Commit-Ready: Cheng-Han Yang <chenghan@chromium.org>
Tested-by: Cheng-Han Yang <chenghan@chromium.org>
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The scan should continue while scanned entries are not empty.
BRANCH=none
BUG=none
TEST='gsctool -f is not reporting error anymore.
Change-Id: Ie8316de1b95b511ed6c2b3f65c4cfbd92822edf8
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1529711
Reviewed-by: Mary Ruthven <mruthven@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Many of gsctool command line options result in setting a Boolean flag.
This patch collects all such flags in a structure, and uses a function
to iterate over flags when examining command line options.
BRANCH=none
BUG=none
TEST=verified that Boolean command line options still can be set.
Change-Id: Id4a14e573ced893650c4c1c81f8ef92fc0d03bc5
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1525148
Reviewed-by: Mary Ruthven <mruthven@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Replace C++ style comments with C style comments and alphabetize the
help output.
BRANCH=none
BUG=none
TEST=gsctool still builds, -h output is ordered.
Change-Id: I1a6f10873c123d61773911e97cbf32fce7447ff7
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1525147
Reviewed-by: Namyoon Woo <namyoon@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When building gsctool, getversion.sh is invoked by the Makefile, and
since BOARD environment variable is set to cr50, getversion.sh is
trying to retrieve the state of directories used by Cr50, but not
present when gsctool is built.
Let's just make sure that BOARD is not set to 'cr50' when
getversion.sh is invoked.
BRANCH=none
BUG=none
TEST='sudo emerge ec-utils' does not produce getversion.sh errors
about not being able to change directory to
../../third_party/{tpm2,cryptoc}, but the version string is still
available:
$ gsctool -v
Version: 1.1.9999-d2e5b7e, built on by @eskimo.mtv.corp.google.com
note that date and user name are also not included in this case,
but this is a separate unrelated issue.
Change-Id: Iadd7615f980e9444c539b5e04afca3f23d080174
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1501836
Reviewed-by: Nicolas Boichat <drinkcat@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Flash driver of the g chip requires that the size of the programmed
area is evenly divisible by 4. This patch makes sure that gsctool
complies with this requirement.
BRANCH=none
BUG=b:127295653
TEST=without this patch attempts to update Cr50 to an image built from
ToT fails, with this patch the same image programs just fine.
Change-Id: I064d22130a56e9e703f728bc898fd5de82d365d4
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1499657
Reviewed-by: Namyoon Woo <namyoon@chromium.org>
Reviewed-by: Andrey Pronin <apronin@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Function reporting the version of the gsctool expects the VERSION
variable generated by ./util/getversion.sh utility to start with a
single underscore without a prefix. But the utility could be adding
various prefixes to the VERSION string depending on the environment
variable settings.
Those settings are irrelevant for gsctool, it should ignore the prefix
up to the first underscore character found in the VERSION string.
Also, modify the Makefile to make sure the build date reported by
getversion.sh is accurate.
BRANCH=none
BUG=chromium:932361
TEST=built gsctool and checked version reporting:
make BOARD=cr50 CR50_DEV=1 gsctool
./gsctool -v
Version: v2.0.821+e890d0974 tpm2:v0.0.320-e987095 \
cryptoc:v0.0.10-b256f39, built on 2019-02-15 10:25:08 \
by vbendeb@eskimo.mtv.corp.google.com
Change-Id: I5fb6c4aa1dea6e857fffc7ec5e5a599d61175044
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1474736
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Reviewed-by: Namyoon Woo <namyoon@chromium.org>
Reviewed-by: Nicolas Boichat <drinkcat@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Changes:
- Do not assume stdin input is a TTY. Only attempt to manipulate terminal
settings when connected to an actual terminal.
- Exit upon EOF. This is mostly relevant for non-TTY input, e.g. piped
input, though this is not conditioned on TTY-ness.
- For non-TTY inputs, sleep before exiting after EOF, in order to allow for
for reading a response from the USB console device (e.g. from the Servo).
The sleep time is configurable by -S / --notty-exit-sleep command line
option, default 0.2 seconds.
- Replace os.sleep(0.1) busy loop with waiting on a threading.Event.
- Print a newline character upon exit so that a user's shell prompt will
not be printed mid-line.
BRANCH=none
BUG=b:123727520
TEST=I tested handling of non-TTY input by piping Servo v4 console commands
such as:
$ echo version | ./console.py -d 18d1:501b
$ echo reboot | ./console.py -d 18d1:501b
With this change, console.py now exits on its own after sending the piped
command.
Previously when given piped input it would lose the first character of the
input due to the attempt to change TTY settings, then it would wait
indefinitely for ctrl+c or other signal, and finally it would traceback
upon ctrl+c.
I tested handling of TTY input in the usual manner, without redirecting
stdin. That still works smootly, exits without error upon ctrl+c, and no
longer causes the next shell prompt to start mid-line.
Change-Id: I894a40a4409b0c422b82158f452f81943277285d
Signed-off-by: Matthew Blecker <matthewb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1459139
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Reviewed-by: Nick Sanders <nsanders@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
| |
BRANCH=master
BUG=b:112865585,b:123259683
TEST=No log spam when import as module from autotest
Change-Id: I7ced102bbb893bc1baa88c625b8c7279a1e32677
Signed-off-by: Puthikorn Voravootivat <puthik@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1437515
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
|