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, 38 insertions, 58 deletions

diff --git a/extra/usb_gpio/usb_gpio.c b/extra/usb_gpio/usb_gpio.c
index 8973f3d304..7f2121d2b0 100644
--- a/extra/usb_gpio/usb_gpio.c
+++ b/extra/usb_gpio/usb_gpio.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 The Chromium OS Authors. All rights reserved.
+ * Copyright 2014 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -11,54 +11,46 @@
 #include <string.h>
 #include <unistd.h>
 
-#define CHECK(expression)					\
-	({							\
-		int error__ = (expression);			\
-								\
-		if (error__ != 0) {				\
-			fprintf(stderr,				\
-				"libusb error: %s:%d %s\n",	\
-				__FILE__,			\
-				__LINE__,			\
-				libusb_error_name(error__));	\
-			return error__;				\
-		}						\
-								\
-		error__;					\
+#define CHECK(expression)                                                     \
+	({                                                                    \
+		int error__ = (expression);                                   \
+                                                                              \
+		if (error__ != 0) {                                           \
+			fprintf(stderr, "libusb error: %s:%d %s\n", __FILE__, \
+				__LINE__, libusb_error_name(error__));        \
+			return error__;                                       \
+		}                                                             \
+                                                                              \
+		error__;                                                      \
 	})
 
 #define TRANSFER_TIMEOUT_MS 100
 
-static int gpio_write(libusb_device_handle *device,
-		      uint32_t set_mask,
+static int gpio_write(libusb_device_handle *device, uint32_t set_mask,
 		      uint32_t clear_mask)
 {
 	uint8_t command[8];
-	int     transferred;
+	int transferred;
 
-	command[0] = (set_mask >>  0) & 0xff;
-	command[1] = (set_mask >>  8) & 0xff;
+	command[0] = (set_mask >> 0) & 0xff;
+	command[1] = (set_mask >> 8) & 0xff;
 	command[2] = (set_mask >> 16) & 0xff;
 	command[3] = (set_mask >> 24) & 0xff;
 
-	command[4] = (clear_mask >>  0) & 0xff;
-	command[5] = (clear_mask >>  8) & 0xff;
+	command[4] = (clear_mask >> 0) & 0xff;
+	command[5] = (clear_mask >> 8) & 0xff;
 	command[6] = (clear_mask >> 16) & 0xff;
 	command[7] = (clear_mask >> 24) & 0xff;
 
-	CHECK(libusb_bulk_transfer(device,
-				   LIBUSB_ENDPOINT_OUT | 2,
-				   command,
-				   sizeof(command),
-				   &transferred,
+	CHECK(libusb_bulk_transfer(device, LIBUSB_ENDPOINT_OUT | 2, command,
+				   sizeof(command), &transferred,
 				   TRANSFER_TIMEOUT_MS));
 
 	if (transferred != sizeof(command)) {
 		fprintf(stderr,
 			"Failed to transfer full command "
 			"(sent %d of %d bytes)\n",
-			transferred,
-			(int)sizeof(command));
+			transferred, (int)sizeof(command));
 		return LIBUSB_ERROR_OTHER;
 	}
 
@@ -68,38 +60,29 @@ static int gpio_write(libusb_device_handle *device,
 static int gpio_read(libusb_device_handle *device, uint32_t *mask)
 {
 	uint8_t response[4];
-	int     transferred;
+	int transferred;
 
 	/*
 	 * The first query does triggers the sampling of the GPIO values, the
 	 * second query reads them back.
 	 */
-	CHECK(libusb_bulk_transfer(device,
-				   LIBUSB_ENDPOINT_IN | 2,
-				   response,
-				   sizeof(response),
-				   &transferred,
+	CHECK(libusb_bulk_transfer(device, LIBUSB_ENDPOINT_IN | 2, response,
+				   sizeof(response), &transferred,
 				   TRANSFER_TIMEOUT_MS));
 
-	CHECK(libusb_bulk_transfer(device,
-				   LIBUSB_ENDPOINT_IN | 2,
-				   response,
-				   sizeof(response),
-				   &transferred,
+	CHECK(libusb_bulk_transfer(device, LIBUSB_ENDPOINT_IN | 2, response,
+				   sizeof(response), &transferred,
 				   TRANSFER_TIMEOUT_MS));
 
 	if (transferred != sizeof(response)) {
 		fprintf(stderr,
 			"Failed to transfer full response "
 			"(read %d of %d bytes)\n",
-			transferred,
-			(int)sizeof(response));
+			transferred, (int)sizeof(response));
 		return LIBUSB_ERROR_OTHER;
 	}
 
-	*mask = (response[0] <<  0 |
-		 response[1] <<  8 |
-		 response[2] << 16 |
+	*mask = (response[0] << 0 | response[1] << 8 | response[2] << 16 |
 		 response[3] << 24);
 
 	return 0;
@@ -107,13 +90,13 @@ static int gpio_read(libusb_device_handle *device, uint32_t *mask)
 
 int main(int argc, char **argv)
 {
-	libusb_context       *context;
+	libusb_context *context;
 	libusb_device_handle *device;
-	uint16_t              vendor_id  = 0x18d1; /* Google */
-	uint16_t              product_id = 0x500f; /* discovery-stm32f072 */
-	int                   interface = 1;	   /* gpio interface */
+	uint16_t vendor_id = 0x18d1; /* Google */
+	uint16_t product_id = 0x500f; /* discovery-stm32f072 */
+	int interface = 1; /* gpio interface */
 
-	if (!(argc == 2 && strcmp(argv[1], "read")  == 0) &&
+	if (!(argc == 2 && strcmp(argv[1], "read") == 0) &&
 	    !(argc == 4 && strcmp(argv[1], "write") == 0)) {
 		puts("Usage: usb_gpio read\n"
 		     "       usb_gpio write <set_mask> <clear_mask>\n");
@@ -122,15 +105,12 @@ int main(int argc, char **argv)
 
 	CHECK(libusb_init(&context));
 
-	device = libusb_open_device_with_vid_pid(context,
-						 vendor_id,
-						 product_id);
+	device =
+		libusb_open_device_with_vid_pid(context, vendor_id, product_id);
 
 	if (device == NULL) {
-		fprintf(stderr,
-			"Unable to find device 0x%04x:0x%04x\n",
-			vendor_id,
-			product_id);
+		fprintf(stderr, "Unable to find device 0x%04x:0x%04x\n",
+			vendor_id, product_id);
 		return 1;
 	}
 
@@ -146,7 +126,7 @@ int main(int argc, char **argv)
 	}
 
 	if (argc == 4 && strcmp(argv[1], "write") == 0) {
-		uint32_t set_mask   = strtol(argv[2], NULL, 0);
+		uint32_t set_mask = strtol(argv[2], NULL, 0);
 		uint32_t clear_mask = strtol(argv[3], NULL, 0);
 
 		CHECK(gpio_write(device, set_mask, clear_mask));