Merge remote-tracking branch cros/main into firmware-fpmcu-dartmonkey-releasefirmware-fpmcu-dartmonkey-release

Generated by: ./util/update_release_branch.py --board dartmonkey --relevant_paths_file
./util/fingerprint-relevant-paths.txt firmware-fpmcu-dartmonkey-release

Relevant changes:

git log --oneline 6c1587ca70..28712dae9d -- board/nocturne_fp
board/dartmonkey common/fpsensor docs/fingerprint driver/fingerprint
util/getversion.sh

ded9307b79 util/getversion.sh: Fix version when not in a git repo
956055e692 board: change Google USB vendor info
71b2ef709d Update license boilerplate text in source code files
33e11afda0 Revert "fpsensor: Build fpsensor source file with C++"
c8d0360723 fpsensor: Build fpsensor source file with C++
bc113abd53 fpsensor: Fix g++ compiler error
150a58a0dc fpsensor: Fix fp_set_sensor_mode return type
b33b5ce85b fpsensor: Remove nested designators for C++ compatibility
2e864b2539 tree-wide: const-ify argv for console commands
56d8b360f9 test: Add test for get ikm failure when seed not set
3a3d6c3690 test: Add test for fpsensor trivial key failure
233e6bbd08 fpsensor_crypto: Abstract calls to hmac_SHA256
0a041b285b docs/fingerprint: Typo correction
c03fab67e2 docs/fingerprint: Fix the path of fputils.py
0b5d4baf5a util/getversion.sh: Fix empty file list handling
6e128fe760 FPMCU dev board environment with Satlab
3eb29b6aa5 builtin: Move ssize_t to sys/types.h
345d62ebd1 docs/fingerprint: Update power numbers for latest dartmonkey release
c25ffdb316 common: Conditionally support printf %l and %i modifiers
9a3c514b45 test: Add a test to check if the debugger is connected
54e603413f Move standard library tests to their own file
43fa6b4bf8 docs/fingerprint: Update power numbers for latest bloonchipper release
25536f9a84 driver/fingerprint/fpc/bep/fpc_sensor_spi.c: Format with clang-format
4face99efd driver/fingerprint/fpc/libfp/fpc_sensor_pal.h: Format with clang-format
738de2b575 trng: Rename rand to trng_rand
14b8270edd docs/fingerprint: Update dragonclaw power numbers
0b268f93d1 driver/fingerprint/fpc/libfp/fpc_private.c: Format with clang-format
f80da163f2 driver/fingerprint/fpc/libfp/fpc_private.h: Format with clang-format
a0751778f4 board/nocturne_fp/ro_workarounds.c: Format with clang-format
5e9c85c9b1 driver/fingerprint/fpc/libfp/fpc_sensor_pal.c: Format with clang-format
c1f9dd3cf8 driver/fingerprint/fpc/libfp/fpc_bio_algorithm.h: Format with clang-format
eb1e1bed8d driver/fingerprint/fpc/libfp/fpc1145_private.h: Format with clang-format
6e7b611821 driver/fingerprint/fpc/bep/fpc_bio_algorithm.h: Format with clang-format
e0589cd5e2 driver/fingerprint/fpc/bep/fpc1035_private.h: Format with clang-format
58f0246dbe board/nocturne_fp/board_ro.c: Format with clang-format
7905e556a0 common/fpsensor/fpsensor_crypto.c: Format with clang-format
21289d170c driver/fingerprint/fpc/bep/fpc1025_private.h: Format with clang-format
98a20f937e common/fpsensor/fpsensor_state.c: Format with clang-format
a2d255d8af common/fpsensor/fpsensor.c: Format with clang-format
84e53a65da board/nocturne_fp/board.h: Format with clang-format
73055eeb3f driver/fingerprint/fpc/bep/fpc_private.c: Format with clang-format
0f7b5cb509 common/fpsensor/fpsensor_private.h: Format with clang-format
1ceade6e65 driver/fingerprint/fpc/bep/fpc_private.h: Format with clang-format
dca9d74321 Revert "trng: Rename rand to trng_rand"
a6b0b3554f trng: Rename rand to trng_rand
28d0b75b70 third_party/boringssl: Remove unused header

