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, 51 insertions, 42 deletions

diff --git a/zephyr/include/emul/emul_common_i2c.h b/zephyr/include/emul/emul_common_i2c.h
index 676308b027..1388e9bbcb 100644
--- a/zephyr/include/emul/emul_common_i2c.h
+++ b/zephyr/include/emul/emul_common_i2c.h
@@ -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.
  */
@@ -49,8 +49,8 @@
  * Special register values used in @ref i2c_common_emul_set_read_fail_reg and
  * @ref i2c_common_emul_set_write_fail_reg
  */
-#define I2C_COMMON_EMUL_FAIL_ALL_REG	(-1)
-#define I2C_COMMON_EMUL_NO_FAIL_REG	(-2)
+#define I2C_COMMON_EMUL_FAIL_ALL_REG (-1)
+#define I2C_COMMON_EMUL_NO_FAIL_REG (-2)
 
 /**
  * Describe if there is no ongoing I2C message or if there is message handled
@@ -67,20 +67,21 @@ enum i2c_common_emul_msg_state {
  * @brief Function type that is used by I2C device emulator for first byte of
  *        I2C write message.
  *
- * @param emul Pointer to emulator
+ * @param target Pointer to emulator
  * @param reg Address which is now accessed by write command (first byte of I2C
  *            write message)
  *
  * @return 0 on success
  * @return -EIO on error
  */
-typedef int (*i2c_common_emul_start_write_func)(struct i2c_emul *emul, int reg);
+typedef int (*i2c_common_emul_start_write_func)(const struct emul *target,
+						int reg);
 
 /**
  * @brief Function type that is used by I2C device emulator at the end of
  *        I2C write message.
  *
- * @param emul Pointer to emulator
+ * @param target Pointer to emulator
  * @param reg Address which is now accessed by write command (first byte of I2C
  *            write message)
  * @param bytes Number of bytes received from the I2C write message
@@ -88,14 +89,14 @@ typedef int (*i2c_common_emul_start_write_func)(struct i2c_emul *emul, int reg);
  * @return 0 on success
  * @return -EIO on error
  */
-typedef int (*i2c_common_emul_finish_write_func)(struct i2c_emul *emul, int reg,
-						 int bytes);
+typedef int (*i2c_common_emul_finish_write_func)(const struct emul *target,
+						 int reg, int bytes);
 
 /**
  * @brief Function type that is used by I2C device emulator on each byte of
  *        I2C write message (except first byte).
  *
- * @param emul Pointer to emulator
+ * @param target Pointer to emulator
  * @param reg Address which is now accessed by write command (first byte of I2C
  *            write message)
  * @param val Value of current byte
@@ -105,27 +106,28 @@ typedef int (*i2c_common_emul_finish_write_func)(struct i2c_emul *emul, int reg,
  * @return 0 on success
  * @return -EIO on error
  */
-typedef int (*i2c_common_emul_write_byte_func)(struct i2c_emul *emul, int reg,
-					       uint8_t val, int bytes);
+typedef int (*i2c_common_emul_write_byte_func)(const struct emul *target,
+					       int reg, uint8_t val, int bytes);
 
 /**
  * @brief Function type that is used by I2C device emulator before first byte of
  *        I2C read message.
  *
- * @param emul Pointer to emulator
+ * @param target Pointer to emulator
  * @param reg Address which is now accessed by read command (first byte of last
  *            I2C write message)
  *
  * @return 0 on success
  * @return -EIO on error
  */
-typedef int (*i2c_common_emul_start_read_func)(struct i2c_emul *emul, int reg);
+typedef int (*i2c_common_emul_start_read_func)(const struct emul *target,
+					       int reg);
 
 /**
  * @brief Function type that is used by I2C device emulator at the end of
  *        I2C read message.
  *
- * @param emul Pointer to emulator
+ * @param target Pointer to emulator
  * @param reg Address which is now accessed by read command (first byte of last
  *            I2C write message)
  * @param bytes Number of bytes responeded to the I2C read message
@@ -133,14 +135,14 @@ typedef int (*i2c_common_emul_start_read_func)(struct i2c_emul *emul, int reg);
  * @return 0 on success
  * @return -EIO on error
  */
