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

diff --git a/zephyr/test/drivers/chargesplash/src/chargesplash.c b/zephyr/test/drivers/chargesplash/src/chargesplash.c
new file mode 100644
index 0000000000..1b89262ce4
--- /dev/null
+++ b/zephyr/test/drivers/chargesplash/src/chargesplash.c
@@ -0,0 +1,303 @@
+/* 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/kernel.h>
+#include <stdbool.h>
+#include <zephyr/drivers/gpio/gpio_emul.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/shell/shell_uart.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/ztest.h>
+
+#include "chipset.h"
+#include "config.h"
+#include "ec_commands.h"
+#include "extpower.h"
+#include "hooks.h"
+#include "host_command.h"
+#include "lid_switch.h"
+#include "timer.h"
+#include "test/drivers/test_state.h"
+#include "test/drivers/utils.h"
+
+/* Do a chargesplash host cmd */
+static enum ec_status
+chargesplash_hostcmd(enum ec_chargesplash_cmd cmd,
+		     struct ec_response_chargesplash *response)
+{
+	struct ec_params_chargesplash params = { .cmd = cmd };
+	struct host_cmd_handler_args args =
+		BUILD_HOST_COMMAND(EC_CMD_CHARGESPLASH, 0, *response, params);
+
+	return host_command_process(&args);
+}
+
+static bool is_chargesplash_requested(void)
+{
+	struct ec_response_chargesplash response;
+
+	zassert_ok(chargesplash_hostcmd(EC_CHARGESPLASH_GET_STATE, &response),
+		   NULL);
+
+	return response.requested;
+}
+
+static struct k_poll_signal s0_signal = K_POLL_SIGNAL_INITIALIZER(s0_signal);
+static struct k_poll_event s0_event = K_POLL_EVENT_INITIALIZER(
+	K_POLL_TYPE_SIGNAL, K_POLL_MODE_NOTIFY_ONLY, &s0_signal);
+
+static void handle_chipset_s0_event(void)
+{
+	k_poll_signal_raise(&s0_signal, 0);
+}
+DECLARE_HOOK(HOOK_CHIPSET_RESUME, handle_chipset_s0_event, HOOK_PRIO_LAST);
+
+static void wait_for_chipset_startup(void)
+{
+	if (!chipset_in_state(CHIPSET_STATE_ON)) {
+		k_poll_signal_reset(&s0_signal);
+		k_poll(&s0_event, 1, K_FOREVER);
+	}
+
+	/*
+	 * TODO(b/230362548): We need to give the EC a bit to "calm down"
+	 * after reaching S0.
+	 */
+	msleep(2000);
+}
+
+#define GPIO_LID_OPEN_EC_NODE DT_NODELABEL(gpio_lid_open_ec)
+#define GPIO_LID_OPEN_EC_CTLR DT_GPIO_CTLR(GPIO_LID_OPEN_EC_NODE, gpios)
+#define GPIO_LID_OPEN_EC_PORT DT_GPIO_PIN(GPIO_LID_OPEN_EC_NODE, gpios)
+
+static void set_lid(bool open, bool inhibit_boot)
+{
+	const struct device *lid_switch_dev =
+		DEVICE_DT_GET(GPIO_LID_OPEN_EC_CTLR);
+
+	__ASSERT(lid_is_open() != open,
+		 "Lid change was requested, but it's already in that state");
+
+	if (!open) {
+		__ASSERT(!inhibit_boot,
+			 "inhibit_boot should not be used with a lid close");
+	}
+
+	zassume_ok(gpio_emul_input_set(lid_switch_dev, GPIO_LID_OPEN_EC_PORT,
+				       open),
+		   "Failed to set lid switch GPIO");
+
+	while (lid_is_open() != open) {
+		usleep(LID_DEBOUNCE_US + 1);
+	}
+
+	if (inhibit_boot) {
+		wait_for_chipset_startup();
+		test_set_chipset_to_g3();
+	}
+}
+
+/* Simulate a regular power button press */
+static void pulse_power_button(void)
+{
+	zassert_ok(shell_execute_cmd(get_ec_shell(), "powerbtn"), NULL);
+}
+
+static void reset_state(void *unused)
+{
+	test_set_chipset_to_g3();
+
+	/*
+	 * Prevent critical low battery from moving us back to G3 when
+	 * lid is opened.
+	 */
+	test_set_battery_level(75);
+
+	if (lid_is_open()) {
+		set_lid(false, false);
+	}
+
+	if (extpower_is_present()) {
+		set_ac_enabled(false);
+	}
+
+	zassume_ok(shell_execute_cmd(get_ec_shell(), "chargesplash reset"),
+		   "'chargesplash reset' shell command failed");
+}
+
+ZTEST_SUITE(chargesplash, drivers_predicate_post_main, NULL, reset_state, NULL,
+	    reset_state);
+
+/*
+ * When the lid is open and AC is connected, the chargesplash should
+ * be requested.
+ */
+ZTEST_USER(chargesplash, test_connect_ac)
+{
+	set_lid(true, true);
+
+	set_ac_enabled(true);
+	zassert_true(is_chargesplash_requested(),
+		     "chargesplash should be requested");
+	wait_for_chipset_startup();
+}
+
+/*
+ * When AC is not connected and we open the lid, the chargesplash
+ * should not be requested.
+ */
+ZTEST_USER(chargesplash, test_no_connect_ac)
+{
+	set_lid(true, false);
+	zassert_false(is_chargesplash_requested(),
+		      "chargesplash should not be requested");
+	wait_for_chipset_startup();
+}
+
+/*
+ * When we connect AC with the lid closed, the chargesplash should not
+ * be requested.
+ */
+ZTEST_USER(chargesplash, test_ac_connect_when_lid_closed)
+{
+	set_ac_enabled(true);
+	zassert_false(is_chargesplash_requested(),
+		      "chargesplash should not be requested");
+}
+
+/*
+ * Test that, after many repeated requests, the chargesplash
+ * feature becomes locked and non-functional.  This condition
+ * replicates a damaged charger or port which cannot maintain a
+ * reliable connection.
+ *
+ * Then, ensure the lockout clears after the chargesplash period
+ * passes.
+ */
+ZTEST_USER(chargesplash, test_lockout)
+{
+	int i;
+
+	set_lid(true, true);
+
+	for (i = 0; i < CONFIG_CHARGESPLASH_MAX_REQUESTS_PER_PERIOD; i++) {
+		set_ac_enabled(true);
+
+		zassert_true(is_chargesplash_requested(),
+			     "chargesplash should be requested");
+		wait_for_chipset_startup();
+
+		set_ac_enabled(false);
+		test_set_chipset_to_g3();
+	}
+
+	set_ac_enabled(true);
+	zassert_false(is_chargesplash_requested(),
+		      "chargesplash should be locked out");
+	set_ac_enabled(false);
+
+	sleep(CONFIG_CHARGESPLASH_PERIOD);
+
+	set_ac_enabled(true);
+	zassert_true(is_chargesplash_requested(),
+		     "lockout should have cleared");
+	wait_for_chipset_startup();
+}
+
+/* Test cancel chargesplash request by power button push */
+ZTEST_USER(chargesplash, test_power_button)
+{
+	set_lid(true, true);
+
+	set_ac_enabled(true);
+	zassert_true(is_chargesplash_requested(),
+		     "chargesplash should be requested");
+	wait_for_chipset_startup();
+	zassert_true(is_chargesplash_requested(),
+		     "chargesplash should still be requested");
+
+	pulse_power_button();
+	zassert_false(is_chargesplash_requested(),
+		      "chargesplash should be canceled by power button push");
+	zassert_true(chipset_in_state(CHIPSET_STATE_ON),
+		     "chipset should be on");
+}
+
+/* Manually lockout the feature via the shell */
+ZTEST_USER(chargesplash, test_manual_lockout_via_console)
+{
+	/*
+	 * Put an entry in the request log so the lockout has
+	 * something to wait on to clear.
+	 */
+	zassert_ok(shell_execute_cmd(get_ec_shell(), "chargesplash request"),
+		   NULL);
+	zassert_true(is_chargesplash_requested(),
+		     "chargesplash should be requested");
+	wait_for_chipset_startup();
+	test_set_chipset_to_g3();
+
+	zassert_ok(shell_execute_cmd(get_ec_shell(), "chargesplash lockout"),
+		   NULL);
+	zassert_ok(shell_execute_cmd(get_ec_shell(), "chargesplash request"),
+		   NULL);
+	zassert_false(is_chargesplash_requested(),
+		      "chargesplash should be not requested due to lockout");
+
+	sleep(CONFIG_CHARGESPLASH_PERIOD);
+
+	zassert_ok(shell_execute_cmd(get_ec_shell(), "chargesplash request"),
+		   NULL);
+	zassert_true(is_chargesplash_requested(),
+		     "lockout should have cleared");
+	wait_for_chipset_startup();
+}
+
+/* Manually lockout the feature via host command */
+ZTEST_USER(chargesplash, test_manual_lockout_via_hostcmd)
+{
+	struct ec_response_chargesplash response;
+
+	zassert_ok(chargesplash_hostcmd(EC_CHARGESPLASH_REQUEST, &response),
+		   NULL);
+	zassert_true(is_chargesplash_requested(),
+		     "chargesplash should be requested");
+	wait_for_chipset_startup();
+	test_set_chipset_to_g3();
+
+	zassert_ok(chargesplash_hostcmd(EC_CHARGESPLASH_LOCKOUT, &response),
+		   NULL);
+	zassert_ok(chargesplash_hostcmd(EC_CHARGESPLASH_REQUEST, &response),
+		   NULL);
+	zassert_false(is_chargesplash_requested(),
+		      "chargesplash should be not requested due to lockout");
+
+	sleep(CONFIG_CHARGESPLASH_PERIOD);
+
+	zassert_ok(chargesplash_hostcmd(EC_CHARGESPLASH_REQUEST, &response),
+		   NULL);
+	zassert_true(is_chargesplash_requested(),
+		     "lockout should have cleared");
+	wait_for_chipset_startup();
+}
+
+/* Simulate an actual run of the display loop */
+ZTEST_USER(chargesplash, test_display_loop)
+{
+	struct ec_response_chargesplash response;
+
+	set_lid(true, true);
+	set_ac_enabled(true);
+	zassert_true(is_chargesplash_requested(), NULL);
+	wait_for_chipset_startup();
+
+	zassert_ok(chargesplash_hostcmd(EC_CHARGESPLASH_DISPLAY_READY,
+					&response),
+		   NULL);
+
+	zassert_true(is_chargesplash_requested(), NULL);
+	pulse_power_button();
+	zassert_false(is_chargesplash_requested(), NULL);
+}