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, 29 insertions, 34 deletions

diff --git a/zephyr/emul/tcpc/emul_tcpci_partner_src.c b/zephyr/emul/tcpc/emul_tcpci_partner_src.c
index 8efc4327c8..c81d69c25f 100644
--- a/zephyr/emul/tcpc/emul_tcpci_partner_src.c
+++ b/zephyr/emul/tcpc/emul_tcpci_partner_src.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 The Chromium OS Authors. All rights reserved.
+/* Copyright 2021 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -7,7 +7,7 @@
 LOG_MODULE_REGISTER(tcpci_src_emul, CONFIG_TCPCI_EMUL_LOG_LEVEL);
 
 #include <zephyr/sys/byteorder.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include "common.h"
 #include "emul/tcpc/emul_tcpci_partner_common.h"
@@ -35,11 +35,11 @@ static void tcpci_src_emul_start_source_capability_custom_time(
  *
  * @param data Pointer to USB-C source device emulator data
  */
-static void tcpci_src_emul_start_source_capability_timer(
-	struct tcpci_src_emul_data *data)
+static void
+tcpci_src_emul_start_source_capability_timer(struct tcpci_src_emul_data *data)
 {
 	tcpci_src_emul_start_source_capability_custom_time(
-			data, TCPCI_SOURCE_CAPABILITY_TIMEOUT);
+		data, TCPCI_SOURCE_CAPABILITY_TIMEOUT);
 }
 
 /**
@@ -47,8 +47,8 @@ static void tcpci_src_emul_start_source_capability_timer(
  *
  * @param data Pointer to USB-C source device emulator data
  */
-static void tcpci_src_emul_stop_source_capability_timer(
-	struct tcpci_src_emul_data *data)
+static void
+tcpci_src_emul_stop_source_capability_timer(struct tcpci_src_emul_data *data)
 {
 	k_work_cancel_delayable(&data->source_capability_timeout);
 }
@@ -66,21 +66,19 @@ int tcpci_src_emul_send_capability_msg(struct tcpci_src_emul_data *data,
 		}
 	}
 
-	return tcpci_partner_send_data_msg(common_data,
-					   PD_DATA_SOURCE_CAP,
+	return tcpci_partner_send_data_msg(common_data, PD_DATA_SOURCE_CAP,
 					   data->pdo, pdos, delay);
 }
 
 int tcpci_src_emul_send_capability_msg_with_timer(
 	struct tcpci_src_emul_data *data,
-	struct tcpci_partner_data *common_data,
-	uint64_t delay)
+	struct tcpci_partner_data *common_data, uint64_t delay)
 {
 	int ret;
 
 	if (delay > 0) {
 		tcpci_src_emul_start_source_capability_custom_time(
-							data, K_MSEC(delay));
+			data, K_MSEC(delay));
 		return TCPCI_EMUL_TX_SUCCESS;
 	}
 
@@ -119,10 +117,10 @@ void tcpci_src_emul_clear_status_received(struct tcpci_src_emul_data *data)
  * @param TCPCI_PARTNER_COMMON_MSG_HANDLED Message was handled
  * @param TCPCI_PARTNER_COMMON_MSG_NOT_HANDLED Message wasn't handled
  */
