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

diff --git a/zephyr/test/drivers/keyboard_scan/src/mkbp_info.c b/zephyr/test/drivers/keyboard_scan/src/mkbp_info.c
new file mode 100644
index 0000000000..b0d64eb1da
--- /dev/null
+++ b/zephyr/test/drivers/keyboard_scan/src/mkbp_info.c
@@ -0,0 +1,232 @@
+/* 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 <zephyr/fff.h>
+#include <emul/emul_kb_raw.h>
+
+#include "console.h"
+#include "host_command.h"
+#include "keyboard_scan.h"
+#include "keyboard_test_utils.h"
+#include "mkbp_info.h"
+#include "mkbp_input_devices.h"
+#include "test/drivers/test_state.h"
+
+ZTEST(mkbp_info, host_command_mkbp_info__keyboard_info)
+{
+	/* Get the number of keyboard rows and columns */
+
+	int ret;
+	struct ec_response_mkbp_info response;
+	struct ec_params_mkbp_info request = {
+		.info_type = EC_MKBP_INFO_KBD,
+	};
+
+	struct host_cmd_handler_args args =
+		BUILD_HOST_COMMAND(EC_CMD_MKBP_INFO, 0, response, request);
+
+	ret = host_command_process(&args);
+	zassert_equal(EC_SUCCESS, ret, "Host command failed: %d", ret);
+	zassert_equal(KEYBOARD_ROWS, response.rows, NULL);
+	zassert_equal(KEYBOARD_COLS_MAX, response.cols, NULL);
+}
+
+ZTEST(mkbp_info, host_command_mkbp_info__supported_buttons)
+{
+	/* Get the set of supported buttons */
+
+	int ret;
+	union ec_response_get_next_data response;
+	struct ec_params_mkbp_info request = {
+		.info_type = EC_MKBP_INFO_SUPPORTED,
+		.event_type = EC_MKBP_EVENT_BUTTON,
+	};
+
+	struct host_cmd_handler_args args =
+		BUILD_HOST_COMMAND(EC_CMD_MKBP_INFO, 0, response, request);
+
+	ret = host_command_process(&args);
+	zassert_equal(EC_SUCCESS, ret, "Host command failed: %d", ret);
+	zassert_equal(get_supported_buttons(), response.buttons, NULL);
+}
+
+ZTEST(mkbp_info, host_command_mkbp_info__supported_switches)
+{
+	/* Get the set of supported switches */
+
+	int ret;
+	union ec_response_get_next_data response;
+	struct ec_params_mkbp_info request = {
+		.info_type = EC_MKBP_INFO_SUPPORTED,
+		.event_type = EC_MKBP_EVENT_SWITCH,
+	};
+
+	struct host_cmd_handler_args args =
+		BUILD_HOST_COMMAND(EC_CMD_MKBP_INFO, 0, response, request);
+
+	ret = host_command_process(&args);
+	zassert_equal(EC_SUCCESS, ret, "Host command failed: %d", ret);
+	zassert_equal(get_supported_switches(), response.switches, NULL);
+}
+
+ZTEST(mkbp_info, host_command_mkbp_info__supported_invalid)
+{
+	/* Request support info on a non-existent type of input device. */
+
+	int ret;
+	union ec_response_get_next_data response;
+	struct ec_params_mkbp_info request = {
+		.info_type = EC_MKBP_INFO_SUPPORTED,
+		.event_type = EC_MKBP_EVENT_COUNT, /* Unsupported */
+	};
+
+	struct host_cmd_handler_args args =
+		BUILD_HOST_COMMAND(EC_CMD_MKBP_INFO, 0, response, request);
+
+	ret = host_command_process(&args);
+	zassert_equal(EC_RES_INVALID_PARAM, ret,
+		      "Host command didn't fail properly: %d", ret);
+}
+
+ZTEST(mkbp_info, host_command_mkbp_info__current_keyboard_matrix)
+{
+	/* Hold down a key so we can validate the returned keyboard matrix state
+	 */
+	const struct device *dev = DEVICE_DT_GET(DT_NODELABEL(cros_kb_raw));
+
+	emul_kb_raw_set_kbstate(dev, KEYBOARD_ROW_KEY_R, KEYBOARD_COL_KEY_R, 1);
+	keyboard_scan_init();
+
+	k_sleep(K_MSEC(100));
+
+	/* Get the current keyboard matrix state */
+
+	int ret;
+	union ec_response_get_next_data response;
+	struct ec_params_mkbp_info request = {
+		.info_type = EC_MKBP_INFO_CURRENT,
+		.event_type = EC_MKBP_EVENT_KEY_MATRIX,
+	};
+
+	struct host_cmd_handler_args args =
+		BUILD_HOST_COMMAND(EC_CMD_MKBP_INFO, 0, response, request);
+
+	ret = host_command_process(&args);
+	zassert_equal(EC_SUCCESS, ret, "Host command failed: %d", ret);
+
+	zassert_true(response.key_matrix[KEYBOARD_COL_KEY_R] &
+			     KEYBOARD_MASK_KEY_R,
+		     "Expected key is not pressed");
+}
+
+ZTEST(mkbp_info, host_command_mkbp_info__current_host_events)
+{
+	int ret;
+	union ec_response_get_next_data response;
+	struct ec_params_mkbp_info request = {
+		.info_type = EC_MKBP_INFO_CURRENT,
+		.event_type = EC_MKBP_EVENT_HOST_EVENT,
+	};
+
+	struct host_cmd_handler_args args =
+		BUILD_HOST_COMMAND(EC_CMD_MKBP_INFO, 0, response, request);
+
+	ret = host_command_process(&args);
+	zassert_equal(EC_SUCCESS, ret, "Host command failed: %d", ret);
+	zassert_equal((uint32_t)host_get_events(), response.host_event, NULL);
+}
+
+ZTEST(mkbp_info, host_command_mkbp_info__current_host_events64)
+{
+	int ret;
+	union ec_response_get_next_data response;
+	struct ec_params_mkbp_info request = {
+		.info_type = EC_MKBP_INFO_CURRENT,
+		.event_type = EC_MKBP_EVENT_HOST_EVENT64,
+	};
+
+	struct host_cmd_handler_args args =
+		BUILD_HOST_COMMAND(EC_CMD_MKBP_INFO, 0, response, request);
+
+	ret = host_command_process(&args);
+	zassert_equal(EC_SUCCESS, ret, "Host command failed: %d", ret);
+	zassert_equal(host_get_events(), response.host_event64, NULL);
+}
+
+ZTEST(mkbp_info, host_command_mkbp_info__current_buttons)
+{
+	int ret;
+	union ec_response_get_next_data response;
+	struct ec_params_mkbp_info request = {
+		.info_type = EC_MKBP_INFO_CURRENT,
+		.event_type = EC_MKBP_EVENT_BUTTON,
+	};
+
+	struct host_cmd_handler_args args =
+		BUILD_HOST_COMMAND(EC_CMD_MKBP_INFO, 0, response, request);
+
+	ret = host_command_process(&args);
+	zassert_equal(EC_SUCCESS, ret, "Host command failed: %d", ret);
+	zassert_equal(mkbp_get_button_state(), response.buttons, NULL);
+}
+
+ZTEST(mkbp_info, host_command_mkbp_info__current_switches)
+{
+	int ret;
+	union ec_response_get_next_data response;
+	struct ec_params_mkbp_info request = {
+		.info_type = EC_MKBP_INFO_CURRENT,
+		.event_type = EC_MKBP_EVENT_SWITCH,
+	};
+
+	struct host_cmd_handler_args args =
+		BUILD_HOST_COMMAND(EC_CMD_MKBP_INFO, 0, response, request);
+
+	ret = host_command_process(&args);
+	zassert_equal(EC_SUCCESS, ret, "Host command failed: %d", ret);
+	zassert_equal(mkbp_get_switch_state(), response.switches, NULL);
+}
+
+ZTEST(mkbp_info, host_command_mkbp_info__current_invalid)
+{
+	int ret;
+	union ec_response_get_next_data response;
+	struct ec_params_mkbp_info request = {
+		.info_type = EC_MKBP_INFO_CURRENT,
+		.event_type = EC_MKBP_EVENT_COUNT, /* Unsupported */
+	};
+
+	struct host_cmd_handler_args args =
+		BUILD_HOST_COMMAND(EC_CMD_MKBP_INFO, 0, response, request);
+
+	ret = host_command_process(&args);
+	zassert_equal(EC_RES_INVALID_PARAM, ret, "Host command failed: %d",
+		      ret);
+}
+
+ZTEST(mkbp_info, host_command_mkbp_info__invalid)
+{
+	int ret;
+	union ec_response_get_next_data response;
+	struct ec_params_mkbp_info request = {
+		.info_type = -1, /* Unsupported */
+	};
+
+	struct host_cmd_handler_args args =
+		BUILD_HOST_COMMAND(EC_CMD_MKBP_INFO, 0, response, request);
+
+	ret = host_command_process(&args);
+	zassert_equal(EC_RES_ERROR, ret, "Host command failed: %d", ret);
+}
+
+static void reset(void *data)
+{
+	ARG_UNUSED(data);
+
+	/* Release any pressed keys in the emulator */
+	clear_emulated_keys();
+}
+
+ZTEST_SUITE(mkbp_info, drivers_predicate_post_main, NULL, reset, reset, NULL);