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, 193 insertions, 0 deletions

diff --git a/zephyr/test/drivers/default/src/console_cmd/hostevent.c b/zephyr/test/drivers/default/src/console_cmd/hostevent.c
new file mode 100644
index 0000000000..af9b37edd1
--- /dev/null
+++ b/zephyr/test/drivers/default/src/console_cmd/hostevent.c
@@ -0,0 +1,193 @@
+/* Copyright 2022 The ChromiumOS Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include <zephyr/shell/shell.h>
+#include <zephyr/ztest.h>
+
+#include "console.h"
+#include "ec_commands.h"
+#include "include/lpc.h"
+#include "test/drivers/test_state.h"
+#include "test/drivers/utils.h"
+
+#ifdef CONFIG_HOST_EVENT64
+#define HOSTEVENT_PRINT_FORMAT "016" PRIx64
+#else
+#define HOSTEVENT_PRINT_FORMAT "08" PRIx32
+#endif
+
+struct console_cmd_hostevent_fixture {
+	struct host_events_ctx ctx;
+};
+
+static void *console_cmd_hostevent_setup(void)
+{
+	static struct console_cmd_hostevent_fixture fixture = { 0 };
+
+	return &fixture;
+}
+
+static void console_cmd_hostevent_before(void *fixture)
+{
+	struct console_cmd_hostevent_fixture *f = fixture;
+
+	host_events_save(&f->ctx);
+}
+
+static void console_cmd_hostevent_after(void *fixture)
+{
+	struct console_cmd_hostevent_fixture *f = fixture;
+
+	host_events_restore(&f->ctx);
+}
+
+static int console_cmd_hostevent(const char *subcommand, host_event_t mask)
+{
+	int rv;
+	char cmd_buf[CONFIG_SHELL_CMD_BUFF_SIZE];
+
+	rv = snprintf(cmd_buf, CONFIG_SHELL_CMD_BUFF_SIZE,
+		      "hostevent %s 0x%" HOSTEVENT_PRINT_FORMAT, subcommand,
+		      mask);
+
+	zassume_between_inclusive(rv, 0, CONFIG_SHELL_CMD_BUFF_SIZE,
+				  "hostevent console command too long");
+
+	return shell_execute_cmd(get_ec_shell(), cmd_buf);
+}
+
+/* hostevent with no arguments */
+ZTEST_USER(console_cmd_hostevent, test_hostevent)
+{
+	zassert_ok(shell_execute_cmd(get_ec_shell(), "hostevent"),
+		   "Failed default print");
+}
+
+/* hostevent with invalid arguments */
+ZTEST_USER(console_cmd_hostevent, test_hostevent_invalid)
+{
+	int rv;
+	host_event_t mask = 0;
+
+	/* Test invalid sub-command */
+	rv = console_cmd_hostevent("invalid", mask);
+	zassert_equal(rv, EC_ERROR_PARAM1, "Expected %d, but got %d",
+		      EC_ERROR_PARAM1, rv);
+
+	/* Test invalid mask */
+	rv = shell_execute_cmd(get_ec_shell(), "hostevent set invalid-mask");
+	zassert_equal(rv, EC_ERROR_PARAM2, "Expected %d, but got %d",
+		      EC_ERROR_PARAM2, rv);
+}
+
+/* hostevent with sub-commands and verification */
+ZTEST_USER(console_cmd_hostevent, test_hostevent_sub_commands)
+{
+	int rv;
+	enum ec_status ret_val;
+	host_event_t event_mask;
+	host_event_t all_events = 0;
+	host_event_t set_events;
+	struct ec_response_host_event result = { 0 };
+	struct {
+		enum lpc_host_event_type type;
+		const char *name;
+		host_event_t mask;
+	} subcommand[] = {
+		{
+			.type = LPC_HOST_EVENT_SMI,
+			.name = "SMI",
+			.mask = EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_CLOSED),
+		},
+		{
+			.type = LPC_HOST_EVENT_SCI,
+			.name = "SCI",
+			.mask = EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_OPEN),
+		},
+		{
+			.type = LPC_HOST_EVENT_WAKE,
+			.name = "WAKE",
+			.mask = EC_HOST_EVENT_MASK(EC_HOST_EVENT_POWER_BUTTON),
+		},
+		{
+			.type = LPC_HOST_EVENT_ALWAYS_REPORT,
+			.name = "ALWAYS_REPORT",
+			.mask = EC_HOST_EVENT_MASK(
+				EC_HOST_EVENT_AC_DISCONNECTED),
+		},
+	};
+
+	for (int i = 0; i < ARRAY_SIZE(subcommand); i++) {
+		event_mask = lpc_get_host_event_mask(subcommand[i].type);
+		zassert_false(event_mask & subcommand[i].mask,
+			      "%s mask is set before test started",
+			      subcommand[i].name);
+		/*
+		 * Setting mask value overwrites existing setting, so OR in
+		 * the test bit.
+		 */
+		event_mask |= subcommand[i].mask;
+		rv = console_cmd_hostevent(subcommand[i].name, event_mask);
+		zassert_ok(rv, "Subcommand %s failed", subcommand[i].name);
+		zassert_true(lpc_get_host_event_mask(subcommand[i].type) &
+				     subcommand[i].mask,
+			     "Failed to set %s event mask", subcommand[i].name);
+
+		/*
+		 * It is only valid to set host events, once at least one mask
+		 * value includes the event.  Setting host events preserves
+		 * existing events.
+		 */
+		zassert_false(host_get_events() & subcommand[i].mask,
+			      "Host event is set before test started");
+		rv = console_cmd_hostevent("set", subcommand[i].mask);
+		zassert_ok(rv, "Subcommand SET failed");
+
+		all_events |= subcommand[i].mask;
+	}
+
+	/* Verify all host events were set, and none were lost */
+	zassert_true((host_get_events() & all_events) == all_events,
+		     "Failed to set host events");
+
+	/* Test clearing of host events */
+	set_events = all_events;
+	for (int i = 0; i < ARRAY_SIZE(subcommand); i++) {
+		set_events &= ~subcommand[i].mask;
+		rv = console_cmd_hostevent("clear", subcommand[i].mask);
+		zassert_ok(rv, "Subcommand CLEAR failed");
+
+		zassert_true((host_get_events() & set_events) == set_events,
+			     "Failed to clear host event");
+	}
+
+	/* Verify the backup host events were set, and none were cleared */
+	ret_val = host_cmd_host_event(EC_HOST_EVENT_GET, EC_HOST_EVENT_B,
+				      &result);
+	zassert_equal(ret_val, EC_RES_SUCCESS, "Expected=%d, returned=%d",
+		      EC_RES_SUCCESS, ret_val);
+	zassert_true((result.value & all_events) == all_events,
+		     "Failed to set host events backup");
+
+	/* Test clearing of backup host events */
+	set_events = all_events;
+	for (int i = 0; i < ARRAY_SIZE(subcommand); i++) {
+		set_events &= ~subcommand[i].mask;
+		rv = console_cmd_hostevent("clearb", subcommand[i].mask);
+		zassert_ok(rv, "Subcommand CLEAR failed");
+
+		ret_val = host_cmd_host_event(EC_HOST_EVENT_GET,
+					      EC_HOST_EVENT_B, &result);
+		zassert_equal(ret_val, EC_RES_SUCCESS,
+			      "Expected=%d, returned=%d", EC_RES_SUCCESS,
+			      ret_val);
+		zassert_true((result.value & set_events) == set_events,
+			     "Failed to clear host events backup");
+	}
+}
+
+ZTEST_SUITE(console_cmd_hostevent, drivers_predicate_post_main,
+	    console_cmd_hostevent_setup, console_cmd_hostevent_before,
+	    console_cmd_hostevent_after, NULL);