GitLab

When several stm32usb serial consoles are present, comare each USB
device serial number with the micro servo to find the correct one
rather than using the usb.util.get_string() method which appears to be
doing something completely different and never returns a matching
serial number.  The Servo Micro uses such a console, so when
connecting more than one to the same controller the issue occurs.

This issue cannot be seen when only one servo board has a stm32usm
serial device.
Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com>

As the CPU console often gets stuck in a "flushing" state with some
devices when using the Servo Micro board, disable the pty console and
keep using the /dev/ttyUSB* device instead which appears to be working
normally.
Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com>

In order to work around issues seen with the CPU pty consoles, add a
work-around to leave the console as its original /dev/ttyUSB* device
and not reconfigure it as a /dev/pty/* one.  This only applies to
cpu_uart_pty at the moment, and can be done by setting the
no_pty="true" attribute in the XML params for that console.
Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com>

Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com>

Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com>

Fix Python error by converting dev_list to an actual list object
rather than a generator.  This is needed as generators don't have a
length.
Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com>

Tested on Debian Stretch with default configuration.
Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com>

Add missing libusb to the list of libs to link to toad via
LIBFTDI_LDLIBS.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com>

Beating the login hurdle is one aspect that several
servo automations might want to share. This CL introduces
a common driver for AP console communication that houses
tools to beat the login hurdle on the AP console.
Going forward common utilities to do work on the AP console
should be housed in ap.py, and automation drivers that
interact with the AP console should inherit from or use
an instance of the ap driver.

CL also shores up the logic and increases the speed to beat
the login hurdle.

BUG=chromium:760267
TEST=manual
sudo servod -b $BOARD
dut-control login
login:no
dut-control login:yes
dut-control login
login:yes

Change-Id: I253abf30e4f0c90bc915b31b8fe57d9b3a9ed4c0
Reviewed-on: https://chromium-review.googlesource.com/870028
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Ruben Rodriguez Buchillon <coconutruben@chromium.org>
Reviewed-by: Todd Broch <tbroch@chromium.org>

Some cr50 images don't have cr50 testlab support. If cr50 returns
'Access Denied', then set cr50_testlab to unsupported.

BUG=b:71556454
BRANCH=none
TEST=run cr50_testlab when cr50 is running 0.0.24

Change-Id: I1e37212660b31b9608bbfc6cb20c44d98802f915
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/869460
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Reviewed-by: Wai-Hong Tam <waihong@google.com>

BUG=None.
TEST=Verify cr50 UART is functional w/ servo_v2.
BRANCH=None.

Change-Id: I52239cb1fe285e6be98606bd7408fdb1ba3ab1b5
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/868500
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Shawn N <shawnn@chromium.org>
Reviewed-by: Edward Hill <ecgh@chromium.org>
Reviewed-by: Chris Ching <chingcodes@chromium.org>
Reviewed-by: Justin TerAvest <teravest@chromium.org>

The ZerbleBarn board is connected behind a 'regular' Yoshi flex,
in order to get the SPI1 flex buffers to work, we need to instantiate
properly the flex configuration.

BUG=b:67081508
TEST=run servod with 'sudo servod -b zerblebarn -c zerblebarn_inas.xml'
dut-control spi1_buf_on_flex_en:on (or off) does change the OE_N pin on
U18 on the servo flex and the ZerbleBarn board is detecting the CS_L change.

Change-Id: Icb404f3bc728a65b3ee14af1ba44af3ef8874846
Reviewed-on: https://chromium-review.googlesource.com/860378
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Vincent Palatin <vpalatin@chromium.org>
Reviewed-by: Todd Broch <tbroch@chromium.org>

How the lid_open control is implemented should be determined by the
type of servo board. It is GPIO on servo v2/v3/micro or EC command
on CCD. Only special case is defined in the board overlay, like
not_applicable on a chrome box.

This change moves the lid_open control from board overlay to servo
overlay.

BUG=b:71602543
TEST=Call "dut-control lid_open:no" and "dut-control lid_open:yes"
on servo v2, servo-micro, and CCD.

Change-Id: I8c54045b819fae139f2ce2ffec9aba2f50486957
Reviewed-on: https://chromium-review.googlesource.com/857744
Commit-Ready: Wai-Hong Tam <waihong@google.com>
Tested-by: Wai-Hong Tam <waihong@google.com>
Reviewed-by: Vijay P Hiremath <vijay.p.hiremath@intel.com>
Reviewed-by: Lalithambika Krishnakumar <lalithambika.krishnakumar@intel.com>
Reviewed-by: Todd Broch <tbroch@chromium.org>
Reviewed-by: Shawn N <shawnn@chromium.org>

servo_v4: servo_v4_v1.1.5734-4a47178
servo_micro: servo_micro_v1.1.5734-4a47178
cr50: 0.1.0/cr50_v1.9308_B.293-ad55183

BUG=b:69016388
TEST=dut-control servo_micro_version_compatible = True
TEST=dut-control servo_v4_version_compatible = True
TEST=dut-control cr50_version_compatible = True

Change-Id: If48444033569934242bceeecea7db2baf831bdc3
Reviewed-on: https://chromium-review.googlesource.com/848296
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Nick Sanders <nsanders@chromium.org>
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>

The 'fw_up' control is similar to the ec_boot_mode control and is
used in the same way, therefore, add it as an alias.

BUG=b:71548795
BRANCH=None
TEST=start servod for meowth with a servo v4.  verify that `dut-control
fw_up:on` sets EC_FLASH_SELECT to 1.

Change-Id: I6906897f1f6e755ed390e9aee47e80a1460cd40e
Signed-off-by: Aseda Aboagye <aaboagye@google.com>
Reviewed-on: https://chromium-review.googlesource.com/851432
Commit-Ready: Aseda Aboagye <aaboagye@chromium.org>
Tested-by: Aseda Aboagye <aaboagye@chromium.org>
Reviewed-by: Shawn N <shawnn@chromium.org>

The addresses and voltages came from reading through the Grunt
schematic; I'm still not sure what the right thing is to do for sense
voltages here.

BUG=b:67187156
TEST=None

Change-Id: I7ab6c9d86c9af1c30cffcdb0b0e1b15003abc3e2
Reviewed-on: https://chromium-review.googlesource.com/834757
Commit-Ready: Justin TerAvest <teravest@chromium.org>
Tested-by: Justin TerAvest <teravest@chromium.org>
Reviewed-by: Justin TerAvest <teravest@chromium.org>

BUG=b:70062605
BRANCH=None
TEST=None

Change-Id: Ic4045c3ffa1e7f00d69282f133898918f47ba794
Reviewed-on: https://chromium-review.googlesource.com/844408
Commit-Ready: Kaiyen Chang <kaiyen.chang@intel.com>
Tested-by: Kaiyen Chang <kaiyen.chang@intel.com>
Reviewed-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-by: luke yang <luke_yang@compal.corp-partner.google.com>

ZerbleBarn is the Fingerprint daughter-board for Zoombini.

It has a UART and a SPI interface going to the Fingerprint MCU
and INAs.

BUG=b:67081508
TEST=run servod with 'sudo servod -b zerblebarn -c zerblebarn_inas.xml'
and flash the board using flash_ec.
dut-control pp3300_h7_mv pp3300_h7_ma pp1800_fpc_mv pp1800_fpc_ma

Change-Id: I7c26b0cc8f2fffab228d162209a0f880a6c8663e
Reviewed-on: https://chromium-review.googlesource.com/832648
Commit-Ready: Vincent Palatin <vpalatin@chromium.org>
Tested-by: Vincent Palatin <vpalatin@chromium.org>
Reviewed-by: Todd Broch <tbroch@chromium.org>

When starting servod for board Fizz 'lid_open' and
'usbpd_uart_routing' controls report errors, which are in fact false
positives.

The suggested changes allow the controls to be processed more
gracefully, error reports are suppressed.

BRANCH=none
BUG=none
TEST=staring servod for board Fizz now reports:
   ...
   Servod - INFO - Initialized lid_open to not_applicable
   ...
   Servod - INFO - Initialized usbpd_uart_routing to not_applicable
   ...

Change-Id: I56c11911939797cbd8f95ee4b41f8aa3dca72956
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/826564Reviewed-by: Shelley Chen <shchen@chromium.org>

The procedure of power_state:rec does a warm_reset:on to hold AP before
doing the whole system reboot (cold_reset/PMIC-reset) and setting EC
hostevent for recovery.

However, it doesn't work on some new x86 devices. Even warm_reset is
ON; AP still powers on and executes the verified-boot sequence, i.e.
 * (vboot) Read the recovery reason from NV storage (e.g. 19 for the
   test firmware_CorruptBothFwSigAB, as it failed to verify the fw
   signature in the previous boot);
 * (vboot) Clear the recovery reason in NV storage, such that it will
   do clear normal boot next time;
 * (servod) Servod performs the whole system reboot and sets the EC
   hostevent for recovery.
 * (vboot) Read the recovery reason from NV storage, i.e. 0;
 * (vboot) As no recovery reason, treats it as manual-triggered
   recovery (recovery reason: 2).

So some of the FAFT tests failed, as the expected recovery reason is
not matched, 19 -> 2.

A fix to this race condition is not to do warm reset for the devices
can't hold AP. For devices having the recent EC patch of the command
'reboot wait-ext' command, it can hold AP off, without the warm_reset.

BUG=b:70573209
TEST=Ran firmware_CorruptBothFwSigAB and firmware_RollbackFirmware
passed on Fizz.

Change-Id: Ia8f8ac11704e5c31e195ec6a85665102634a648c
Reviewed-on: https://chromium-review.googlesource.com/830253
Commit-Ready: Wai-Hong Tam <waihong@google.com>
Tested-by: Wai-Hong Tam <waihong@google.com>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Reviewed-by: Scott Collyer <scollyer@chromium.org>

Modify the cr50 ccd get control strings, so they can be used in the ccd
set functions. 'ccd opened' will not be accepted by cr50. 'ccd open'
will. Remove the 'ed' from the ccd privilege level control. Make ccd
testlab return 'on' and 'off' instead of 'enabled' and 'disabled'.

BUG=none
BRANCH=none
TEST=none

Change-Id: I9a663b2e74d747c1eba256b6e48cc8e850885e47
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/827596Reviewed-by: Wai-Hong Tam <waihong@google.com>

This gives us some initial settings for servo for Grunt.

This reconfigures the warm_reset pin, as it's now on pin 39 (as it is on
some other new boards).

It also sets the Vref for the PCH SPI write-protect to 3.3V since that's
the voltage everything else seems to use for signaling there.

BUG=b:67187156
TEST=sudo emerge hdctools

Change-Id: I54ce38975c6559876cbf35acbf9ada5b9dbf2953
Reviewed-on: https://chromium-review.googlesource.com/818302
Commit-Ready: Justin TerAvest <teravest@chromium.org>
Tested-by: Justin TerAvest <teravest@chromium.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Justin TerAvest <teravest@chromium.org>

The control ec_active_copy returns the active copy of EC, like "RO",
"RW", or "RW_B".

BUG=b:69921268
TEST=Start servod an run "dut-control ec_active_copy".

Change-Id: I47b8462d43757c0f2f0a869a556c915f6b95b151
Reviewed-on: https://chromium-review.googlesource.com/817875
Commit-Ready: Wai-Hong Tam <waihong@google.com>
Tested-by: Wai-Hong Tam <waihong@google.com>
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>

BUG=None
TEST=sudo servod -c scarlet_r2_loc.xml

Change-Id: Ib9918e7f0f1ccde1fa6aa5dd86efb540d2387ac9
Signed-off-by: Derek Basehore <dbasehore@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/807628Reviewed-by: Todd Broch <tbroch@chromium.org>

vol_up_down_hold command holds volume up and down buttons
simultaneously for given amount of time.

BUG=b:69390675
BRANCH=None
TEST=call command vol_up_down_hold from FAFT and make sure that
     buttons are actually pressed and released in ec console.
CQ-DEPEND=CL:783515

Change-Id: Id033dda9c89eb192e77abf198ad931722273b341
Signed-off-by: Shelley Chen <shchen@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/783638Reviewed-by: Wai-Hong Tam <waihong@google.com>

For devices not supported the new EC reboot argument wait-ext. Fall
back to the original logic, which uses cold_reset to reset cr50 and
then asks EC to reboot with AP off. The original logic cause an
issue on devices whose warm_reset can't hold AP: AP may boot faster
that the original recovery reason is overwritten.

BUG=b:65596735
TEST=Passed firmware_FAFTSetup on Scarlet

Change-Id: Ifed6ff7803962e8ea684605ada9fdb811b88768f
Reviewed-on: https://chromium-review.googlesource.com/794601
Commit-Ready: Wai-Hong Tam <waihong@google.com>
Tested-by: Philip Chen <philipchen@chromium.org>
Tested-by: Wai-Hong Tam <waihong@google.com>
Reviewed-by: Julius Werner <jwerner@chromium.org>

This adds a *_version, and a *_version_compatible
control for the ec3po targets that may need updating from the
servod host. This covers servo_micro, servo_v4, cr50.

If incompatible, a list is printed at warning level with the
current version and list of compatible versions.

BUG=b:69016388
TEST=dut-control cr50_version_compatible, etc.

Change-Id: If41c7a89ceff46812aa74811d68f4f25ec6dc45c
Signed-off-by: Nick Sanders <nsanders@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/786825Reviewed-by: Wai-Hong Tam <waihong@google.com>

Capture reads data from the console. If it happens to read data required
by the issue_cmd_get_results regex, then the command will timeout. Add
capture_pause and resume functions to pause console capture during
issue_cmd_get_results. Any data not consumed by issue_cmd_get_results
will be available for capture to read once it is resumed.

BUG=b:69802822
BRANCH=none
TEST=enable cr50 and ec uart capture. Read cr50_version and ec_board 200
times. Make sure there are no failures

Change-Id: I1392f361d0ee44bea963aa874ca03d11f042bf5c
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/794871Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>

Cr50_console_capture doesn't work correctly. For some reason
cr50_console_stream is polled a bunch, so the buffer is constantly
emptied. If cr50_console commands are renamed to cr50_uart to be
consistent with the rest of the uart controls, everything starts
working. This change renames all of the cr50_console controls to be
consistent with other uart control names.

BUG=none
BRANCH=none
TEST=enable cr50_uart_capture, send some stuff using cr50_uart_cmd, and
make sure cr50_uart_stream has captured output.

Change-Id: I9d751ca8785866c5648b9a597f06643603a6956c
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/794870Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>

String changes in cr50 broke servod again.
Update the regex in servod.

BUG=b:35648297
TEST=dut-control ec_uart_bitbang_en, dut-control ec_uart_bitbang_en:on

Change-Id: I33ac4ac718033cb3d97d1463469807f9ab3f771f
Reviewed-on: https://chromium-review.googlesource.com/773488
Commit-Ready: Nick Sanders <nsanders@chromium.org>
Tested-by: Nick Sanders <nsanders@chromium.org>
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>

EC_IN_RW signal is used to determine if the switch to dev mode can be
safely made. However, EC_IN_RW needs the EC_RST_L line driven low in
order to be reset. In faft tests that utilize crosEcSoftrecPower
method, EC_RST_L is not being driven by servo to fix other test
failures related to keeping EC and AC reboots in sync.

This CL modifies crosEcSoftrecPower to use the wait-ext option when
initializing an EC reset to to enter recovery mode. If the wait-ext
option fails, then the command 'reboot ap-off' will be issued.

BUG=b:64603944
BRANCH=coral
CQ-DEPEND=I614f9156066d5719601ee43e29c7a064f9bba6e2
TEST=Ran "/usr/bin/test_that --board=coral <ip addr> firmware_DevMode"
mutliple times and verified that it passes. Previoulsy, this test
always fails when the EC is in RW before it starts. Also verified
platform_ServoPowerStateController_USBPluggedin passed.

Change-Id: I086687c3dd7591460099267880d56ab8265d2e4b
Signed-off-by: Scott Collyer <scollyer@google.com>
Reviewed-on: https://chromium-review.googlesource.com/738634
Commit-Ready: Scott Collyer <scollyer@chromium.org>
Tested-by: Scott Collyer <scollyer@chromium.org>
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>

servo V1 boards haven't been used for quite some time and of the 50
ever produced they really should have been programmed properly.

Motivation for performing this deprecation is actually that someone
recently found an unprogrammed servo V2 which also matches vid:0403
pid:6011 and incorrectly enumerates as a servo V1 (actually two of
them).  Chaos ensues from there.  By deprecating this default vid/pid
that too will be fixed (fail hard).

BUG=none
TEST=manual,
# connect one servo V2 that hasn't had EEPROM programmed
sudo servod -b foo
log message says 'no servos found'

# connect servo V2 that is properly programmed
sudo servod -b foo
WAI

Change-Id: I61fb6b3198297d249903308e7c6cc30eb87c5a0f
Reviewed-on: https://chromium-review.googlesource.com/764384
Commit-Ready: Todd Broch <tbroch@chromium.org>
Tested-by: Todd Broch <tbroch@chromium.org>
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>

For servo_v4 development, all the stm32 GPIOs were
exported to dut-control. Since many are separately
controlled by PD, some have confusing names, and some
simply brick the device (host_hub_reset), we'll remove these.

BUG=b:69013515
TEST=servod, no more junk

Change-Id: I95cd5ed1d501237708dc223d45c429f9d0d06027
Signed-off-by: Nick Sanders <nsanders@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/764381Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>

BUG=b:69010031
TEST='cros_workon --host start hdctools; sudo emerge hdctools; sudo
servod -b meowth` Verify that servod starts up okay on a servo v2.

Change-Id: If836448b191f2cd3f09806b05ae506eb1f36bcd7
Signed-off-by: Aseda Aboagye <aaboagye@google.com>
Reviewed-on: https://chromium-review.googlesource.com/759115
Commit-Ready: Aseda Aboagye <aaboagye@chromium.org>
Tested-by: Aseda Aboagye <aaboagye@chromium.org>
Reviewed-by: Wai-Hong Tam <waihong@google.com>
Reviewed-by: Mary Ruthven <mruthven@chromium.org>

BUG=b:68934906
TEST=servod -b whiskers

Change-Id: I767d35517c82feec14f85a3877cf75ce0d945eb2
Reviewed-on: https://chromium-review.googlesource.com/758749
Commit-Ready: Nicolas Boichat <drinkcat@chromium.org>
Tested-by: Nicolas Boichat <drinkcat@chromium.org>
Reviewed-by: Todd Broch <tbroch@chromium.org>

We have an ec3po gpio driver that also works. Let's
save some flash space by using that instead, and deleting the
gpio usb endpoint.

BUG=None
TEST=servod still runs.

Change-Id: I7af5921a15f591a8d15f13c3eec95e25f07bc03b
Signed-off-by: Nick Sanders <nsanders@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/750592Reviewed-by: Wai-Hong Tam <waihong@google.com>
Reviewed-by: Shawn N <shawnn@chromium.org>

We append the version string during the postinst phase, in order to
know the servo type like 'servo_v4_with_servo_micro' (servo v4 with
a servo-micro connected to DUT). If the connected is a base, should
not append the version string, avoiding a string like
'servo_v4_with_servo_micro_with_servo_micro'.

BUG=b:66211919
TEST=Started servod, with servo v4 with one servo-micro to DUT and
one servo-micro to the base. Ran provision_FirmwareUpdate which reads
the servo version string to know the servo type.

Change-Id: Iff3d61132793c1cba0effe103e8f99ba0a6a115a
Reviewed-on: https://chromium-review.googlesource.com/740084
Commit-Ready: Wai-Hong Tam <waihong@google.com>
Tested-by: Wai-Hong Tam <waihong@google.com>
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>

The control names are used for driver to reference the name of the
control. It is only needed for control tags, not for other tags,
like map tags.

BUG=b:66211919
TEST=Run "dut-control -i" to check the map tags.

Change-Id: Ib91bbabc3591eded949780975ece1e99c2f58b66
Reviewed-on: https://chromium-review.googlesource.com/740298
Commit-Ready: Wai-Hong Tam <waihong@google.com>
Tested-by: Wai-Hong Tam <waihong@google.com>
Reviewed-by: Mary Ruthven <mruthven@chromium.org>

When using servo-micro, which doesn't have an atmega chip inside,
the keyboard init code raises an error about atmega. We should skip
initializing it, in order not to block the development use.

BUG=b:68166165
TEST=Started 'servod -b guado' using servo-micro. Saw a warning but
other functions work fine:
  INFO - No device path specified for usbkm232 handler. Use the servo atmega chip to handle.
  WARNING - No atmega in servo board. So no keyboard support.

Change-Id: I9715fb88c46c83e1a07fc0c210efd7695a8a205b
Reviewed-on: https://chromium-review.googlesource.com/736786
Commit-Ready: Wai-Hong Tam <waihong@google.com>
Tested-by: Wai-Hong Tam <waihong@google.com>
Reviewed-by: Nick Sanders <nsanders@chromium.org>

In some cases, there is so much output in the ec console
that ec_board cannot reliably retrieve the board name. This
change ensures that the ec_board command can parse the
board name without any other output in the ec console.

BUG=chromium:760267
TEST=manual
dut-control -p 9997 ec_board
> ec_board:soraka

Change-Id: I9a19ba89d4f9602b7ee11142d8574b070448dbb9
Reviewed-on: https://chromium-review.googlesource.com/724420
Commit-Ready: Ruben Rodriguez Buchillon <coconutruben@chromium.org>
Tested-by: Ruben Rodriguez Buchillon <coconutruben@chromium.org>
Reviewed-by: Todd Broch <tbroch@chromium.org>