BRANCH=None
BUG=b:244387210 b:242720240 b:215613183 b:242720910 b:236386294
BUG=b:234181908 b:244781166 b:234781655 b:234143158 b:234181908
BUG=b:237344361 b:236025198 b:234181908 b:180945056 chromium:1098010
BUG=b:246424843 b:234181908 b:131913998
TEST=`make -j buildall`
TEST=./util/run_device_tests.py --board dartmonkey
     Test "aes": PASSED
     Test "cec": PASSED
     Test "cortexm_fpu": PASSED
     Test "crc": PASSED
     Test "flash_physical": PASSED
     Test "flash_write_protect": PASSED
     Test "fpsensor_hw": PASSED
     Test "fpsensor_spi_ro": PASSED
     Test "fpsensor_spi_rw": PASSED
     Test "fpsensor_uart_ro": PASSED
     Test "fpsensor_uart_rw": PASSED
     Test "mpu_ro": PASSED
     Test "mpu_rw": PASSED
     Test "mutex": PASSED
     Test "pingpong": PASSED
     Test "printf": PASSED
     Test "queue": PASSED
     Test "rollback_region0": PASSED
     Test "rollback_region1": PASSED
     Test "rollback_entropy": PASSED
     Test "rtc": PASSED
     Test "sha256": PASSED
     Test "sha256_unrolled": PASSED
     Test "static_if": PASSED
     Test "stdlib": PASSED
     Test "system_is_locked_wp_on": PASSED
     Test "system_is_locked_wp_off": PASSED
     Test "timer_dos": PASSED
     Test "utils": PASSED
     Test "utils_str": PASSED
     Test "panic_data_dartmonkey_v2.0.2887": PASSED
     Test "panic_data_nocturne_fp_v2.2.64": PASSED
     Test "panic_data_nami_fp_v2.2.144": PASSED
Force-Relevant-Builds: all
Signed-off-by: Tom Hughes <tomhughes@chromium.org>

Change-Id: I2c312583a709fedae8fe11d92c22328c3b634bc7

1 files changed, 183 insertions, 180 deletions

diff --git a/extra/tigertool/ecusb/tiny_servo_common.py b/extra/tigertool/ecusb/tiny_servo_common.py
index e27736a9dc..fc028104ed 100644
--- a/extra/tigertool/ecusb/tiny_servo_common.py
+++ b/extra/tigertool/ecusb/tiny_servo_common.py
@@ -1,238 +1,241 @@
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
+# Copyright 2017 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-#
-# Ignore indention messages, since legacy scripts use 2 spaces instead of 4.
-# pylint: disable=bad-indentation,docstring-section-indent
-# pylint: disable=docstring-trailing-quotes
 
 """Utilities for using lightweight console functions."""
 
 # Note: This is a py2/3 compatible file.
 
 import datetime
-import errno
-import os
-import re
-import subprocess
 import sys
 import time
-import usb
 
 import six
+import usb  # pylint:disable=import-error
 
-from . import pty_driver
-from . import stm32uart
+from . import pty_driver, stm32uart
 
 
 def get_subprocess_args():
-  if six.PY3:
-    return {'encoding': 'utf-8'}
-  return {}
+    if six.PY3:
+        return {"encoding": "utf-8"}
+    return {}
 
 
 class TinyServoError(Exception):
-  """Exceptions."""
+    """Exceptions."""
 
 
 def log(output):