-static enum tcpci_partner_handler_res tcpci_src_emul_handle_sop_msg(
-	struct tcpci_partner_extension *ext,
-	struct tcpci_partner_data *common_data,
-	const struct tcpci_emul_msg *msg)
+static enum tcpci_partner_handler_res
+tcpci_src_emul_handle_sop_msg(struct tcpci_partner_extension *ext,
+			      struct tcpci_partner_data *common_data,
+			      const struct tcpci_emul_msg *msg)
 {
 	struct tcpci_src_emul_data *data =
 		CONTAINER_OF(ext, struct tcpci_src_emul_data, ext);
@@ -171,9 +169,8 @@ static enum tcpci_partner_handler_res tcpci_src_emul_handle_sop_msg(
 			return TCPCI_PARTNER_COMMON_MSG_HANDLED;
 		case PD_CTRL_GET_REVISION:
 			rmdo = 0x31000000;
-			tcpci_partner_send_data_msg(common_data,
-						    PD_DATA_REVISION,
-						    &rmdo, 1, 0);
+			tcpci_partner_send_data_msg(
+				common_data, PD_DATA_REVISION, &rmdo, 1, 0);
 			return TCPCI_PARTNER_COMMON_MSG_HANDLED;
 		default:
 			return TCPCI_PARTNER_COMMON_MSG_NOT_HANDLED;
@@ -189,9 +186,8 @@ static enum tcpci_partner_handler_res tcpci_src_emul_handle_sop_msg(
 static void tcpci_src_emul_source_capability_timeout(struct k_work *work)
 {
 	struct k_work_delayable *dwork = k_work_delayable_from_work(work);
-	struct tcpci_src_emul_data *data =
-		CONTAINER_OF(dwork, struct tcpci_src_emul_data,
-			     source_capability_timeout);
+	struct tcpci_src_emul_data *data = CONTAINER_OF(
+		dwork, struct tcpci_src_emul_data, source_capability_timeout);
 	struct tcpci_partner_data *common_data = data->common_data;
 
 	if (k_mutex_lock(&common_data->transmit_mutex, K_NO_WAIT) != 0) {
@@ -278,9 +274,9 @@ static void tcpci_src_emul_disconnect(struct tcpci_partner_extension *ext,
  * @return 0 on success
  * @return negative on TCPCI connect error
  */
-static int tcpci_src_emul_connect_to_tcpci(
-	struct tcpci_partner_extension *ext,
-	struct tcpci_partner_data *common_data)
+static int
+tcpci_src_emul_connect_to_tcpci(struct tcpci_partner_extension *ext,
+				struct tcpci_partner_data *common_data)
 {
 	struct tcpci_src_emul_data *data =
 		CONTAINER_OF(ext, struct tcpci_src_emul_data, ext);
@@ -298,15 +294,14 @@ static int tcpci_src_emul_connect_to_tcpci(
 	 * capabilities, but it is permit. Timeout is obligatory for power swap.
 	 */
 	tcpci_src_emul_send_capability_msg_with_timer(
-					data, common_data,
-					TCPCI_SWAP_SOURCE_START_TIMEOUT_MS);
+		data, common_data, TCPCI_SWAP_SOURCE_START_TIMEOUT_MS);
 
 	return 0;
 }
 
-#define PDO_FIXED_FLAGS_MASK						\
-	(PDO_FIXED_DUAL_ROLE | PDO_FIXED_UNCONSTRAINED |		\
-	 PDO_FIXED_COMM_CAP | PDO_FIXED_DATA_SWAP)
+#define PDO_FIXED_FLAGS_MASK                                                  \
+	(PDO_FIXED_DUAL_ROLE | PDO_FIXED_UNCONSTRAINED | PDO_FIXED_COMM_CAP | \
+	 PDO_FIXED_DATA_SWAP)
 
 enum check_pdos_res tcpci_src_emul_check_pdos(struct tcpci_src_emul_data *data)
 {
@@ -411,10 +406,10 @@ struct tcpci_partner_extension_ops tcpci_src_emul_ops = {
 	.connect = tcpci_src_emul_connect_to_tcpci,
 };
 
-struct tcpci_partner_extension *tcpci_src_emul_init(
-	struct tcpci_src_emul_data *data,
-	struct tcpci_partner_data *common_data,
-	struct tcpci_partner_extension *ext)
+struct tcpci_partner_extension *
+tcpci_src_emul_init(struct tcpci_src_emul_data *data,
+		    struct tcpci_partner_data *common_data,
+		    struct tcpci_partner_extension *ext)
 {
 	struct tcpci_partner_extension *src_ext = &data->ext;