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, 40 insertions, 53 deletions

diff --git a/include/queue.h b/include/queue.h
index 6cf72563cb..6e7d4abbf8 100644
--- a/include/queue.h
+++ b/include/queue.h
@@ -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.
  *
@@ -75,9 +75,9 @@ struct queue {
 
 	struct queue_policy const *policy;
 
-	size_t  buffer_units; /* size of buffer (in units) */
-	size_t  buffer_units_mask; /* size of buffer (in units) - 1*/
-	size_t  unit_bytes;   /* size of unit   (in byte) */
+	size_t buffer_units; /* size of buffer (in units) */
+	size_t buffer_units_mask; /* size of buffer (in units) - 1*/
+	size_t unit_bytes; /* size of unit   (in byte) */
 	uint8_t *buffer;
 };
 
@@ -86,14 +86,14 @@ struct queue {
  * and state structure.  This macro creates a compound literal that can be used
  * to statically initialize a queue.
  */
-#define QUEUE(SIZE, TYPE, POLICY)				\
-	((struct queue) {					\
-		.state        = &((struct queue_state){}),	\
-		.policy       = &POLICY,			\
+#define QUEUE(SIZE, TYPE, POLICY)                                             \
+	((struct queue){                                                      \
+		.state = &((struct queue_state){}),                           \
+		.policy = &POLICY,                                            \
 		.buffer_units = BUILD_CHECK_INLINE(SIZE, POWER_OF_TWO(SIZE)), \
-		.buffer_units_mask = SIZE - 1,			\
-		.unit_bytes   = sizeof(TYPE),			\
-		.buffer       = (uint8_t *) &((TYPE[SIZE]){}),	\
+		.buffer_units_mask = SIZE - 1,                                \
+		.unit_bytes = sizeof(TYPE),                                   \
+		.buffer = (uint8_t *)&((TYPE[SIZE]){}),                       \
 	})
 
 /* Initialize the queue to empty state. */
@@ -143,7 +143,7 @@ void queue_next(struct queue const *q, struct queue_iterator *it);
  * buffer units.
  */
 struct queue_chunk {
-	size_t  count;
+	size_t count;
 	void *buffer;
 };
 
@@ -206,12 +206,8 @@ size_t queue_add_unit(struct queue const *q, const void *src);
 size_t queue_add_units(struct queue const *q, const void *src, size_t count);
 
 /* Add multiple units to queue using supplied memcpy. */
-size_t queue_add_memcpy(struct queue const *q,
-			const void *src,
-			size_t count,
-			void *(*memcpy)(void *dest,
-					const void *src,
-					size_t n));
+size_t queue_add_memcpy(struct queue const *q, const void *src, size_t count,
+			void *(*memcpy)(void *dest, const void *src, size_t n));
 
 /* Remove one unit from the begin of the queue. */
 size_t queue_remove_unit(struct queue const *q, void *dest);
@@ -220,27 +216,18 @@ size_t queue_remove_unit(struct queue const *q, void *dest);
 size_t queue_remove_units(struct queue const *q, void *dest, size_t count);
 
 /* Remove multiple units from the begin of the queue using supplied memcpy. */
-size_t queue_remove_memcpy(struct queue const *q,
-			   void *dest,
-			   size_t count,
-			   void *(*memcpy)(void *dest,
-					   const void *src,
+size_t queue_remove_memcpy(struct queue const *q, void *dest, size_t count,
+			   void *(*memcpy)(void *dest, const void *src,
 					   size_t n));
 
 /* Peek (return but don't remove) the count elements starting with the i'th. */
-size_t queue_peek_units(struct queue const *q,
-			void *dest,
-			size_t i,
+size_t queue_peek_units(struct queue const *q, void *dest, size_t i,
 			size_t count);
 
 /* Peek (return but don't remove) the count elements starting with the i'th. */
-size_t queue_peek_memcpy(struct queue const *q,
-			 void *dest,
-			 size_t i,
-			 size_t count,
-			 void *(*memcpy)(void *dest,
-				const void *src,
-				size_t n));
+size_t
+queue_peek_memcpy(struct queue const *q, void *dest, size_t i, size_t count,
+		  void *(*memcpy)(void *dest, const void *src, size_t n));
 
 /*
  * These macros will statically select the queue functions based on the number
@@ -248,28 +235,28 @@ size_t queue_peek_memcpy(struct queue const *q,
  * and remove functions are much faster than calling the equivalent generic
  * version with a count of one.
  */
-#define QUEUE_ADD_UNITS(q, src, count)					\
-	({								\
-		size_t result;						\
-									\
-		if (count == 1)						\
-			result = queue_add_unit(q, src);		\
-		else							\
-			result = queue_add_units(q, src, count);	\
-									\
-		result;							\
+#define QUEUE_ADD_UNITS(q, src, count)                           \
+	({                                                       \
+		size_t result;                                   \
+                                                                 \
+		if (count == 1)                                  \
+			result = queue_add_unit(q, src);         \
+		else                                             \
+			result = queue_add_units(q, src, count); \
+                                                                 \
+		result;                                          \
 	})
 
-#define QUEUE_REMOVE_UNITS(q, dest, count)				\
-	({								\
-		size_t result;						\
-									\
-		if (count == 1)						\
-			result = queue_remove_unit(q, dest);		\
-		else							\
-			result = queue_remove_units(q, dest, count);	\
-									\
-		result;							\
+#define QUEUE_REMOVE_UNITS(q, dest, count)                           \
+	({                                                           \
+		size_t result;                                       \
+                                                                     \
+		if (count == 1)                                      \
+			result = queue_remove_unit(q, dest);         \
+		else                                                 \
+			result = queue_remove_units(q, dest, count); \
+                                                                     \
+		result;                                              \
 	})
 
 #endif /* __CROS_EC_QUEUE_H */