-  """Print output to console, logfiles can be added here.
+    """Print output to console, logfiles can be added here.
+
+    Args:
+      output: string to output.
+    """
+    sys.stdout.write(output)
+    sys.stdout.write("\n")
+    sys.stdout.flush()
 
-  Args:
-    output: string to output.
-  """
-  sys.stdout.write(output)
-  sys.stdout.write('\n')
-  sys.stdout.flush()
 
 def check_usb(vidpid, serialname=None):
-  """Check if |vidpid| is present on the system's USB.
+    """Check if |vidpid| is present on the system's USB.
 
-  Args:
-    vidpid: string representation of the usb vid:pid, eg. '18d1:2001'
-    serialname: serialname if specified.
+    Args:
+      vidpid: string representation of the usb vid:pid, eg. '18d1:2001'
+      serialname: serialname if specified.
 
-  Returns: True if found, False, otherwise.
-  """
-  if serialname:
-    output = subprocess.check_output(['lsusb', '-v', '-d', vidpid],
-                                     **get_subprocess_args())
-    m = re.search(r'^\s*iSerial\s+\d+\s+%s$' % serialname, output, flags=re.M)
-    if m:
-      return True
+    Returns:
+      True if found, False, otherwise.
+    """
+    if get_usb_dev(vidpid, serialname):
+        return True
 
     return False
-  else:
-    if subprocess.call(['lsusb', '-d', vidpid], stdout=open('/dev/null', 'w')):
-      return False
-  return True
-
-def check_usb_sn(vidpid):
-  """Return the serial number
-
-  Return the serial number of the first USB device with VID:PID vidpid,
-  or None if no device is found. This will not work well with two of
-  the same device attached.
 
-  Args:
-    vidpid: string representation of the usb vid:pid, eg. '18d1:2001'
 
-  Returns: string serial number if found, None otherwise.
-  """
-  output = subprocess.check_output(['lsusb', '-v', '-d', vidpid],
-                                   **get_subprocess_args())
-  m = re.search(r'^\s*iSerial\s+(.*)$', output, flags=re.M)
-  if m:
-    return m.group(1)
+def check_usb_sn(vidpid):
+    """Return the serial number
 
-  return None
+    Return the serial number of the first USB device with VID:PID vidpid,
+    or None if no device is found. This will not work well with two of
+    the same device attached.
 
-def get_usb_dev(vidpid, serialname=None):
-  """Return the USB pyusb devie struct
+    Args:
+      vidpid: string representation of the usb vid:pid, eg. '18d1:2001'
 
-  Return the dev struct of the first USB device with VID:PID vidpid,
-  or None if no device is found. If more than one device check serial
-  if supplied.
+    Returns:
+      string serial number if found, None otherwise.
+    """
+    dev = get_usb_dev(vidpid)
 
-  Args:
-    vidpid: string representation of the usb vid:pid, eg. '18d1:2001'
-    serialname: serialname if specified.
+    if dev:
+        dev_serial = usb.util.get_string(dev, dev.iSerialNumber)
 
-  Returns: pyusb device if found, None otherwise.
-  """
-  vidpidst = vidpid.split(':')
-  vid = int(vidpidst[0], 16)
-  pid = int(vidpidst[1], 16)
+        return dev_serial
 
+    return None
 
-  dev_g = usb.core.find(idVendor=vid, idProduct=pid, find_all=True)
-  dev_list = list(dev_g)
 
-  if not dev_list:
-    return None
+def get_usb_dev(vidpid, serialname=None):
+    """Return the USB pyusb devie struct
+
+    Return the dev struct of the first USB device with VID:PID vidpid,
+    or None if no device is found. If more than one device check serial
+    if supplied.
+
+    Args:
+      vidpid: string representation of the usb vid:pid, eg. '18d1:2001'
+      serialname: serialname if specified.
+
+    Returns:
+      pyusb device if found, None otherwise.
+    """
+    vidpidst = vidpid.split(":")
+    vid = int(vidpidst[0], 16)
+    pid = int(vidpidst[1], 16)
+
+    dev_g = usb.core.find(idVendor=vid, idProduct=pid, find_all=True)
+    dev_list = list(dev_g)
+
+    if not dev_list:
+        return None
+
+    # Check if we have multiple devices and we've specified the serial.
+    dev = None
+    if serialname:
+        for d in dev_list:
+            dev_serial = usb.util.get_string(d, d.iSerialNumber)
+            if dev_serial == serialname:
+                dev = d
+                break
+        if dev is None:
+            return None
+    else:
+        try:
+            dev = dev_list[0]
+        except StopIteration:
+            return None
+
+    return dev
 
