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, 395 insertions, 219 deletions

diff --git a/test/usb_sm_framework_h3.c b/test/usb_sm_framework_h3.c
index ba544a749a..20f9b706c6 100644
--- a/test/usb_sm_framework_h3.c
+++ b/test/usb_sm_framework_h3.c
@@ -1,4 +1,4 @@
-/* Copyright 2019 The Chromium OS Authors. All rights reserved.
+/* Copyright 2019 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
@@ -112,7 +112,7 @@ enum state_id {
 	EXIT_C,
 };
 
-#define PORT0   0
+#define PORT0 0
 
 struct sm_ {
 	/* struct sm_obj must be first */
@@ -198,7 +198,6 @@ static void sm_test_super_A2_exit(const int port)
 	sm[port].seq[sm[port].idx++] = EXIT_A2;
 }
 
-
 static void sm_test_super_B2_entry(const int port)
 {
 	sm[port].seq[sm[port].idx++] = ENTER_B2;
@@ -269,7 +268,6 @@ static void sm_test_A4_exit(const int port)
 	sm[port].seq[sm[port].idx++] = EXIT_A4;
 }
 
-
 static void sm_test_A5_entry(const int port)
 {
 	sm[port].sv_tmp = 0;
@@ -291,7 +289,6 @@ static void sm_test_A5_exit(const int port)
 	sm[port].seq[sm[port].idx++] = EXIT_A5;
 }
 
-
 static void sm_test_A6_entry(const int port)
 {
 	sm[port].sv_tmp = 0;
@@ -355,7 +352,6 @@ static void sm_test_B4_exit(const int port)
 	sm[port].seq[sm[port].idx++] = EXIT_B4;
 }
 
-
 static void sm_test_B5_entry(const int port)
 {
 	sm[port].sv_tmp = 0;
@@ -377,7 +373,6 @@ static void sm_test_B5_exit(const int port)
 	sm[port].seq[sm[port].idx++] = EXIT_B5;
 }
 
-
 static void sm_test_B6_entry(const int port)
 {
 	sm[port].sv_tmp = 0;
@@ -440,63 +435,88 @@ test_static int test_hierarchy_0(void)
 	set_state_sm(port, SM_TEST_A4);
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], ENTER_A4, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], ENTER_A4, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], RUN_A4, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], RUN_A4, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], EXIT_A4, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_B4, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], EXIT_A4, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_B4, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], RUN_B4, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], RUN_B4, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], EXIT_B4, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_B5, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], EXIT_B4, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_B5, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], RUN_B5, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], RUN_B5, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], EXIT_B5, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_B6, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], EXIT_B5, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_B6, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], RUN_B6, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], RUN_B6, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], EXIT_B6, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_C, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], EXIT_B6, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_C, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], RUN_C, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], RUN_C, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], EXIT_C, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_A7, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], EXIT_C, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_A7, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], RUN_A7, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], RUN_A7, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], EXIT_A7, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_A6, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], EXIT_A7, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_A6, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], RUN_A6, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], RUN_A6, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], EXIT_A6, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_A5, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], EXIT_A6, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_A5, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], RUN_A5, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], RUN_A5, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], EXIT_A5, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_A4, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], EXIT_A5, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_A4, "%d");
+	++i;
 
 	for (; i < SEQUENCE_SIZE; i++)
 		TEST_EQ(sm[port].seq[i], 0, "%d");
