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, 17 insertions, 19 deletions

diff --git a/util/comm-servo-spi.c b/util/comm-servo-spi.c
index ef6dc7880b..170b1e4e40 100644
--- a/util/comm-servo-spi.c
+++ b/util/comm-servo-spi.c
@@ -1,4 +1,4 @@
-/* Copyright 2018 The Chromium OS Authors. All rights reserved.
+/* Copyright 2018 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -74,8 +74,8 @@ enum mpsse_pins {
  * propagates data on the falling edge
  * and reads data on the rising edge of the clock.
  */
-#define SPI_CMD_TX   (MPSSE_DO_WRITE | MPSSE_WRITE_NEG)
-#define SPI_CMD_RX   (MPSSE_DO_READ)
+#define SPI_CMD_TX (MPSSE_DO_WRITE | MPSSE_WRITE_NEG)
+#define SPI_CMD_RX (MPSSE_DO_READ)
 #define SPI_CMD_TXRX (MPSSE_DO_WRITE | MPSSE_DO_READ | MPSSE_WRITE_NEG)
 
 static int raw_read(uint8_t *buf, int size)
@@ -94,7 +94,7 @@ static int raw_read(uint8_t *buf, int size)
 
 static int mpsse_set_pins(uint8_t levels)
 {
-	uint8_t buf[MPSSE_CMD_SIZE] = {0};
+	uint8_t buf[MPSSE_CMD_SIZE] = { 0 };
 
 	buf[0] = SET_BITS_LOW;
 	buf[1] = levels;
@@ -103,8 +103,8 @@ static int mpsse_set_pins(uint8_t levels)
 	return ftdi_write_data(&ftdi, buf, sizeof(buf)) != sizeof(buf);
 }
 
-static int send_request(int cmd, int version,
-			const uint8_t *outdata, size_t outsize)
+static int send_request(int cmd, int version, const uint8_t *outdata,
+			size_t outsize)
 {
 	uint8_t *txbuf;
 	struct ec_host_request *request;
@@ -133,8 +133,8 @@ static int send_request(int cmd, int version,
 	request->data_len = outsize;
 
 	/* copy the data to transmit after the command header */
-	memcpy(txbuf + MPSSE_CMD_SIZE + sizeof(struct ec_host_request),
-	       outdata, outsize);
+	memcpy(txbuf + MPSSE_CMD_SIZE + sizeof(struct ec_host_request), outdata,
+	       outsize);
 
 	/* Compute the checksum */
 	for (i = MPSSE_CMD_SIZE; i < total_len; i++)
@@ -212,13 +212,12 @@ static int get_response(uint8_t *bodydest, size_t bodylen)
 	/* Check the header */
 	if (hdr.struct_version != EC_HOST_RESPONSE_VERSION) {
 		fprintf(stderr, "response version %d (should be %d)\n",
-			hdr.struct_version,
-			EC_HOST_RESPONSE_VERSION);
+			hdr.struct_version, EC_HOST_RESPONSE_VERSION);
 		return -EC_RES_ERROR;
 	}
 	if (hdr.data_len > bodylen) {
-		fprintf(stderr, "response data_len %d is > %zd\n",
-			hdr.data_len, bodylen);
+		fprintf(stderr, "response data_len %d is > %zd\n", hdr.data_len,
+			bodylen);
 		return -EC_RES_ERROR;
 	}
 
@@ -243,9 +242,8 @@ read_error:
 	return -EC_RES_ERROR;
 }
 
-static int ec_command_servo_spi(int cmd, int version,
-				const void *outdata, int outsize,
-				void *indata, int insize)
+static int ec_command_servo_spi(int cmd, int version, const void *outdata,
+				int outsize, void *indata, int insize)
 {
 	int ret = -EC_RES_ERROR;
 
@@ -275,7 +273,7 @@ static int mpsse_set_clock(uint32_t freq)
 {
 	uint32_t system_clock = 0;
 	uint16_t divisor = 0;
-	uint8_t buf[MPSSE_CMD_SIZE] = {0};
+	uint8_t buf[MPSSE_CMD_SIZE] = { 0 };
 
 	if (freq > 6000000) {
 		buf[0] = TCK_X5;
@@ -307,10 +305,10 @@ static void servo_spi_close(void)
 int comm_init_servo_spi(const char *device_name)
 {
 	int status;
-	uint8_t buf[MPSSE_CMD_SIZE] = {0};
+	uint8_t buf[MPSSE_CMD_SIZE] = { 0 };
 	/* if the user mentioned a device name, use it as serial string */
-	const char *serial = strcmp(CROS_EC_DEV_NAME, device_name) ?
-		device_name : NULL;
+	const char *serial =
+		strcmp(CROS_EC_DEV_NAME, device_name) ? device_name : NULL;
 
 	if (ftdi_init(&ftdi))
 		return -EC_RES_ERROR;