-  # Check if we have multiple devices and we've specified the serial.
-  dev = None
-  if serialname:
-    for d in dev_list:
-      dev_serial = usb.util.get_string(d, d.iSerialNumber)
-      if dev_serial == serialname:
-        dev = d
-        break
-    if dev is None:
-      return None
-  else:
-    try:
-      dev = dev_list[0]
-    except StopIteration:
-      return None
-
-  return dev
 
 def check_usb_dev(vidpid, serialname=None):
-  """Return the USB dev number
+    """Return the USB dev number
 
-  Return the dev number of the first USB device with VID:PID vidpid,
-  or None if no device is found. If more than one device check serial
-  if supplied.
+    Return the dev number of the first USB device with VID:PID vidpid,
+    or None if no device is found. If more than one device check serial
+    if supplied.
 
-  Args:
-    vidpid: string representation of the usb vid:pid, eg. '18d1:2001'
-    serialname: serialname if specified.
+    Args:
+      vidpid: string representation of the usb vid:pid, eg. '18d1:2001'
+      serialname: serialname if specified.
 
-  Returns: usb device number if found, None otherwise.
-  """
-  dev = get_usb_dev(vidpid, serialname=serialname)
+    Returns:
+      usb device number if found, None otherwise.
+    """
+    dev = get_usb_dev(vidpid, serialname=serialname)
 
-  if dev:
-    return dev.address
+    if dev:
+        return dev.address
 
-  return None
+    return None
 
 
 def wait_for_usb_remove(vidpid, serialname=None, timeout=None):
-  """Wait for USB device with vidpid to be removed.
+    """Wait for USB device with vidpid to be removed.
+
+    Wrapper for wait_for_usb below
+    """
+    wait_for_usb(
+        vidpid, serialname=serialname, timeout=timeout, desiredpresence=False
+    )
 
-  Wrapper for wait_for_usb below
-  """
-  wait_for_usb(vidpid, serialname=serialname,
-               timeout=timeout, desiredpresence=False)
 
 def wait_for_usb(vidpid, serialname=None, timeout=None, desiredpresence=True):
-  """Wait for usb device with vidpid to be present/absent.
-
-  Args:
-    vidpid: string representation of the usb vid:pid, eg. '18d1:2001'
-    serialname: serialname if specificed.
-    timeout: timeout in seconds, None for no timeout.
-    desiredpresence: True for present, False for not present.
-
-  Raises:
-    TinyServoError: on timeout.
-  """
-  if timeout:
-    finish = datetime.datetime.now() + datetime.timedelta(seconds=timeout)
-  while check_usb(vidpid, serialname) != desiredpresence:
-    time.sleep(.01)
+    """Wait for usb device with vidpid to be present/absent.
+
+    Args:
+      vidpid: string representation of the usb vid:pid, eg. '18d1:2001'
+      serialname: serialname if specificed.
+      timeout: timeout in seconds, None for no timeout.
+      desiredpresence: True for present, False for not present.
+
+    Raises:
+      TinyServoError: on timeout.
+    """
     if timeout:
