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, 27 insertions, 41 deletions

diff --git a/common/i2c_trace.c b/common/i2c_trace.c
index af65d85210..c7207698b7 100644
--- a/common/i2c_trace.c
+++ b/common/i2c_trace.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.
  */
@@ -11,8 +11,8 @@
 #include "util.h"
 
 #define CPUTS(outstr) cputs(CC_I2C, outstr)
-#define CPRINTS(format, args...) cprints(CC_I2C, format, ## args)
-#define CPRINTF(format, args...) cprintf(CC_I2C, format, ## args)
+#define CPRINTS(format, args...) cprints(CC_I2C, format, ##args)
+#define CPRINTF(format, args...) cprintf(CC_I2C, format, ##args)
 
 struct i2c_trace_range {
 	bool enabled;
@@ -23,18 +23,17 @@ struct i2c_trace_range {
 
 static struct i2c_trace_range trace_entries[8];
 
-void i2c_trace_notify(int port, uint16_t addr_flags,
-		      const uint8_t *out_data, size_t out_size,
-		      const uint8_t *in_data, size_t in_size, int ret)
+void i2c_trace_notify(int port, uint16_t addr_flags, const uint8_t *out_data,
+		      size_t out_size, const uint8_t *in_data, size_t in_size,
+		      int ret)
 {
 	size_t i;
 	uint16_t addr = I2C_STRIP_FLAGS(addr_flags);
 
 	for (i = 0; i < ARRAY_SIZE(trace_entries); i++)
-		if (trace_entries[i].enabled
-		    && trace_entries[i].port == port
-		    && trace_entries[i].addr_lo <= addr
-		    && trace_entries[i].addr_hi >= addr)
+		if (trace_entries[i].enabled && trace_entries[i].port == port &&
+		    trace_entries[i].addr_lo <= addr &&
+		    trace_entries[i].addr_hi >= addr)
 			goto trace_enabled;
 	return;
 
@@ -66,19 +65,16 @@ static int command_i2ctrace_list(void)
 	for (i = 0; i < ARRAY_SIZE(trace_entries); i++) {
 		if (trace_entries[i].enabled) {
 			i2c_port = get_i2c_port(trace_entries[i].port);
-			ccprintf("%-2zd %d %-8s 0x%X",
-				 i,
-				 trace_entries[i].port,
+			ccprintf("%-2zd %d %-8s 0x%X", i, trace_entries[i].port,
 #ifndef CONFIG_ZEPHYR
 				 i2c_port->name,
 #else
 				 "",
 #endif /* CONFIG_ZEPHYR */
 				 trace_entries[i].addr_lo);
-			if (trace_entries[i].addr_hi
-			    != trace_entries[i].addr_lo)
-				ccprintf(" to 0x%X",
-					 trace_entries[i].addr_hi);
+			if (trace_entries[i].addr_hi !=
+			    trace_entries[i].addr_lo)
+				ccprintf(" to 0x%X", trace_entries[i].addr_hi);
 			ccprintf("\n");
 		}
 	}
@@ -95,8 +91,7 @@ static int command_i2ctrace_disable(size_t id)
 	return EC_SUCCESS;
 }
 
-static int command_i2ctrace_enable(int port, int addr_lo,
-				   int addr_hi)
+static int command_i2ctrace_enable(int port, int addr_lo, int addr_hi)
 {
 	struct i2c_trace_range *t;
 	struct i2c_trace_range *new_entry = NULL;
@@ -111,41 +106,34 @@ static int command_i2ctrace_enable(int port, int addr_lo,
 	 * Scan thru existing entries to see if there is one we can
 	 * extend instead of making a new entry
 	 */
-	for (t = trace_entries;
-	     t < trace_entries + ARRAY_SIZE(trace_entries);
+	for (t = trace_entries; t < trace_entries + ARRAY_SIZE(trace_entries);
 	     t++) {
 		if (t->enabled && t->port == port) {
 			/* Subset of existing range, do nothing */
-			if (t->addr_lo <= addr_lo &&
-			    t->addr_hi >= addr_hi)
+			if (t->addr_lo <= addr_lo && t->addr_hi >= addr_hi)
 				return EC_SUCCESS;
 
 			/* Extends exising range on both directions, replace */
-			if (t->addr_lo >= addr_lo &&
-			    t->addr_hi <= addr_hi) {
+			if (t->addr_lo >= addr_lo && t->addr_hi <= addr_hi) {
 				t->enabled = 0;
-				return command_i2ctrace_enable(
-					port, addr_lo, addr_hi);
+				return command_i2ctrace_enable(port, addr_lo,
+							       addr_hi);
 			}
 
 			/* Extends existing range below */
 			if (t->addr_lo - 1 <= addr_hi &&
 			    t->addr_hi >= addr_hi) {
 				t->enabled = 0;
-				return command_i2ctrace_enable(
-					port,
-					addr_lo,
-					t->addr_hi);
+				return command_i2ctrace_enable(port, addr_lo,
+							       t->addr_hi);
 			}
 
 			/* Extends existing range above */
 			if (t->addr_lo <= addr_lo &&
 			    t->addr_hi + 1 >= addr_lo) {
 				t->enabled = 0;
-				return command_i2ctrace_enable(
-					port,
-					t->addr_lo,
-					addr_hi);
+				return command_i2ctrace_enable(port, t->addr_lo,
+							       addr_hi);
 			}
 		} else if (!t->enabled && !new_entry) {
 			new_entry = t;
@@ -165,8 +153,7 @@ static int command_i2ctrace_enable(int port, int addr_lo,
 	return EC_ERROR_MEMORY_ALLOCATION;
 }
 
-
-static int command_i2ctrace(int argc, char **argv)
+static int command_i2ctrace(int argc, const char **argv)
 {
 	int id_or_port;
 	int address_low;
@@ -204,14 +191,13 @@ static int command_i2ctrace(int argc, char **argv)
 			return EC_ERROR_PARAM_COUNT;
 		}
 
-		return command_i2ctrace_enable(
-			id_or_port, address_low, address_high);
+		return command_i2ctrace_enable(id_or_port, address_low,
+					       address_high);
 	}
 
 	return EC_ERROR_PARAM1;
 }
-DECLARE_CONSOLE_COMMAND(i2ctrace,
-			command_i2ctrace,
+DECLARE_CONSOLE_COMMAND(i2ctrace, command_i2ctrace,
 			"[list | disable <id> | enable <port> <address> | "
 			"enable <port> <address-low> <address-high>]",
 			"Trace I2C transactions");