Merge remote-tracking branch cros/main into firmware-fpmcu-dartmonkey-releasefirmware-fpmcu-dartmonkey-release

Generated by: ./util/update_release_branch.py --board dartmonkey --relevant_paths_file
./util/fingerprint-relevant-paths.txt firmware-fpmcu-dartmonkey-release

Relevant changes:

git log --oneline 6c1587ca70..28712dae9d -- board/nocturne_fp
board/dartmonkey 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
a0751778f4 board/nocturne_fp/ro_workarounds.c: 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
58f0246dbe board/nocturne_fp/board_ro.c: 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
84e53a65da board/nocturne_fp/board.h: 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
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:244387210 b:242720240 b:215613183 b:242720910 b:236386294
BUG=b:234181908 b:244781166 b:234781655 b:234143158 b:234181908
BUG=b:237344361 b:236025198 b:234181908 b:180945056 chromium:1098010
BUG=b:246424843 b:234181908 b:131913998
TEST=`make -j buildall`
TEST=./util/run_device_tests.py --board dartmonkey
     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 "panic_data_dartmonkey_v2.0.2887": PASSED
     Test "panic_data_nocturne_fp_v2.2.64": PASSED
     Test "panic_data_nami_fp_v2.2.144": PASSED
Force-Relevant-Builds: all
Signed-off-by: Tom Hughes <tomhughes@chromium.org>

Change-Id: I2c312583a709fedae8fe11d92c22328c3b634bc7

1 files changed, 262 insertions, 0 deletions