-typedef int (*i2c_common_emul_finish_read_func)(struct i2c_emul *emul, int reg,
-						int bytes);
+typedef int (*i2c_common_emul_finish_read_func)(const struct emul *target,
+						int reg, int bytes);
 
 /**
  * @brief Function type that is used by I2C device emulator on each byte of
  *        I2C read message.
  *
- * @param emul Pointer to emulator
+ * @param target Pointer to emulator
  * @param reg Address which is now accessed by read command (first byte of last
  *            I2C write message)
  * @param val Pointer to buffer where current response byte should be stored
@@ -150,8 +152,8 @@ typedef int (*i2c_common_emul_finish_read_func)(struct i2c_emul *emul, int reg,
  * @return 0 on success
  * @return -EIO on error
  */
-typedef int (*i2c_common_emul_read_byte_func)(struct i2c_emul *emul, int reg,
-					      uint8_t *val, int bytes);
+typedef int (*i2c_common_emul_read_byte_func)(const struct emul *target,
+					      int reg, uint8_t *val, int bytes);
 
 /**
  * @brief Function type that is used by I2C device emulator to select register
@@ -159,7 +161,7 @@ typedef int (*i2c_common_emul_read_byte_func)(struct i2c_emul *emul, int reg,
  *        @ref i2c_common_emul_set_read_fail_reg and
  *        @ref i2c_common_emul_set_write_fail_reg
  *
- * @param emul Pointer to emulator
+ * @param target Pointer to emulator
  * @param reg Address which is now accessed by read/write command (first byte
  *            of last I2C write message)
  * @param bytes Number of bytes already processed in the I2C message handler
@@ -169,14 +171,14 @@ typedef int (*i2c_common_emul_read_byte_func)(struct i2c_emul *emul, int reg,
  * @return Register address that should be compared with user-defined fail
  *         register
  */
-typedef int (*i2c_common_emul_access_reg_func)(struct i2c_emul *emul, int reg,
-					       int bytes, bool read);
+typedef int (*i2c_common_emul_access_reg_func)(const struct emul *target,
+					       int reg, int bytes, bool read);
 
 /**
  * @brief Custom function type that is used as user-defined callback in read
  *        I2C messages handling.
  *
- * @param emul Pointer to emulator
+ * @param target Pointer to emulator
  * @param reg Address which is now accessed by read command (first byte of last
  *            I2C write message)
  * @param val Pointer to buffer where current response byte should be stored
@@ -188,14 +190,14 @@ typedef int (*i2c_common_emul_access_reg_func)(struct i2c_emul *emul, int reg,
  * @return 1 continue with normal emulator handler
  * @return negative on error
  */
