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, 14 insertions, 66 deletions

diff --git a/zephyr/shim/src/i2c.c b/zephyr/shim/src/i2c.c
index 8d55876629..0074327826 100644
--- a/zephyr/shim/src/i2c.c
+++ b/zephyr/shim/src/i2c.c
@@ -1,4 +1,4 @@
-/* Copyright 2020 The Chromium OS Authors. All rights reserved.
+/* Copyright 2020 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -21,11 +21,10 @@
  * Initialize device bindings in i2c_devices.
  * This macro should be called from within DT_FOREACH_CHILD.
  */
-#define INIT_DEV_BINDING(id) \
-	[I2C_PORT(id)] = DEVICE_DT_GET(DT_PHANDLE(id, i2c_port)),
+#define INIT_DEV_BINDING(i2c_port_id) \
+	[I2C_PORT_BUS(i2c_port_id)] = DEVICE_DT_GET(i2c_port_id),
 
-#define INIT_REMOTE_PORTS(id) \
-	[I2C_PORT(id)] = DT_PROP_OR(id, remote_port, -1),
+#define INIT_REMOTE_PORTS(id) [I2C_PORT(id)] = DT_PROP_OR(id, remote_port, -1),
 
 #define I2C_PORT_FLAGS(id)                                                     \
 	COND_CODE_1(DT_PROP(id, dynamic_speed), (I2C_PORT_FLAG_DYNAMIC_SPEED), \
@@ -44,49 +43,14 @@
  * Since all the ports will eventually be handled by device tree. This will
  * be removed at that point.
  */
-const struct i2c_port_t i2c_ports[] = {
-	DT_FOREACH_CHILD(DT_PATH(named_i2c_ports), I2C_PORT_INIT)
-};
+const struct i2c_port_t i2c_ports[] = { DT_FOREACH_CHILD(
+	DT_PATH(named_i2c_ports), I2C_PORT_INIT) };
 const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports);
-static const int i2c_remote_ports[I2C_PORT_COUNT] = {
-	DT_FOREACH_CHILD(DT_PATH(named_i2c_ports), INIT_REMOTE_PORTS)
-};
-static int i2c_physical_ports[I2C_PORT_COUNT];
+static const int i2c_remote_ports[I2C_PORT_COUNT] = { DT_FOREACH_CHILD(
+	DT_PATH(named_i2c_ports), INIT_REMOTE_PORTS) };
 
-static const struct device *i2c_devices[I2C_PORT_COUNT] = {
-	DT_FOREACH_CHILD(DT_PATH(named_i2c_ports), INIT_DEV_BINDING)
-};
-
-static int init_device_bindings(const struct device *device)
-{
-	ARG_UNUSED(device);
-
-	/*
-	 * The EC application may lock the I2C bus for more than a single
-	 * I2C transaction. Initialize the i2c_physical_ports[] array to map
-	 * each named-i2c-ports child to the physical bus assignment.
-	 */
-	int i;
-	int physical_port = 0;
-
-	i2c_physical_ports[0] = physical_port;
-	for (int child = 1; child < I2C_PORT_COUNT; child++) {
-		for (i = 0; i < child; i++) {
-			if (i2c_devices[child] == i2c_devices[i]) {
-				i2c_physical_ports[child] =
-					i2c_physical_ports[i];
-				break;
-			}
-		}
-		if (i == child)
-			i2c_physical_ports[child] = ++physical_port;
-	}
-	__ASSERT(I2C_DEVICE_COUNT == 0 ||
-			 physical_port == (I2C_DEVICE_COUNT - 1),
-		 "I2C_DEVICE_COUNT is invalid");
-	return 0;
-}
-SYS_INIT(init_device_bindings, POST_KERNEL, 51);
+static const struct device *i2c_devices[I2C_PORT_COUNT] = { I2C_FOREACH_PORT(
+	INIT_DEV_BINDING) };
 
 const struct device *i2c_get_device_for_port(const int port)
 {
@@ -110,31 +74,15 @@ int i2c_get_port_from_remote_port(int remote_port)
 	return remote_port;
 }
 
-int i2c_get_physical_port(int enum_port)
-{
-	int i2c_port;
-
-	if (enum_port < 0 || enum_port >= I2C_PORT_COUNT)
-		return -1;
-
-	i2c_port = i2c_physical_ports[enum_port];
-	/*
-	 * Return -1 for caller if physical port is not defined or the
-	 * port number is out of port_mutex space.
-	 * Please ensure the caller won't change anything if -1 received.
-	 */
-	return (i2c_port < I2C_DEVICE_COUNT) ? i2c_port : -1;
-}
-
 #ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_I2C_PORTMAP
-static int command_i2c_portmap(int argc, char **argv)
+static int command_i2c_portmap(int argc, const char **argv)
 {
 	int i;
 
-	ccprintf("Zephyr physical I2C ports (%d):\n", I2C_PORT_COUNT);
-	for (i = 0; i < I2C_PORT_COUNT; i++) {
-		ccprintf("  %d : %d\n", i, i2c_physical_ports[i]);
+	if (argc > 1) {
+		return EC_ERROR_PARAM_COUNT;
 	}
+
 	ccprintf("Zephyr remote I2C ports (%d):\n", I2C_PORT_COUNT);
 	for (i = 0; i < I2C_PORT_COUNT; i++) {
 		ccprintf("  %d : %d\n", i, i2c_remote_ports[i]);