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

diff --git a/zephyr/test/drivers/usb_retimer_fw_update/src/usb_retimer_fw_update.c b/zephyr/test/drivers/usb_retimer_fw_update/src/usb_retimer_fw_update.c
new file mode 100644
index 0000000000..9a360761ab
--- /dev/null
+++ b/zephyr/test/drivers/usb_retimer_fw_update/src/usb_retimer_fw_update.c
@@ -0,0 +1,269 @@
+/* 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 "test/drivers/stubs.h"
+#include "test/drivers/test_state.h"
+#include "test/drivers/utils.h"
+#include "usb_common.h"
+#include "usb_pd.h"
+
+#define BB_RETIMER_NODE DT_NODELABEL(usb_c1_bb_retimer_emul)
+#define TEST_PORT USBC_PORT_C1
+
+/* Note: for API details, see common/usbc/usb_retimer_fw_update.c */
+
+/* Helpers */
+static uint8_t acpi_read_and_verify(void)
+{
+	uint8_t read_result = acpi_read(EC_ACPI_MEM_USB_RETIMER_FW_UPDATE);
+
+	zassert_not_equal(read_result, USB_RETIMER_FW_UPDATE_ERR,
+			  "Command returned unexpected err");
+	zassert_not_equal(read_result, USB_RETIMER_FW_UPDATE_INVALID_MUX,
+			  "Command returned invalid mux");
+
+	return read_result;
+}
+
+static void usb_retimer_fw_update_suspend_port(void)
+{
+	/* Write our command to suspend the port first */
+	acpi_write(EC_ACPI_MEM_USB_RETIMER_FW_UPDATE,
+		   USB_RETIMER_FW_UPDATE_SUSPEND_PD
+				   << USB_RETIMER_FW_UPDATE_OP_SHIFT |
+			   TEST_PORT);
+
+	/* Give PD task time to suspend port */
+	k_sleep(K_SECONDS(1));
+
+	zassume_true(acpi_read_and_verify() == 0,
+		     "Failed to see successful suspend");
+}
+
+/* Test configuration */
+static void usb_retimer_fw_update_before(void *data)
+{
+	ARG_UNUSED(data);
+
+	/* Assume our common setup of a BB retimer on C1 */
+	zassume_true(EMUL_DT_GET(BB_RETIMER_NODE) != NULL,
+		     "No BB retimer found on C1");
+
+	/* Set chipset to ON, since AP would drive this process */
+	test_set_chipset_to_s0();
+
+	/* TODO(b/214401892): Check why need to give time TCPM to spin */
+	k_sleep(K_SECONDS(1));
+}
+
+static void usb_retimer_fw_update_after(void *data)
+{
+	ARG_UNUSED(data);
+
+	/* Unsuspend the port */
+	acpi_write(EC_ACPI_MEM_USB_RETIMER_FW_UPDATE,
+		   USB_RETIMER_FW_UPDATE_DISCONNECT
+				   << USB_RETIMER_FW_UPDATE_OP_SHIFT |
+			   TEST_PORT);
+
+	/* Port should resume after at least 7 seconds */
+	k_sleep(K_SECONDS(8));
+}
+
+ZTEST_SUITE(usb_retimer_fw_update, drivers_predicate_post_main, NULL,
+	    usb_retimer_fw_update_before, usb_retimer_fw_update_after, NULL);
+
+ZTEST(usb_retimer_fw_update, verify_query_port)
+{
+	/* Write our command to query ports */
+	acpi_write(EC_ACPI_MEM_USB_RETIMER_FW_UPDATE,
+		   USB_RETIMER_FW_UPDATE_QUERY_PORT
+			   << USB_RETIMER_FW_UPDATE_OP_SHIFT);
+
+	zassert_true(acpi_read_and_verify() & BIT(TEST_PORT),
+		     "Failed to see port in query");
+}
+
+ZTEST(usb_retimer_fw_update, verify_suspend_port)
+{
+	/* Write our command to suspend the port */
+	acpi_write(EC_ACPI_MEM_USB_RETIMER_FW_UPDATE,
+		   USB_RETIMER_FW_UPDATE_SUSPEND_PD
+				   << USB_RETIMER_FW_UPDATE_OP_SHIFT |
+			   TEST_PORT);
+
+	/* Give PD task time to suspend port */
+	k_sleep(K_SECONDS(1));
+
+	/* Return of 0 indicates the command succeeded */
+	zassert_true(acpi_read_and_verify() == 0,
+		     "Failed to see successful suspend");
+}
+
+ZTEST(usb_retimer_fw_update, verify_resume_port)
+{
+	usb_retimer_fw_update_suspend_port();
+
+	/* And now resume it */
+	acpi_write(EC_ACPI_MEM_USB_RETIMER_FW_UPDATE,
+		   USB_RETIMER_FW_UPDATE_RESUME_PD
+				   << USB_RETIMER_FW_UPDATE_OP_SHIFT |
+			   TEST_PORT);
+
+	/* Give PD task time to resume port */
+	k_sleep(K_SECONDS(1));
+
+	/* Note: return indicates whether the port is enabled */
+	zassert_true(acpi_read_and_verify() == 1,
+		     "Failed to see successful resume");
+}
+
+ZTEST(usb_retimer_fw_update, verify_get_mux)
+{
+	struct ec_response_typec_status typec_status;
+
+	/* Write our command to get the mux state for a port */
+	acpi_write(EC_ACPI_MEM_USB_RETIMER_FW_UPDATE,
+		   USB_RETIMER_FW_UPDATE_GET_MUX
+				   << USB_RETIMER_FW_UPDATE_OP_SHIFT |
+			   TEST_PORT);
+
+	/* Give PD task time to process */
+	k_sleep(K_SECONDS(1));
+
+	typec_status = host_cmd_typec_status(TEST_PORT);
+	zassert_true(acpi_read_and_verify() == typec_status.mux_state,
+		     "Failed to match mux state");
+}
+
+/* Commands which first require suspend to be run */
+ZTEST(usb_retimer_fw_update, verify_set_mux_usb)
+{
+	struct ec_response_typec_status typec_status;
+
+	usb_retimer_fw_update_suspend_port();
+
+	/* And now set the mux to USB */
+	acpi_write(EC_ACPI_MEM_USB_RETIMER_FW_UPDATE,
+		   USB_RETIMER_FW_UPDATE_SET_USB
+				   << USB_RETIMER_FW_UPDATE_OP_SHIFT |
+			   TEST_PORT);
+
+	/* Give PD task time to set the mux */
+	k_sleep(K_SECONDS(1));
+
+	/* Note: return indicates filtered mux state */
+	zassert_true(acpi_read_and_verify() == USB_PD_MUX_USB_ENABLED,
+		     "Failed to set mux usb");
+
+	typec_status = host_cmd_typec_status(TEST_PORT);
+	zassert_equal(typec_status.mux_state & USB_RETIMER_FW_UPDATE_MUX_MASK,
+		      USB_PD_MUX_USB_ENABLED, "Status mux disagreement");
+}
+
+ZTEST(usb_retimer_fw_update, verify_set_mux_safe)
+{
+	struct ec_response_typec_status typec_status;
+
+	usb_retimer_fw_update_suspend_port();
+
+	/* And now set the mux to safe */
+	acpi_write(EC_ACPI_MEM_USB_RETIMER_FW_UPDATE,
+		   USB_RETIMER_FW_UPDATE_SET_SAFE
+				   << USB_RETIMER_FW_UPDATE_OP_SHIFT |
+			   TEST_PORT);
+
+	/* Give PD task time to set the mux */
+	k_sleep(K_SECONDS(1));
+
+	/* Note: return indicates filtered mux state */
+	zassert_true(acpi_read_and_verify() == USB_PD_MUX_SAFE_MODE,
+		     "Failed to set mux safe");
+
+	typec_status = host_cmd_typec_status(TEST_PORT);
+	zassert_equal(typec_status.mux_state & USB_RETIMER_FW_UPDATE_MUX_MASK,
+		      USB_PD_MUX_SAFE_MODE, "Status mux disagreement");
+}
+
+ZTEST(usb_retimer_fw_update, verify_set_mux_tbt)
+{
+	struct ec_response_typec_status typec_status;
+
+	usb_retimer_fw_update_suspend_port();
+
+	/* And now set the mux to TBT */
+	acpi_write(EC_ACPI_MEM_USB_RETIMER_FW_UPDATE,
+		   USB_RETIMER_FW_UPDATE_SET_TBT
+				   << USB_RETIMER_FW_UPDATE_OP_SHIFT |
+			   TEST_PORT);
+
+	/* Give PD task time to set the mux */
+	k_sleep(K_SECONDS(1));
+
+	/* Note: return indicates filtered mux state */
+	zassert_true(acpi_read_and_verify() == USB_PD_MUX_TBT_COMPAT_ENABLED,
+		     "Failed to set mux tbt");
+
+	typec_status = host_cmd_typec_status(TEST_PORT);
+	zassert_equal(typec_status.mux_state & USB_RETIMER_FW_UPDATE_MUX_MASK,
+		      USB_PD_MUX_TBT_COMPAT_ENABLED, "Status mux disagreement");
+}
+
+ZTEST(usb_retimer_fw_update, verify_update_disconnect)
+{
+	uint64_t command_start;
+
+	usb_retimer_fw_update_suspend_port();
+
+	/* And now set the process to disconnect */
+	acpi_write(EC_ACPI_MEM_USB_RETIMER_FW_UPDATE,
+		   USB_RETIMER_FW_UPDATE_DISCONNECT
+				   << USB_RETIMER_FW_UPDATE_OP_SHIFT |
+			   TEST_PORT);
+	command_start = k_uptime_get();
+
+	/* Give PD task time to set the mux */
+	k_sleep(K_SECONDS(1));
+
+	/* Note: return indicates filtered mux state */
+	zassert_true(acpi_read_and_verify() == USB_PD_MUX_NONE,
+		     "Failed to set mux disconnect");
+
+	/*
+	 * Note: this would ideally be a host command interface check, but
+	 * the only HC return which would cover this is a state string, which
+	 * could be brittle.
+	 */
+	/* Port shouldn't be up or at least 5 seconds */
+	for (int i = 0; i < 10; i++) {
+		if (pd_is_port_enabled(TEST_PORT)) {
+			zassert_true((k_uptime_get() - command_start) > 5000,
+				     "Port resumed too soon");
+			break;
+		}
+		k_sleep(K_SECONDS(1));
+	}
+
+	zassert_true(pd_is_port_enabled(TEST_PORT), "Port not resuemd");
+}
+
+/* Verify we get an error if port isn't suspended */
+ZTEST(usb_retimer_fw_update, verify_mux_usb_error)
+{
+	/* Set the mux to USB  on unsuspended port */
+	acpi_write(EC_ACPI_MEM_USB_RETIMER_FW_UPDATE,
+		   USB_RETIMER_FW_UPDATE_SET_USB
+				   << USB_RETIMER_FW_UPDATE_OP_SHIFT |
+			   TEST_PORT);
+
+	/* Give PD task time to set the mux */
+	k_sleep(K_SECONDS(1));
+
+	zassert_true(acpi_read(EC_ACPI_MEM_USB_RETIMER_FW_UPDATE) ==
+			     USB_RETIMER_FW_UPDATE_ERR,
+		     "Failed to fail mux set");
+}