@@ -512,71 +532,104 @@ test_static int test_hierarchy_1(void)
 	set_state_sm(port, SM_TEST_A4);
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], ENTER_A3, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_A4, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], ENTER_A3, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_A4, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], RUN_A4, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], RUN_A3, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], RUN_A4, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], RUN_A3, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], EXIT_A4, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], EXIT_A3, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_B3, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_B4, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], EXIT_A4, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], EXIT_A3, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_B3, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_B4, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], RUN_B4, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], RUN_B3, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], RUN_B4, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], RUN_B3, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], EXIT_B4, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], EXIT_B3, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_B5, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], EXIT_B4, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], EXIT_B3, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_B5, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], RUN_B5, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], RUN_B5, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], EXIT_B5, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_B6, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], EXIT_B5, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_B6, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], RUN_B6, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], RUN_B6, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], EXIT_B6, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_C, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], EXIT_B6, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_C, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], RUN_C, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], RUN_C, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], EXIT_C, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_A7, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], EXIT_C, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_A7, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], RUN_A7, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], RUN_A7, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], EXIT_A7, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_A6, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], EXIT_A7, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_A6, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], RUN_A6, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], RUN_A6, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], EXIT_A6, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_A3, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_A5, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], EXIT_A6, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_A3, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_A5, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], RUN_A5, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], RUN_A3, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], RUN_A5, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], RUN_A3, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], EXIT_A5, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_A4, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], EXIT_A5, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_A4, "%d");
+	++i;
 
 	for (i = 33; i < SEQUENCE_SIZE; i++)
 		TEST_EQ(sm[port].seq[i], 0, "%d");
@@ -586,88 +639,130 @@ test_static int test_hierarchy_1(void)
 
 test_static int test_hierarchy_2(void)
 {
-
 	int port = PORT0;
 	int i = 0;
 
 	set_state_sm(port, SM_TEST_A4);
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], ENTER_A2, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_A3, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_A4, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], ENTER_A2, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_A3, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_A4, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], RUN_A4, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], RUN_A3, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], RUN_A2, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], RUN_A4, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], RUN_A3, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], RUN_A2, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], EXIT_A4, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], EXIT_A3, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], EXIT_A2, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_B2, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_B3, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_B4, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], EXIT_A4, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], EXIT_A3, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], EXIT_A2, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_B2, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_B3, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_B4, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], RUN_B4, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], RUN_B3, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], RUN_B2, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], RUN_B4, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], RUN_B3, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], RUN_B2, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], EXIT_B4, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], EXIT_B3, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_B5, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], EXIT_B4, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], EXIT_B3, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_B5, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], RUN_B5, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], RUN_B2, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], RUN_B5, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], RUN_B2, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], EXIT_B5, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], EXIT_B2, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_B6, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], EXIT_B5, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], EXIT_B2, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_B6, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], RUN_B6, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], RUN_B6, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], EXIT_B6, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_C, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], EXIT_B6, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_C, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], RUN_C, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], RUN_C, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], EXIT_C, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_A7, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], EXIT_C, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_A7, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], RUN_A7, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], RUN_A7, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], EXIT_A7, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_A2, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_A6, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], EXIT_A7, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_A2, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_A6, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], RUN_A6, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], RUN_A2, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], RUN_A6, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], RUN_A2, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], EXIT_A6, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_A3, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_A5, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], EXIT_A6, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_A3, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_A5, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], RUN_A5, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], RUN_A3, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], RUN_A2, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], RUN_A5, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], RUN_A3, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], RUN_A2, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], EXIT_A5, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_A4, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], EXIT_A5, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_A4, "%d");
+	++i;
 
 	for (; i < SEQUENCE_SIZE; i++)
 		TEST_EQ(sm[port].seq[i], 0, "%d");
@@ -677,100 +772,154 @@ test_static int test_hierarchy_2(void)
 
 test_static int test_hierarchy_3(void)
 {
-
 	int port = PORT0;
 	int i = 0;
 
 	set_state_sm(port, SM_TEST_A4);
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], ENTER_A1, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_A2, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_A3, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_A4, "%d"); ++i;
-
+	TEST_EQ(sm[port].seq[i], ENTER_A1, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_A2, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_A3, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_A4, "%d");
+	++i;
+
+	run_sm();
+	TEST_EQ(sm[port].seq[i], RUN_A4, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], RUN_A3, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], RUN_A2, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], RUN_A1, "%d");
+	++i;
+
 	run_sm();