diff --git a/zephyr/test/drivers/dps/src/dps.c b/zephyr/test/drivers/dps/src/dps.c
new file mode 100644
index 0000000000..d445767df4
--- /dev/null
+++ b/zephyr/test/drivers/dps/src/dps.c
@@ -0,0 +1,262 @@
+/* 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/ztest.h>
+
+#include "builtin/stdio.h"
+#include "console.h"
+#include "dps.h"
+#include "test/drivers/test_state.h"
+#include "timer.h"
+
+struct dps_fixture {
+	struct dps_config_t saved_config;
+	int saved_debug_level;
+};
+
+static void *dps_config_setup(void)
+{
+	static struct dps_fixture fixture;
+
+	fixture.saved_config = *dps_get_config();
+	fixture.saved_debug_level = *dps_get_debug_level();
+
+	return &fixture;
+}
+
+static void dps_config_before(void *data)
+{
+	dps_enable(true);
+}
+
+static void dps_config_after(void *data)
+{
+	struct dps_fixture *f = (struct dps_fixture *)data;
+
+	*dps_get_config() = f->saved_config;
+	*dps_get_debug_level() = f->saved_debug_level;
+	dps_enable(true);
+}
+
+ZTEST_F(dps, test_enable)
+{
+	zassert_true(dps_is_enabled(), NULL);
+	dps_enable(false);
+	zassert_false(dps_is_enabled(), NULL);
+	dps_enable(true);
+	zassert_true(dps_is_enabled(), NULL);
+}
+
+ZTEST_F(dps, test_config)
+{
+	struct dps_config_t *config = dps_get_config();
+
+	zassert_true(config->k_less_pwr <= config->k_more_pwr, NULL);
+	zassert_true(config->k_less_pwr > 0 && config->k_less_pwr < 100, NULL);
+	zassert_true(config->k_more_pwr > 0 && config->k_more_pwr < 100, NULL);
+
+	zassert_ok(dps_init(), NULL);
+	*config = fixture->saved_config;
+
+	config->k_less_pwr = config->k_more_pwr + 1;
+	zassert_equal(dps_init(), EC_ERROR_INVALID_CONFIG, NULL);
+	*config = fixture->saved_config;
+
+	config->k_more_pwr = 101;
+	zassert_equal(dps_init(), EC_ERROR_INVALID_CONFIG, NULL);
+	*config = fixture->saved_config;
+}
+
+ZTEST(dps, console_cmd__print_info)
+{
+	/* Print current status to console */
+	zassert_ok(shell_execute_cmd(get_ec_shell(), "dps"), NULL);
+}
+
+ZTEST(dps, console_cmd__enable)
+{
+	/* Disable DPS first, then try enabling */
+	dps_enable(false);
+	zassert_false(dps_is_enabled(), NULL);
+
+	zassert_ok(shell_execute_cmd(get_ec_shell(), "dps en"), NULL);
+
+	zassert_true(dps_is_enabled(), NULL);
+}
+
+ZTEST(dps, console_cmd__disable)
+{
+	/* Should already by enabled due to before() function */
+	zassume_true(dps_is_enabled(), NULL);
+
+	zassert_ok(shell_execute_cmd(get_ec_shell(), "dps dis"), NULL);
+
+	zassert_false(dps_is_enabled(), NULL);
+}
+
+ZTEST(dps, console_cmd__fakepwr_print)
+{
+	/* Print current fake power status to console */
+	zassert_ok(shell_execute_cmd(get_ec_shell(), "dps fakepwr"), NULL);
+}
+
+ZTEST(dps, console_cmd__fakepwr_enable_disable)
+{
+	zassume_false(dps_is_fake_enabled(),
+		      "fakepwr shouldn't be enabled by default");
+
+	zassert_ok(shell_execute_cmd(get_ec_shell(), "dps fakepwr 100 200"),
+		   NULL);
+	zassert_true(dps_is_fake_enabled(), NULL);
+	zassert_equal(100, dps_get_fake_mv(), "Got fake_mv=%d",
+		      dps_get_fake_mv());
+	zassert_equal(200, dps_get_fake_ma(), "Got fake_ma=%d",
+		      dps_get_fake_ma());
+
+	zassert_ok(shell_execute_cmd(get_ec_shell(), "dps fakepwr dis"), NULL);
+	zassert_false(dps_is_fake_enabled(), NULL);
+}
+
+ZTEST(dps, console_cmd__fakepwr_invalid)
+{
+	/* Various invalid parameters */
+	zassert_ok(!shell_execute_cmd(get_ec_shell(), "dps fakepwr 100"), NULL);
+	zassert_ok(!shell_execute_cmd(get_ec_shell(), "dps fakepwr -100 -200"),
+		   NULL);
+	zassert_ok(!shell_execute_cmd(get_ec_shell(), "dps fakepwr 100 -200"),
+		   NULL);
+}
+
+ZTEST(dps, console_cmd__debuglevel)
+{
+	zassert_ok(shell_execute_cmd(get_ec_shell(), "dps debug 999"), NULL);
+
+	zassert_equal(999, *dps_get_debug_level(), "Debug level is %d",
+		      *dps_get_debug_level());
+}
+
+ZTEST(dps, console_cmd__setkmore)
+{
+	struct dps_config_t *config = dps_get_config();
+	char cmd[32];
+
+	/* Try some invalid requests first */
+	zassert_ok(!shell_execute_cmd(get_ec_shell(), "dps setkmore"), NULL);
+	zassert_ok(!shell_execute_cmd(get_ec_shell(), "dps setkmore 101"),
+		   NULL);
+	zassert_ok(!shell_execute_cmd(get_ec_shell(), "dps setkmore 0"), NULL);
+	zassert_ok(!shell_execute_cmd(get_ec_shell(), "dps setkmore -1"), NULL);
+
+	zassert_true(crec_snprintf(cmd, sizeof(cmd), "dps setkmore %d",
+				   config->k_less_pwr - 1) > 0,
+		     NULL);
+	zassert_ok(!shell_execute_cmd(get_ec_shell(), cmd), NULL);
+
+	/* Adjust k_more_pwr to be one over k_less_pwr */
+	zassert_true(crec_snprintf(cmd, sizeof(cmd), "dps setkmore %d",
+				   config->k_less_pwr + 1) > 0,
+		     NULL);
+	zassert_ok(shell_execute_cmd(get_ec_shell(), cmd), NULL);
+
+	zassert_equal(config->k_less_pwr + 1, config->k_more_pwr,
+		      "k_more_pwr is %d but should be %d", config->k_more_pwr,
+		      config->k_less_pwr + 1);
+}
+
+ZTEST(dps, console_cmd__setkless)
+{
+	struct dps_config_t *config = dps_get_config();
+	char cmd[32];
+
+	/* Try some invalid requests first */
+	zassert_ok(!shell_execute_cmd(get_ec_shell(), "dps setkless"), NULL);
+	zassert_ok(!shell_execute_cmd(get_ec_shell(), "dps setkless 101"),
+		   NULL);
+	zassert_ok(!shell_execute_cmd(get_ec_shell(), "dps setkless 0"), NULL);
+	zassert_ok(!shell_execute_cmd(get_ec_shell(), "dps setkless -1"), NULL);
+
+	zassert_true(crec_snprintf(cmd, sizeof(cmd), "dps setkless %d",
+				   config->k_more_pwr + 1) > 0,
+		     NULL);
+	zassert_ok(!shell_execute_cmd(get_ec_shell(), cmd), NULL);
+
+	/* Adjust k_less_pwr to be one under k_more_pwr */
+	zassert_true(crec_snprintf(cmd, sizeof(cmd), "dps setkless %d",
+				   config->k_more_pwr - 1) > 0,
+		     NULL);
+	zassert_ok(shell_execute_cmd(get_ec_shell(), cmd), NULL);
+
+	zassert_equal(config->k_more_pwr - 1, config->k_less_pwr,
+		      "k_less_pwr is %d but should be %d", config->k_less_pwr,
+		      config->k_more_pwr - 1);
+}
+
+ZTEST(dps, console_cmd__setksample)
+{
+	struct dps_config_t *config = dps_get_config();
+
+	/* Try some invalid requests first */
+	zassert_ok(!shell_execute_cmd(get_ec_shell(), "dps setksample"), NULL);
+	zassert_ok(!shell_execute_cmd(get_ec_shell(), "dps setksample -1"),
+		   NULL);
+
+	zassert_ok(shell_execute_cmd(get_ec_shell(), "dps setksample 999"),
+		   NULL);
+
+	zassert_equal(999, config->k_sample, "k_sample is %d",
+		      config->k_sample);
+}
+
+ZTEST(dps, console_cmd__setkwindow)
+{
+	struct dps_config_t *config = dps_get_config();
+
+	/* Try some invalid requests first */
+	zassert_ok(!shell_execute_cmd(get_ec_shell(), "dps setkwin"), NULL);
+	zassert_ok(!shell_execute_cmd(get_ec_shell(), "dps setkwin -1"), NULL);
+
+	zassert_ok(shell_execute_cmd(get_ec_shell(), "dps setkwin 4"), NULL);
+
+	zassert_equal(4, config->k_window, "k_window is %d", config->k_window);
+}
+
+ZTEST(dps, console_cmd__settcheck)
+{
+	struct dps_config_t *config = dps_get_config();
+
+	/* Try some invalid requests first */
+	zassert_ok(!shell_execute_cmd(get_ec_shell(), "dps settcheck"), NULL);
+	zassert_ok(!shell_execute_cmd(get_ec_shell(), "dps settcheck -1"),
+		   NULL);
+
+	zassert_ok(shell_execute_cmd(get_ec_shell(), "dps settcheck 5"), NULL);
+
+	zassert_equal(5 * SECOND, config->t_check, "t_check is %d",
+		      config->t_check);
+}
+
+ZTEST(dps, console_cmd__settstable)
+{
+	struct dps_config_t *config = dps_get_config();
+
+	/* Try some invalid requests first */
+	zassert_ok(!shell_execute_cmd(get_ec_shell(), "dps settstable"), NULL);
+	zassert_ok(!shell_execute_cmd(get_ec_shell(), "dps settstable -1"),
+		   NULL);
+
+	zassert_ok(shell_execute_cmd(get_ec_shell(), "dps settstable 6"), NULL);
+
+	zassert_equal(6 * SECOND, config->t_stable, "t_stable is %d",
+		      config->t_stable);
+}
+
+ZTEST(dps, console_cmd__invalid)
+{
+	/* Non-existent subcommand should fail */
+	zassert_ok(!shell_execute_cmd(get_ec_shell(), "dps foobar xyz"), NULL);
+}
+
+ZTEST_SUITE(dps, drivers_predicate_pre_main, dps_config_setup,
+	    dps_config_before, dps_config_after, NULL);