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, 31 insertions, 45 deletions

diff --git a/zephyr/emul/emul_pi3usb9201.c b/zephyr/emul/emul_pi3usb9201.c
index 9115a84515..3b1193d9b1 100644
--- a/zephyr/emul/emul_pi3usb9201.c
+++ b/zephyr/emul/emul_pi3usb9201.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.
  */
@@ -11,6 +11,8 @@
 #include <zephyr/drivers/i2c_emul.h>
 
 #include "emul/emul_pi3usb9201.h"
+#include "emul/emul_stub_device.h"
+#include "emul/emul_common_i2c.h"
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(emul_pi3usb9201, LOG_LEVEL_DBG);
@@ -20,6 +22,8 @@ LOG_MODULE_REGISTER(emul_pi3usb9201, LOG_LEVEL_DBG);
 
 /** Run-time data used by the emulator */
 struct pi3usb9201_emul_data {
+	/** Common I2C data */
+	struct i2c_common_emul_data common;
 	/** I2C emulator detail */
 	struct i2c_emul emul;
 	/** pi3usb9201 device being emulated */
@@ -32,50 +36,48 @@ struct pi3usb9201_emul_data {
 
 /** Static configuration for the emulator */
 struct pi3usb9201_emul_cfg {
-	/** Label of the I2C bus this emulator connects to */
-	const char *i2c_label;
 	/** Pointer to run-time data */
 	struct pi3usb9201_emul_data *data;
 	/** Address of pi3usb9201 on i2c bus */
 	uint16_t addr;
 };
 
-int pi3usb9201_emul_set_reg(struct i2c_emul *emul, int reg, uint8_t val)
+int pi3usb9201_emul_set_reg(const struct emul *emul, int reg, uint8_t val)
 {
 	struct pi3usb9201_emul_data *data;
 
 	if (!EMUL_REG_IS_VALID(reg))
 		return -EIO;
 
-	data = CONTAINER_OF(emul, struct pi3usb9201_emul_data, emul);
+	data = emul->data;
 	data->reg[reg] = val;
 
 	return 0;
 }
 
-int pi3usb9201_emul_get_reg(struct i2c_emul *emul, int reg, uint8_t *val)
+int pi3usb9201_emul_get_reg(const struct emul *emul, int reg, uint8_t *val)
 {
 	struct pi3usb9201_emul_data *data;
 
 	if (!EMUL_REG_IS_VALID(reg))
 		return -EIO;
 
-	data = CONTAINER_OF(emul, struct pi3usb9201_emul_data, emul);
+	data = emul->data;
 	*val = data->reg[reg];
 
 	return 0;
 }
 
-static void pi3usb9201_emul_reset(struct i2c_emul *emul)
+static void pi3usb9201_emul_reset(const struct emul *emul)
 {
 	struct pi3usb9201_emul_data *data;
 
-	data = CONTAINER_OF(emul, struct pi3usb9201_emul_data, emul);
+	data = emul->data;
 
-	data->reg[PI3USB9201_REG_CTRL_1]     = 0;
-	data->reg[PI3USB9201_REG_CTRL_2]     = 0;
+	data->reg[PI3USB9201_REG_CTRL_1] = 0;
+	data->reg[PI3USB9201_REG_CTRL_2] = 0;
 	data->reg[PI3USB9201_REG_CLIENT_STS] = 0;
-	data->reg[PI3USB9201_REG_HOST_STS]   = 0;
+	data->reg[PI3USB9201_REG_HOST_STS] = 0;
 }
 
 /**
@@ -91,13 +93,14 @@ static void pi3usb9201_emul_reset(struct i2c_emul *emul)
  * @retval 0 If successful
  * @retval -EIO General input / output error
  */
-static int pi3usb9201_emul_transfer(struct i2c_emul *emul, struct i2c_msg *msgs,
-				    int num_msgs, int addr)
+static int pi3usb9201_emul_transfer(const struct emul *emul,
+				    struct i2c_msg *msgs, int num_msgs,
+				    int addr)
 {
 	const struct pi3usb9201_emul_cfg *cfg;
 	struct pi3usb9201_emul_data *data;
 
-	data = CONTAINER_OF(emul, struct pi3usb9201_emul_data, emul);
+	data = emul->data;
 	cfg = data->cfg;
 
 	if (cfg->addr != addr) {
@@ -109,18 +112,18 @@ static int pi3usb9201_emul_transfer(struct i2c_emul *emul, struct i2c_msg *msgs,
 	i2c_dump_msgs("emul", msgs, num_msgs, addr);
 
 	if (num_msgs == 1) {
-		if (!(((msgs[0].flags & I2C_MSG_RW_MASK) == I2C_MSG_WRITE)
-		      && (msgs[0].len == 2))) {
+		if (!(((msgs[0].flags & I2C_MSG_RW_MASK) == I2C_MSG_WRITE) &&
+		      (msgs[0].len == 2))) {
 			LOG_ERR("Unexpected write msgs");
 			return -EIO;
 		}
 		return pi3usb9201_emul_set_reg(emul, msgs[0].buf[0],
 					       msgs[0].buf[1]);
 	} else if (num_msgs == 2) {
-		if (!(((msgs[0].flags & I2C_MSG_RW_MASK) == I2C_MSG_WRITE)
-		      && (msgs[0].len == 1)
-		      && ((msgs[1].flags & I2C_MSG_RW_MASK) == I2C_MSG_READ)
-		      && (msgs[1].len == 1))) {
+		if (!(((msgs[0].flags & I2C_MSG_RW_MASK) == I2C_MSG_WRITE) &&
+		      (msgs[0].len == 1) &&
+		      ((msgs[1].flags & I2C_MSG_RW_MASK) == I2C_MSG_READ) &&
+		      (msgs[1].len == 1))) {
 			LOG_ERR("Unexpected read msgs");
 			return -EIO;
 		}
@@ -130,7 +133,6 @@ static int pi3usb9201_emul_transfer(struct i2c_emul *emul, struct i2c_msg *msgs,
 		LOG_ERR("Unexpected num_msgs");
 		return -EIO;
 	}
-
 }
 
 /* Device instantiation */
@@ -151,45 +153,29 @@ static struct i2c_emul_api pi3usb9201_emul_api = {
  * @return 0 indicating success (always)
  */
 static int pi3usb9201_emul_init(const struct emul *emul,
-			 const struct device *parent)
+				const struct device *parent)
 {
 	const struct pi3usb9201_emul_cfg *cfg = emul->cfg;
 	struct pi3usb9201_emul_data *data = cfg->data;
-	int ret;
 
-	data->emul.api = &pi3usb9201_emul_api;
-	data->emul.addr = cfg->addr;
 	data->i2c = parent;
 	data->cfg = cfg;
 
-	ret = i2c_emul_register(parent, emul->dev_label, &data->emul);
-
-	pi3usb9201_emul_reset(&data->emul);
+	pi3usb9201_emul_reset(emul);
 
-	return ret;
+	return 0;
 }
 
 #define PI3USB9201_EMUL(n)                                                  \
 	static struct pi3usb9201_emul_data pi3usb9201_emul_data_##n = {};   \
 	static const struct pi3usb9201_emul_cfg pi3usb9201_emul_cfg_##n = { \
-		.i2c_label = DT_INST_BUS_LABEL(n),                          \
 		.data = &pi3usb9201_emul_data_##n,                          \
 		.addr = DT_INST_REG_ADDR(n),                                \
 	};                                                                  \
-	EMUL_DEFINE(pi3usb9201_emul_init, DT_DRV_INST(n),                   \
-		    &pi3usb9201_emul_cfg_##n, &pi3usb9201_emul_data_##n)
+	EMUL_DT_INST_DEFINE(n, pi3usb9201_emul_init,                        \
+			    &pi3usb9201_emul_data_##n,                      \
+			    &pi3usb9201_emul_cfg_##n, &pi3usb9201_emul_api)
 
 DT_INST_FOREACH_STATUS_OKAY(PI3USB9201_EMUL)
 
-#define PI3USB9201_EMUL_CASE(n)					\
-	case DT_INST_DEP_ORD(n): return &pi3usb9201_emul_data_##n.emul;
-
-struct i2c_emul *pi3usb9201_emul_get(int ord)
-{
-	switch (ord) {
-	DT_INST_FOREACH_STATUS_OKAY(PI3USB9201_EMUL_CASE)
-
-	default:
-		return NULL;
-	}
-}
+DT_INST_FOREACH_STATUS_OKAY(EMUL_STUB_DEVICE);