-	TEST_EQ(sm[port].seq[i], RUN_A4, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], RUN_A3, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], RUN_A2, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], RUN_A1, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], EXIT_A4, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], EXIT_A3, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], EXIT_A2, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], EXIT_A1, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_B1, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_B2, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_B3, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_B4, "%d");
+	++i;
+
+	run_sm();
+	TEST_EQ(sm[port].seq[i], RUN_B4, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], RUN_B3, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], RUN_B2, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], RUN_B1, "%d");
+	++i;
+
+	run_sm();
+	TEST_EQ(sm[port].seq[i], EXIT_B4, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], EXIT_B3, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_B5, "%d");
+	++i;
+
+	run_sm();
+	TEST_EQ(sm[port].seq[i], RUN_B5, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], RUN_B2, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], RUN_B1, "%d");
+	++i;
+
+	run_sm();
+	TEST_EQ(sm[port].seq[i], EXIT_B5, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], EXIT_B2, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_B6, "%d");
+	++i;
+
+	run_sm();
+	TEST_EQ(sm[port].seq[i], RUN_B6, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], RUN_B1, "%d");
+	++i;
+
+	run_sm();
+	TEST_EQ(sm[port].seq[i], EXIT_B6, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], EXIT_B1, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_C, "%d");
+	++i;
+
+	run_sm();
+	TEST_EQ(sm[port].seq[i], RUN_C, "%d");
+	++i;
+
+	run_sm();
+	TEST_EQ(sm[port].seq[i], EXIT_C, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_A1, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_A7, "%d");
+	++i;
+
+	run_sm();
+	TEST_EQ(sm[port].seq[i], RUN_A7, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], RUN_A1, "%d");
+	++i;
+
+	run_sm();
+	TEST_EQ(sm[port].seq[i], EXIT_A7, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_A2, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_A6, "%d");
+	++i;
+
+	run_sm();
+	TEST_EQ(sm[port].seq[i], RUN_A6, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], RUN_A2, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], RUN_A1, "%d");
+	++i;
 
-	run_sm();
-	TEST_EQ(sm[port].seq[i], EXIT_A4, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], EXIT_A3, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], EXIT_A2, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], EXIT_A1, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_B1, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_B2, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_B3, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_B4, "%d"); ++i;
-
-	run_sm();
-	TEST_EQ(sm[port].seq[i], RUN_B4, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], RUN_B3, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], RUN_B2, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], RUN_B1, "%d"); ++i;
-
-	run_sm();
-	TEST_EQ(sm[port].seq[i], EXIT_B4, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], EXIT_B3, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_B5, "%d"); ++i;
-
-	run_sm();
-	TEST_EQ(sm[port].seq[i], RUN_B5, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], RUN_B2, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], RUN_B1, "%d"); ++i;
-
-	run_sm();
-	TEST_EQ(sm[port].seq[i], EXIT_B5, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], EXIT_B2, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_B6, "%d"); ++i;
-
-	run_sm();
-	TEST_EQ(sm[port].seq[i], RUN_B6, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], RUN_B1, "%d"); ++i;
-
-	run_sm();
-	TEST_EQ(sm[port].seq[i], EXIT_B6, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], EXIT_B1, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_C, "%d"); ++i;
-
-	run_sm();
-	TEST_EQ(sm[port].seq[i], RUN_C, "%d"); ++i;
-
-	run_sm();
-	TEST_EQ(sm[port].seq[i], EXIT_C, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_A1, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_A7, "%d"); ++i;
-
-	run_sm();
-	TEST_EQ(sm[port].seq[i], RUN_A7, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], RUN_A1, "%d"); ++i;
-
-	run_sm();
-	TEST_EQ(sm[port].seq[i], EXIT_A7, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_A2, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_A6, "%d"); ++i;
-
-	run_sm();
-	TEST_EQ(sm[port].seq[i], RUN_A6, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], RUN_A2, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], RUN_A1, "%d"); ++i;
-
-	run_sm();
-	TEST_EQ(sm[port].seq[i], EXIT_A6, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_A3, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_A5, "%d"); ++i;
+	run_sm();
+	TEST_EQ(sm[port].seq[i], EXIT_A6, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_A3, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_A5, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], RUN_A5, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], RUN_A3, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], RUN_A2, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], RUN_A1, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], RUN_A5, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], RUN_A3, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], RUN_A2, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], RUN_A1, "%d");
+	++i;
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], EXIT_A5, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_A4, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], EXIT_A5, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_A4, "%d");
+	++i;
 
 	for (; i < SEQUENCE_SIZE; i++)
 		TEST_EQ(sm[port].seq[i], 0, "%d");
