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

diff --git a/zephyr/shim/src/gpio.c b/zephyr/shim/src/gpio.c
index eb395813c8..9738bf3de2 100644
--- a/zephyr/shim/src/gpio.c
+++ b/zephyr/shim/src/gpio.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.
  */
@@ -41,26 +41,30 @@ struct gpio_config {
  * whereas the standard macros assume that only 8 bits of initial flags
  * will be needed.
  */
-#define OUR_DT_SPEC(id)						\
-	{							\
-		.port = DEVICE_DT_GET(DT_GPIO_CTLR(id, gpios)),	\
-		.pin = DT_GPIO_PIN(id, gpios),			\
-		.dt_flags = 0xFF & (DT_GPIO_FLAGS(id, gpios)),	\
+#define OUR_DT_SPEC(id)                                         \
+	{                                                       \
+		.port = DEVICE_DT_GET(DT_GPIO_CTLR(id, gpios)), \
+		.pin = DT_GPIO_PIN(id, gpios),                  \
+		.dt_flags = 0xFF & (DT_GPIO_FLAGS(id, gpios)),  \
 	}
 
-#define GPIO_CONFIG(id)                                      \
-	{                                                    \
-		.spec = OUR_DT_SPEC(id),		     \
-		.name = DT_NODE_FULL_NAME(id),               \
-		.init_flags = DT_GPIO_FLAGS(id, gpios),      \
-		.no_auto_init = DT_PROP(id, no_auto_init),   \
+#define GPIO_CONFIG(id)                                    \
+	{                                                  \
+		.spec = OUR_DT_SPEC(id),                   \
+		.name = DT_NODE_FULL_NAME(id),             \
+		.init_flags = DT_GPIO_FLAGS(id, gpios),    \
+		.no_auto_init = DT_PROP(id, no_auto_init), \
 	},
+#define GPIO_IMPL_CONFIG(id) \
+	COND_CODE_1(DT_NODE_HAS_PROP(id, gpios), (GPIO_CONFIG(id)), ())
+
 static const struct gpio_config configs[] = {
 #if DT_NODE_EXISTS(DT_PATH(named_gpios))
-	DT_FOREACH_CHILD(DT_PATH(named_gpios), GPIO_CONFIG)
+	DT_FOREACH_CHILD(DT_PATH(named_gpios), GPIO_IMPL_CONFIG)
 #endif
 };
 
+#undef GPIO_IMPL_CONFIG
 #undef GPIO_CONFIG
 #undef OUR_DT_SPEC
 
@@ -73,9 +77,9 @@ static const struct gpio_config configs[] = {
  * point directly into the table by exposing the gpio_config struct.
  */
 
-#define GPIO_PTRS(id) const struct gpio_dt_spec * const	\
-	GPIO_DT_NAME(GPIO_SIGNAL(id)) =			\
-	&configs[GPIO_SIGNAL(id)].spec;
+#define GPIO_PTRS(id)                                                    \
+	const struct gpio_dt_spec *const GPIO_DT_NAME(GPIO_SIGNAL(id)) = \
+		&configs[GPIO_SIGNAL(id)].spec;
 
 #if DT_NODE_EXISTS(DT_PATH(named_gpios))
 DT_FOREACH_CHILD(DT_PATH(named_gpios), GPIO_PTRS)
@@ -91,6 +95,30 @@ int gpio_get_level(enum gpio_signal signal)
 	if (!gpio_is_implemented(signal))
 		return 0;
 
+	/*
+	 * If an output GPIO, get the configured value of the output
+	 * rather than the raw value of the pin.
+	 */
+	if (IS_ENABLED(CONFIG_GPIO_GET_CONFIG) &&
+	    configs[signal].init_flags & GPIO_OUTPUT) {
+		int rv;
+		gpio_flags_t flags;
+
+		rv = gpio_pin_get_config_dt(&configs[signal].spec, &flags);
+		if (rv == 0) {
+			return (flags & GPIO_OUTPUT_INIT_HIGH) ? 1 : 0;
+		}
+		/*
+		 * -ENOSYS is returned when this API call is not supported,
+		 *  so drop into the default method of returning the pin value.
+		 */
+		if (rv != -ENOSYS) {
+			LOG_ERR("Cannot get config for %s (%d)",
+				configs[signal].name, rv);
+			return 0;
+		}
+	}
+
 	const int l = gpio_pin_get_raw(configs[signal].spec.port,
 				       configs[signal].spec.pin);
 
@@ -137,8 +165,7 @@ void gpio_set_level(enum gpio_signal signal, int value)
 		return;
 
 	int rv = gpio_pin_set_raw(configs[signal].spec.port,
-				  configs[signal].spec.pin,
-				  value);
+				  configs[signal].spec.pin, value);
 
 	if (rv < 0) {
 		LOG_ERR("Cannot write %s (%d)", configs[signal].name, rv);
@@ -167,15 +194,15 @@ int gpio_or_ioex_get_level(int signal, int *value)
 #define GPIO_CONVERSION_SAME_BITS                                             \
 	(GPIO_OPEN_DRAIN | GPIO_PULL_UP | GPIO_PULL_DOWN | GPIO_VOLTAGE_1P8 | \
 	 GPIO_INPUT | GPIO_OUTPUT | GPIO_OUTPUT_INIT_LOW |                    \
-	GPIO_OUTPUT_INIT_HIGH)
+	 GPIO_OUTPUT_INIT_HIGH)
 
 #define FLAGS_HANDLED_FROM_ZEPHYR                                      \
 	(GPIO_CONVERSION_SAME_BITS | GPIO_INT_ENABLE | GPIO_INT_EDGE | \
-	GPIO_INT_HIGH_1 | GPIO_INT_LOW_0)
+	 GPIO_INT_HIGH_1 | GPIO_INT_LOW_0)
 
 #define FLAGS_HANDLED_TO_ZEPHYR                                               \
 	(GPIO_CONVERSION_SAME_BITS | GPIO_INT_F_RISING | GPIO_INT_F_FALLING | \
-	GPIO_INT_F_LOW | GPIO_INT_F_HIGH)
+	 GPIO_INT_F_LOW | GPIO_INT_F_HIGH)
 
 int convert_from_zephyr_flags(const gpio_flags_t zephyr)
 {
@@ -219,11 +246,11 @@ gpio_flags_t convert_to_zephyr_flags(int ec_flags)
 	}
 
 	if (ec_flags & GPIO_INT_F_RISING)
-		zephyr_flags |= GPIO_INT_ENABLE
-			| GPIO_INT_EDGE | GPIO_INT_HIGH_1;
+		zephyr_flags |= GPIO_INT_ENABLE | GPIO_INT_EDGE |
+				GPIO_INT_HIGH_1;
 	if (ec_flags & GPIO_INT_F_FALLING)
-		zephyr_flags |= GPIO_INT_ENABLE
-			| GPIO_INT_EDGE | GPIO_INT_LOW_0;
+		zephyr_flags |= GPIO_INT_ENABLE | GPIO_INT_EDGE |
+				GPIO_INT_LOW_0;
 	if (ec_flags & GPIO_INT_F_LOW)
 		zephyr_flags |= GPIO_INT_ENABLE | GPIO_INT_LOW_0;
 	if (ec_flags & GPIO_INT_F_HIGH)
@@ -276,7 +303,7 @@ static int init_gpios(const struct device *unused)
 		 */
 		if (is_sys_jumped && (flags & GPIO_OUTPUT)) {
 			flags &=
-			    ~(GPIO_OUTPUT_INIT_LOW | GPIO_OUTPUT_INIT_HIGH);
+				~(GPIO_OUTPUT_INIT_LOW | GPIO_OUTPUT_INIT_HIGH);
 		}
 
 		rv = gpio_pin_configure_dt(&configs[i].spec, flags);