-      if datetime.datetime.now() > finish:
-        raise TinyServoError('Timeout', 'Timeout waiting for USB %s' % vidpid)
+        finish = datetime.datetime.now() + datetime.timedelta(seconds=timeout)
+    while check_usb(vidpid, serialname) != desiredpresence:
+        time.sleep(0.1)
+        if timeout:
+            if datetime.datetime.now() > finish:
+                raise TinyServoError(
+                    "Timeout", "Timeout waiting for USB %s" % vidpid
+                )
+
 
 def do_serialno(serialno, pty):
-  """Set serialnumber 'serialno' via ec console 'pty'.
-
-  Commands are:
-  # > serialno set 1234
-  # Saving serial number
-  # Serial number: 1234
-
-  Args:
-    serialno: string serial number to set.
-    pty: tinyservo console to send commands.
-
-  Raises:
-    TinyServoError: on failure to set.
-    ptyError: on command interface error.
-  """
-  cmd = 'serialno set %s' % serialno
-  regex = 'Serial number:\s+(\S+)'
-
-  results = pty._issue_cmd_get_results(cmd, [regex])[0]
-  sn = results[1].strip().strip('\n\r')
-
-  if sn == serialno:
-    log('Success !')
-    log('Serial set to %s' % sn)
-  else:
-    log('Serial number set to %s but saved as %s.' % (serialno, sn))
-    raise TinyServoError(
-        'Serial Number',
-        'Serial number set to %s but saved as %s.' % (serialno, sn))
+    """Set serialnumber 'serialno' via ec console 'pty'.
+
+    Commands are:
+    # > serialno set 1234
+    # Saving serial number
+    # Serial number: 1234
+
+    Args:
+      serialno: string serial number to set.
+      pty: tinyservo console to send commands.
+
+    Raises:
+      TinyServoError: on failure to set.
+      ptyError: on command interface error.
+    """
+    cmd = r"serialno set %s" % serialno
+    regex = r"Serial number:\s+(\S+)"
+
+    results = pty._issue_cmd_get_results(cmd, [regex])[0]
+    sn = results[1].strip().strip("\n\r")
+
+    if sn == serialno:
+        log("Success !")
+        log("Serial set to %s" % sn)
+    else:
+        log("Serial number set to %s but saved as %s." % (serialno, sn))
+        raise TinyServoError(
+            "Serial Number",
+            "Serial number set to %s but saved as %s." % (serialno, sn),
+        )
+
 
 def setup_tinyservod(vidpid, interface, serialname=None, debuglog=False):
-  """Set up a pty
-
-  Set up a pty to the ec console in order
-  to send commands. Returns a pty_driver object.
-
-  Args:
-    vidpid: string vidpid of device to access.
-    interface: not used.
-    serialname: string serial name of device requested, optional.
-    debuglog: chatty printout (boolean)
-
-  Returns: pty object
-
-  Raises:
-    UsbError, SusbError: on device not found
-  """
-  vidstr, pidstr = vidpid.split(':')
-  vid = int(vidstr, 16)
-  pid = int(pidstr, 16)
-  suart = stm32uart.Suart(vendor=vid, product=pid,
-                          interface=interface, serialname=serialname,
-                          debuglog=debuglog)
-  suart.run()
-  pty = pty_driver.ptyDriver(suart, [])
-
-  return pty
+    """Set up a pty
+
+    Set up a pty to the ec console in order
+    to send commands. Returns a pty_driver object.
+
+    Args:
+      vidpid: string vidpid of device to access.
+      interface: not used.
+      serialname: string serial name of device requested, optional.
+      debuglog: chatty printout (boolean)
+
+    Returns:
+      pty object
+
+    Raises:
+      UsbError, SusbError: on device not found
+    """
+    vidstr, pidstr = vidpid.split(":")
+    vid = int(vidstr, 16)
+    pid = int(pidstr, 16)
+    suart = stm32uart.Suart(
+        vendor=vid,
+        product=pid,
+        interface=interface,
+        serialname=serialname,
+        debuglog=debuglog,
+    )
+    suart.run()
+    pty = pty_driver.ptyDriver(suart, [])
+
+    return pty