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

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

Relevant changes:

git log --oneline e5fb0b9ba4..28712dae9d -- board/hatch_fp
board/bloonchipper 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
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
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
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
dc3e9008b8 board/hatch_fp/board.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:246424843 b:234181908 b:244781166 b:234181908 b:244387210
BUG=b:242720240 chromium:1098010 b:180945056 b:236025198 b:234181908
BUG=b:234181908 b:237344361 b:131913998 b:236386294 b:234143158
BUG=b:234781655 b:215613183 b:242720910
TEST=`make -j buildall`
TEST=./test/run_device_tests.py --board bloonchipper
     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 "stm32f_rtc": PASSED
     Test "panic_data_bloonchipper_v2.0.4277": PASSED
     Test "panic_data_bloonchipper_v2.0.5938": PASSED

Force-Relevant-Builds: all
Signed-off-by: Tom Hughes <tomhughes@chromium.org>
Change-Id: I264ad0ffe7afcd507a1e483c6e934a9c4fea47c3

1 files changed, 57 insertions, 54 deletions

diff --git a/test/flash.c b/test/flash.c
index 4f9ca74016..bd1b646f1f 100644
--- a/test/flash.c
+++ b/test/flash.c
@@ -1,4 +1,4 @@
-/* Copyright 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright 2012 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -103,60 +103,59 @@ static int verify_erase(int offset, int size)
 	return EC_SUCCESS;
 }
 
-
-#define VERIFY_NO_WRITE(off, sz, d) \
-	do { \
-		record_flash(off, sz); \
+#define VERIFY_NO_WRITE(off, sz, d)                                        \
+	do {                                                               \
+		record_flash(off, sz);                                     \
 		TEST_ASSERT(host_command_write(off, sz, d) != EC_SUCCESS); \
-		TEST_ASSERT(verify_flash(off, sz) == EC_SUCCESS); \
+		TEST_ASSERT(verify_flash(off, sz) == EC_SUCCESS);          \
 	} while (0)
 
-#define VERIFY_NO_ERASE(off, sz) \
-	do { \
-		record_flash(off, sz); \
+#define VERIFY_NO_ERASE(off, sz)                                        \
+	do {                                                            \
+		record_flash(off, sz);                                  \
 		TEST_ASSERT(host_command_erase(off, sz) != EC_SUCCESS); \
-		TEST_ASSERT(verify_flash(off, sz) == EC_SUCCESS); \
+		TEST_ASSERT(verify_flash(off, sz) == EC_SUCCESS);       \
 	} while (0)
 
-#define VERIFY_WRITE(off, sz, d) \
-	do { \
+#define VERIFY_WRITE(off, sz, d)                                           \
+	do {                                                               \
 		TEST_ASSERT(host_command_write(off, sz, d) == EC_SUCCESS); \
-		TEST_ASSERT(verify_write(off, sz, d) == EC_SUCCESS); \
+		TEST_ASSERT(verify_write(off, sz, d) == EC_SUCCESS);       \
 	} while (0)
 
-#define VERIFY_ERASE(off, sz) \
-	do { \
+#define VERIFY_ERASE(off, sz)                                           \
+	do {                                                            \
 		TEST_ASSERT(host_command_erase(off, sz) == EC_SUCCESS); \
-		TEST_ASSERT(verify_erase(off, sz) == EC_SUCCESS); \
+		TEST_ASSERT(verify_erase(off, sz) == EC_SUCCESS);       \
 	} while (0)
 
-#define SET_WP_FLAGS(m, f) \
-	TEST_ASSERT(host_command_protect(m, ((f) ? m : 0), \
-				NULL, NULL, NULL) == EC_RES_SUCCESS)
+#define SET_WP_FLAGS(m, f)                                             \
+	TEST_ASSERT(host_command_protect(m, ((f) ? m : 0), NULL, NULL, \
+					 NULL) == EC_RES_SUCCESS)
 
-#define ASSERT_WP_FLAGS(f) \
-	do { \
-		uint32_t flags; \
+#define ASSERT_WP_FLAGS(f)                                                    \
+	do {                                                                  \
+		uint32_t flags;                                               \
 		TEST_ASSERT(host_command_protect(0, 0, &flags, NULL, NULL) == \
-			    EC_RES_SUCCESS); \
-		TEST_ASSERT(flags & (f)); \
+			    EC_RES_SUCCESS);                                  \
+		TEST_ASSERT(flags &(f));                                      \
 	} while (0)
 
-#define ASSERT_WP_NO_FLAGS(f) \
-	do { \
-		uint32_t flags; \
+#define ASSERT_WP_NO_FLAGS(f)                                                 \
+	do {                                                                  \
+		uint32_t flags;                                               \
 		TEST_ASSERT(host_command_protect(0, 0, &flags, NULL, NULL) == \
-			    EC_RES_SUCCESS); \
-		TEST_ASSERT((flags & (f)) == 0); \
+			    EC_RES_SUCCESS);                                  \
+		TEST_ASSERT((flags & (f)) == 0);                              \
 	} while (0)
 
-#define VERIFY_REGION_INFO(r, o, s) \
-	do { \
-		uint32_t offset, size; \
+#define VERIFY_REGION_INFO(r, o, s)                                        \
+	do {                                                               \
+		uint32_t offset, size;                                     \
 		TEST_ASSERT(host_command_region_info(r, &offset, &size) == \
-			    EC_RES_SUCCESS); \
-		TEST_ASSERT(offset == (o)); \
-		TEST_ASSERT(size == (s)); \
+			    EC_RES_SUCCESS);                               \
+		TEST_ASSERT(offset == (o));                                \
+		TEST_ASSERT(size == (s));                                  \
 	} while (0)
 
 int host_command_read(int offset, int size, char *out)
@@ -195,9 +194,8 @@ int host_command_erase(int offset, int size)
 				      sizeof(params), NULL, 0);
 }
 
-int host_command_protect(uint32_t mask, uint32_t flags,
-			 uint32_t *flags_out, uint32_t *valid_out,
-			 uint32_t *writable_out)
+int host_command_protect(uint32_t mask, uint32_t flags, uint32_t *flags_out,
+			 uint32_t *valid_out, uint32_t *writable_out)
 {
 	struct ec_params_flash_protect params;
 	struct ec_response_flash_protect resp;
@@ -222,7 +220,7 @@ int host_command_protect(uint32_t mask, uint32_t flags,
 }
 
 int host_command_region_info(enum ec_flash_region reg, uint32_t *offset,
-				 uint32_t *size)
+			     uint32_t *size)
 {
 	struct ec_params_flash_region_info params;
 	struct ec_response_flash_region_info resp;
@@ -350,29 +348,31 @@ static int test_flash_info(void)
 {
 	struct ec_response_flash_info_1 resp;
 
-	TEST_ASSERT(test_send_host_command(EC_CMD_FLASH_INFO, 1, NULL, 0,
-		    &resp, sizeof(resp)) == EC_RES_SUCCESS);
+	TEST_ASSERT(test_send_host_command(EC_CMD_FLASH_INFO, 1, NULL, 0, &resp,
+					   sizeof(resp)) == EC_RES_SUCCESS);
 
-	TEST_CHECK((resp.flash_size == CONFIG_FLASH_SIZE_BYTES) &&
-		   (resp.write_block_size == CONFIG_FLASH_WRITE_SIZE) &&
-		   (resp.erase_block_size == CONFIG_FLASH_ERASE_SIZE) &&
-		   (resp.protect_block_size == CONFIG_FLASH_BANK_SIZE));
+	TEST_ASSERT(resp.flash_size == CONFIG_FLASH_SIZE_BYTES);
+	TEST_ASSERT(resp.write_block_size == CONFIG_FLASH_WRITE_SIZE);
+	TEST_ASSERT(resp.erase_block_size == CONFIG_FLASH_ERASE_SIZE);
+	TEST_ASSERT(resp.protect_block_size == CONFIG_FLASH_BANK_SIZE);
+	return EC_SUCCESS;
 }
 
 static int test_region_info(void)
 {
 	VERIFY_REGION_INFO(EC_FLASH_REGION_RO,
 			   CONFIG_EC_PROTECTED_STORAGE_OFF +
-			   CONFIG_RO_STORAGE_OFF, EC_FLASH_REGION_RO_SIZE);
+				   CONFIG_RO_STORAGE_OFF,
+			   EC_FLASH_REGION_RO_SIZE);
 	VERIFY_REGION_INFO(EC_FLASH_REGION_ACTIVE,
 			   CONFIG_EC_WRITABLE_STORAGE_OFF +
-			   CONFIG_RW_STORAGE_OFF,
+				   CONFIG_RW_STORAGE_OFF,
 			   CONFIG_EC_WRITABLE_STORAGE_SIZE);
-	VERIFY_REGION_INFO(EC_FLASH_REGION_WP_RO,
-			   CONFIG_WP_STORAGE_OFF, CONFIG_WP_STORAGE_SIZE);
+	VERIFY_REGION_INFO(EC_FLASH_REGION_WP_RO, CONFIG_WP_STORAGE_OFF,
+			   CONFIG_WP_STORAGE_SIZE);
 	VERIFY_REGION_INFO(EC_FLASH_REGION_UPDATE,
 			   CONFIG_EC_WRITABLE_STORAGE_OFF +
-			   CONFIG_RW_STORAGE_OFF,
+				   CONFIG_RW_STORAGE_OFF,
 			   CONFIG_EC_WRITABLE_STORAGE_SIZE);
 
 	return EC_SUCCESS;
@@ -401,9 +401,11 @@ static int test_write_protect(void)
 
 	/* Check we cannot erase anything */
 	TEST_ASSERT(crec_flash_physical_erase(CONFIG_RO_STORAGE_OFF,
-			CONFIG_FLASH_ERASE_SIZE) != EC_SUCCESS);
+					      CONFIG_FLASH_ERASE_SIZE) !=
+		    EC_SUCCESS);
 	TEST_ASSERT(crec_flash_physical_erase(CONFIG_RW_STORAGE_OFF,
-			CONFIG_FLASH_ERASE_SIZE) != EC_SUCCESS);
+					      CONFIG_FLASH_ERASE_SIZE) !=
+		    EC_SUCCESS);
 
 	/* We should not even try to write/erase */
 	VERIFY_NO_ERASE(CONFIG_RO_STORAGE_OFF, CONFIG_FLASH_ERASE_SIZE);
@@ -419,7 +421,8 @@ static int test_boot_write_protect(void)
 	/* Check write protect state persists through reboot */
 	ASSERT_WP_FLAGS(EC_FLASH_PROTECT_RO_NOW | EC_FLASH_PROTECT_RO_AT_BOOT);
 	TEST_ASSERT(crec_flash_physical_erase(CONFIG_RO_STORAGE_OFF,
-			CONFIG_FLASH_ERASE_SIZE) != EC_SUCCESS);
+					      CONFIG_FLASH_ERASE_SIZE) !=
+		    EC_SUCCESS);
 
 	return EC_SUCCESS;
 }
@@ -500,7 +503,7 @@ int task_test(void *data)
 	return EC_SUCCESS;
 }
 
-void run_test(int argc, char **argv)
+void run_test(int argc, const char **argv)
 {
 	msleep(30); /* Wait for TASK_ID_TEST to initialize */
 	task_wake(TASK_ID_TEST);