@@ -787,35 +936,53 @@ test_static int test_set_state_from_parents(void)
 	test_control.a3_entry_to = &states[SM_TEST_B4];
 	run_sm();
 	set_state_sm(port, SM_TEST_A4);
-	TEST_EQ(sm[port].seq[i], ENTER_A1, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_A2, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_A3, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], ENTER_A1, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_A2, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_A3, "%d");
+	++i;
 	/* Does not enter or exit A4 */
-	TEST_EQ(sm[port].seq[i], EXIT_A3, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], EXIT_A2, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], EXIT_A1, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_B1, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_B2, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_B3, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_B4, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], EXIT_A3, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], EXIT_A2, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], EXIT_A1, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_B1, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_B2, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_B3, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_B4, "%d");
+	++i;
 	/* Ensure we didn't go further than above statements */
 	TEST_EQ(sm[port].seq[i], 0, "%d");
 
 	test_control.b3_run_to = &states[SM_TEST_B5];
 	run_sm();
-	TEST_EQ(sm[port].seq[i], RUN_B4, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], RUN_B3, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], RUN_B4, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], RUN_B3, "%d");
+	++i;
 	/* Does not run b2 or b1 */
-	TEST_EQ(sm[port].seq[i], EXIT_B4, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], EXIT_B3, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_B5, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], EXIT_B4, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], EXIT_B3, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_B5, "%d");
+	++i;
 	/* Ensure we didn't go further than above statements */
 	TEST_EQ(sm[port].seq[i], 0, "%d");
 
 	run_sm();
-	TEST_EQ(sm[port].seq[i], RUN_B5, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], RUN_B2, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], RUN_B1, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], RUN_B5, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], RUN_B2, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], RUN_B1, "%d");
+	++i;
 	/* Ensure we didn't go further than above statements */
 	TEST_EQ(sm[port].seq[i], 0, "%d");
 
@@ -827,15 +994,24 @@ test_static int test_set_state_from_parents(void)
 	test_control.c_entry_to = &states[SM_TEST_A7];
 	test_control.c_exit_to = &states[SM_TEST_A4];
 	run_sm();
-	TEST_EQ(sm[port].seq[i], EXIT_B5, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], EXIT_B2, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_B6, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], EXIT_B6, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], EXIT_B1, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_C, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], EXIT_C, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_A1, "%d"); ++i;
-	TEST_EQ(sm[port].seq[i], ENTER_A7, "%d"); ++i;
+	TEST_EQ(sm[port].seq[i], EXIT_B5, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], EXIT_B2, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_B6, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], EXIT_B6, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], EXIT_B1, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_C, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], EXIT_C, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_A1, "%d");
+	++i;
+	TEST_EQ(sm[port].seq[i], ENTER_A7, "%d");
+	++i;
 	/* Ensure we didn't go further than above statements */
 	TEST_EQ(sm[port].seq[i], 0, "%d");
 
@@ -985,7 +1161,7 @@ int test_task(void *u)
 	return EC_SUCCESS;
 }
 
-void run_test(int argc, char **argv)
+void run_test(int argc, const char **argv)
 {
 	test_reset();
 #if defined(TEST_USB_SM_FRAMEWORK_H3)