-typedef int (*i2c_common_emul_read_func)(struct i2c_emul *emul, int reg,
+typedef int (*i2c_common_emul_read_func)(const struct emul *target, int reg,
 					 uint8_t *val, int bytes, void *data);
 
 /**
  * @brief Custom function type that is used as user-defined callback in write
  *        I2C messages handling.
  *
- * @param emul Pointer to emulator
+ * @param target Pointer to emulator
  * @param reg Address which is now accessed by write command (first byte of I2C
  *            write message)
  * @param val Value of current byte
@@ -207,13 +209,11 @@ typedef int (*i2c_common_emul_read_func)(struct i2c_emul *emul, int reg,
  * @return 1 continue with normal emulator handler
  * @return negative on error
  */
-typedef int (*i2c_common_emul_write_func)(struct i2c_emul *emul, int reg,
+typedef int (*i2c_common_emul_write_func)(const struct emul *target, int reg,
 					  uint8_t val, int bytes, void *data);
 
 /** Static configuration, common for all i2c emulators */
 struct i2c_common_emul_cfg {
-	/** Label of the I2C bus this emulator connects to */
-	const char *i2c_label;
 	/** Label of the I2C device being emulated */
 	const char *dev_label;
 	/** Pointer to run-time data */
@@ -283,31 +283,32 @@ extern struct i2c_emul_api i2c_common_emul_api;
  * @brief Lock access to emulator properties. After acquiring lock, user
  *        may change emulator behaviour in multi-thread setup.
  *
- * @param emul Pointer to emulator
+ * @param common_data Pointer to emulator common data
  * @param timeout Timeout in getting lock
  *
  * @return k_mutex_lock return code
  */
-int i2c_common_emul_lock_data(struct i2c_emul *emul, k_timeout_t timeout);
+int i2c_common_emul_lock_data(struct i2c_common_emul_data *common_data,
+			      k_timeout_t timeout);
 
 /**
  * @brief Unlock access to emulator properties.
  *
- * @param emul Pointer to emulator
+ * @param common_data Pointer to emulator common data
  *
  * @return k_mutex_unlock return code
  */
-int i2c_common_emul_unlock_data(struct i2c_emul *emul);
+int i2c_common_emul_unlock_data(struct i2c_common_emul_data *common_data);
 
 /**
  * @brief Set write handler for I2C messages. This function is called before
  *        generic handler.
  *
- * @param emul Pointer to emulator
+ * @param common_data Pointer to emulator common data
  * @param func Pointer to custom function
  * @param data User data passed on call of custom function
  */
-void i2c_common_emul_set_write_func(struct i2c_emul *emul,
+void i2c_common_emul_set_write_func(struct i2c_common_emul_data *common_data,
 				    i2c_common_emul_write_func func,
 				    void *data);
 
@@ -315,30 +316,32 @@ void i2c_common_emul_set_write_func(struct i2c_emul *emul,
  * @brief Set read handler for I2C messages. This function is called before
  *        generic handler.
  *
- * @param emul Pointer to emulator
+ * @param common_data Pointer to emulator common data
  * @param func Pointer to custom function
  * @param data User data passed on call of custom function
  */
-void i2c_common_emul_set_read_func(struct i2c_emul *emul,
+void i2c_common_emul_set_read_func(struct i2c_common_emul_data *common_data,
 				   i2c_common_emul_read_func func, void *data);
 
 /**
  * @brief Setup fail on read of given register of emulator
  *
- * @param emul Pointer to emulator
+ * @param common_data Pointer to emulator common data
  * @param reg Register address or one of special values
  *            (I2C_COMMON_EMUL_FAIL_ALL_REG, I2C_COMMON_EMUL_NO_FAIL_REG)
  */
-void i2c_common_emul_set_read_fail_reg(struct i2c_emul *emul, int reg);
+void i2c_common_emul_set_read_fail_reg(struct i2c_common_emul_data *common_data,
+				       int reg);
 
 /**
  * @brief Setup fail on write of given register of emulator
  *
- * @param emul Pointer to emulator
+ * @param common_data Pointer to emulator common data
  * @param reg Register address or one of special values
  *            (I2C_COMMON_EMUL_FAIL_ALL_REG, I2C_COMMON_EMUL_NO_FAIL_REG)
  */
-void i2c_common_emul_set_write_fail_reg(struct i2c_emul *emul, int reg);
+void i2c_common_emul_set_write_fail_reg(
+	struct i2c_common_emul_data *common_data, int reg);
 
 /**
  * @biref Emulate an I2C transfer to an emulator
@@ -347,7 +350,7 @@ void i2c_common_emul_set_write_fail_reg(struct i2c_emul *emul, int reg);
  * I2C message, calling user custom functions, failing on reading/writing
  * registers selected by user and calling device specific functions.
  *
- * @param emul I2C emulation information
+ * @param target The target peripheral emulated
  * @param msgs List of messages to process
  * @param num_msgs Number of messages to process
  * @param addr Address of the I2C target device
@@ -355,9 +358,15 @@ void i2c_common_emul_set_write_fail_reg(struct i2c_emul *emul, int reg);
  * @retval 0 If successful
  * @retval -EIO General input / output error
  */
-int i2c_common_emul_transfer(struct i2c_emul *emul, struct i2c_msg *msgs,
+int i2c_common_emul_transfer(const struct emul *target, struct i2c_msg *msgs,
 			     int num_msgs, int addr);
 
+int i2c_common_emul_transfer_workhorse(const struct emul *target,
+				       struct i2c_common_emul_data *data,
+				       const struct i2c_common_emul_cfg *cfg,
+				       struct i2c_msg *msgs, int num_msgs,
+				       int addr);
+
 /**
  * @brief Initialize common emulator data structure
  *