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, 143 insertions, 1 deletions

diff --git a/zephyr/shim/chip/npcx/gpio.c b/zephyr/shim/chip/npcx/gpio.c
index 3baf128eab..e8bf3dfdf5 100644
--- a/zephyr/shim/chip/npcx/gpio.c
+++ b/zephyr/shim/chip/npcx/gpio.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.
  */
@@ -6,10 +6,13 @@
 #include <zephyr/device.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/kernel.h>
+#include <zephyr/shell/shell.h>
 
 #include <zephyr/logging/log.h>
 
 #include "gpio/gpio.h"
+#include "soc_gpio.h"
+#include "util.h"
 
 LOG_MODULE_REGISTER(shim_cros_gpio, LOG_LEVEL_ERR);
 
@@ -53,3 +56,142 @@ int gpio_config_unused_pins(void)
 
 	return 0;
 }
+
+#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_GPIODBG
+/*
+ * IO information about each GPIO that is configured in the `named_gpios` and
+ *` unused_pins` device tree nodes.
+ */
+struct npcx_io_info {
+	/* A npcx gpio port device */
+	const struct device *dev;
+	/* A npcx gpio port number */
+	int port;
+	/* Bit number of pin within a npcx gpio port */
+	gpio_pin_t pin;
+	/* GPIO net name */
+	const char *name;
+	/* Enable flag of npcx gpio input buffer */
+	bool enable;
+};
+
+#define NAMED_GPIO_INFO(node)                                      \
+	{                                                          \
+		.dev = DEVICE_DT_GET(DT_GPIO_CTLR(node, gpios)),   \
+		.port = DT_PROP(DT_GPIO_CTLR(node, gpios), index), \
+		.pin = DT_GPIO_PIN(node, gpios),                   \
+		.name = DT_NODE_FULL_NAME(node),                   \
+		.enable = true,                                    \
+	},
+
+#define UNUSED_GPIO_INFO(node, prop, idx)                                     \
+	{                                                                     \
+		.dev = DEVICE_DT_GET(DT_GPIO_CTLR_BY_IDX(node, prop, idx)),   \
+		.port = DT_PROP(DT_GPIO_CTLR_BY_IDX(node, prop, idx), index), \
+		.pin = DT_GPIO_PIN_BY_IDX(node, prop, idx),                   \
+		.name = "unused pin",                                         \
+		.enable = true,                                               \
+	},
+
+#define NAMED_GPIO_INIT(node) \
+	COND_CODE_1(DT_NODE_HAS_PROP(node, gpios), (NAMED_GPIO_INFO(node)), ())
+
+static struct npcx_io_info gpio_info[] = {
+#if DT_NODE_EXISTS(DT_PATH(named_gpios))
+	DT_FOREACH_CHILD(DT_PATH(named_gpios), NAMED_GPIO_INIT)
+#endif
+#if DT_NODE_EXISTS(DT_PATH(unused_pins))
+		DT_FOREACH_PROP_ELEM(DT_PATH(unused_pins), unused_gpios,
+				     UNUSED_GPIO_INFO)
+#endif
+};
+
+static int get_index_from_arg(const struct shell *sh, char **argv, int *index)
+{
+	char *end_ptr;
+	int num = strtol(argv[1], &end_ptr, 0);
+	const int gpio_cnt = ARRAY_SIZE(gpio_info);
+
+	if (*end_ptr != '\0') {
+		shell_error(sh, "Failed to parse %s", argv[1]);
+		return -EINVAL;
+	}
+
+	if (num >= gpio_cnt) {
+		shell_error(sh, "Index shall be less than %u, was %u", gpio_cnt,
+			    num);
+		return -EINVAL;
+	}
+
+	*index = num;
+
+	return 0;
+}
+
+static int cmd_gpio_list_all(const struct shell *sh, size_t argc, char **argv)
+{
+	ARG_UNUSED(argc);
+	ARG_UNUSED(argv);
+
+	/* Print header */
+	shell_print(sh, "IDX|ON| GPIO | Name");
+	shell_print(sh, "---+--+------+----------");
+
+	/* List all GPIOs in 'named-gpios' and 'unused_pins' DT nodes */
+	for (int i = 0; i < ARRAY_SIZE(gpio_info); i++) {
+		shell_print(sh, "%02d |%s | io%x%x | %s", i,
+			    gpio_info[i].enable ? "*" : " ", gpio_info[i].port,
+			    gpio_info[i].pin, gpio_info[i].name);
+	}
+
+	return 0;
+}
+
+static int cmd_gpio_turn_on(const struct shell *sh, size_t argc, char **argv)
+{
+	int index;
+	int res = get_index_from_arg(sh, argv, &index);
+
+	if (res < 0) {
+		return res;
+	}
+
+	/* Turn on GPIO's input buffer by index */
+	gpio_info[index].enable = true;
+	npcx_gpio_enable_io_pads(gpio_info[index].dev, gpio_info[index].pin);
+
+	return 0;
+}
+
+static int cmd_gpio_turn_off(const struct shell *sh, size_t argc, char **argv)
+{
+	int index;
+	int res = get_index_from_arg(sh, argv, &index);
+
+	if (res < 0) {
+		return res;
+	}
+
+	/* Turn off GPIO's input buffer by index */
+	gpio_info[index].enable = false;
+	npcx_gpio_disable_io_pads(gpio_info[index].dev, gpio_info[index].pin);
+
+	return 0;
+}
+
+SHELL_STATIC_SUBCMD_SET_CREATE(
+	sub_gpiodbg,
+	SHELL_CMD_ARG(list, NULL, "List all GPIOs used on platform by index",
+		      cmd_gpio_list_all, 1, 0),
+	SHELL_CMD_ARG(on, NULL, "<index_in_list> Turn on GPIO's input buffer",
+		      cmd_gpio_turn_on, 2, 0),
+	SHELL_CMD_ARG(off, NULL, "<index_in_list> Turn off GPIO's input buffer",
+		      cmd_gpio_turn_off, 2, 0),
+	SHELL_SUBCMD_SET_END /* Array terminated. */
+);
+
+SHELL_CMD_ARG_REGISTER(gpiodbg, &sub_gpiodbg,
+		       "Commands for power consumption "
+		       "investigation",
+		       NULL, 2, 0);
+#endif /* CONFIG_PLATFORM_EC_CONSOLE_CMD_GPIODBG */