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/integration/usbc/usb_pd_bist_shared.c b/zephyr/test/drivers/default/src/integration/usbc/usb_pd_bist_shared.c
new file mode 100644
index 0000000000..9c76f862f8
--- /dev/null
+++ b/zephyr/test/drivers/default/src/integration/usbc/usb_pd_bist_shared.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/ztest.h>
+
+#include "emul/emul_isl923x.h"
+#include "emul/emul_smart_battery.h"
+#include "emul/tcpc/emul_tcpci_partner_snk.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"
+#include "util.h"
+
+struct usb_pd_bist_shared_fixture {
+	struct tcpci_partner_data sink_5v_500ma;
+	struct tcpci_snk_emul_data snk_ext_500ma;
+	struct tcpci_partner_data src;
+	struct tcpci_src_emul_data src_ext;
+	const struct emul *tcpci_emul; /* USBC_PORT_C0 in dts */
+	const struct emul *tcpci_ps8xxx_emul; /* USBC_PORT_C1 in dts */
+	const struct emul *charger_emul;
+};
+
+static void *usb_pd_bist_shared_setup(void)
+{
+	static struct usb_pd_bist_shared_fixture test_fixture;
+
+	/* Get references for the emulators */
+	test_fixture.tcpci_emul = EMUL_GET_USBC_BINDING(0, tcpc);
+	test_fixture.charger_emul = EMUL_GET_USBC_BINDING(0, chg);
+	test_fixture.tcpci_ps8xxx_emul = EMUL_GET_USBC_BINDING(1, tcpc);
+
+	return &test_fixture;
+}
+
+static void usb_pd_bist_shared_before(void *data)
+{
+	struct usb_pd_bist_shared_fixture *test_fixture = data;
+
+	/* Set chipset to ON, this will set TCPM to DRP */
+	test_set_chipset_to_s0();
+
+	/* TODO(b/214401892): Check why need to give time TCPM to spin */
+	k_sleep(K_SECONDS(1));
+
+	/* Initialized the sink to request 5V and 500mA */
+	tcpci_partner_init(&test_fixture->sink_5v_500ma, PD_REV30);
+	test_fixture->sink_5v_500ma.extensions =
+		tcpci_snk_emul_init(&test_fixture->snk_ext_500ma,
+				    &test_fixture->sink_5v_500ma, NULL);
+	test_fixture->snk_ext_500ma.pdo[0] = PDO_FIXED(5000, 500, 0);
+
+	/* Initialized the source */
+	tcpci_partner_init(&test_fixture->src, PD_REV30);
+	test_fixture->src.extensions = tcpci_src_emul_init(
+		&test_fixture->src_ext, &test_fixture->src, NULL);
+
+	/* Initially connect the 5V 500mA partner to C0 */
+	connect_sink_to_port(&test_fixture->sink_5v_500ma,
+			     test_fixture->tcpci_emul,
+			     test_fixture->charger_emul);
+}
+
+static void usb_pd_bist_shared_after(void *data)
+{
+	struct usb_pd_bist_shared_fixture *test_fixture = data;
+
+	/* Disocnnect C0 as sink, C1 as source */
+	disconnect_sink_from_port(test_fixture->tcpci_emul);
+	disconnect_source_from_port(test_fixture->tcpci_ps8xxx_emul,
+				    test_fixture->charger_emul);
+}
+
+ZTEST_SUITE(usb_pd_bist_shared, drivers_predicate_post_main,
+	    usb_pd_bist_shared_setup, usb_pd_bist_shared_before,
+	    usb_pd_bist_shared_after, NULL);
+
+ZTEST_F(usb_pd_bist_shared, verify_bist_shared_mode)
+{
+	uint32_t bist_data;
+	uint32_t f5v_cap;
+
+	/*
+	 * Verify we were offered the 1.5A source cap because of our low current
+	 * needs initially
+	 */
+	f5v_cap = fixture->snk_ext_500ma.last_5v_source_cap;
+	/* Capability should be 5V fixed, 1.5 A */
+	zassert_equal((f5v_cap & PDO_TYPE_MASK), PDO_TYPE_FIXED,
+		      "PDO type wrong");
+	zassert_equal(PDO_FIXED_VOLTAGE(f5v_cap), 5000, "PDO voltage wrong");
+	zassert_equal(PDO_FIXED_CURRENT(f5v_cap), 1500,
+		      "PDO initial current wrong");
+
+	/* Start up BIST shared test mode */
+	bist_data = BDO(BDO_MODE_SHARED_ENTER, 0);
+	zassume_ok(tcpci_partner_send_data_msg(&fixture->sink_5v_500ma,
+					       PD_DATA_BIST, &bist_data, 1, 0),
+		   "Failed to send BIST enter message");
+
+	/* The DUT has tBISTSharedTestMode (1 second) to offer us 3A now */
+	k_sleep(K_SECONDS(1));
+
+	f5v_cap = fixture->snk_ext_500ma.last_5v_source_cap;
+	/* Capability should be 5V fixed, 3.0 A */
+	zassert_equal((f5v_cap & PDO_TYPE_MASK), PDO_TYPE_FIXED,
+		      "PDO type wrong");
+	zassert_equal(PDO_FIXED_VOLTAGE(f5v_cap), 5000, "PDO voltage wrong");
+	zassert_equal(PDO_FIXED_CURRENT(f5v_cap), 3000,
+		      "PDO current didn't increase in BIST mode");
+
+	/* Leave BIST shared test mode */
+	bist_data = BDO(BDO_MODE_SHARED_EXIT, 0);
+	zassume_ok(tcpci_partner_send_data_msg(&fixture->sink_5v_500ma,
+					       PD_DATA_BIST, &bist_data, 1, 0),
+		   "Failed to send BIST exit message");
+
+	/*
+	 * The DUT may now execute ErrorRecovery or simply send a new
+	 * Source_Cap.  Either way, we should go back to 1.5 A
+	 */
+	k_sleep(K_SECONDS(5));
+
+	f5v_cap = fixture->snk_ext_500ma.last_5v_source_cap;
+	/* Capability should be 5V fixed, 1.5 A */
+	zassert_equal((f5v_cap & PDO_TYPE_MASK), PDO_TYPE_FIXED,
+		      "PDO type wrong");
+	zassert_equal(PDO_FIXED_VOLTAGE(f5v_cap), 5000, "PDO voltage wrong");
+	zassert_equal(PDO_FIXED_CURRENT(f5v_cap), 1500,
+		      "PDO current didn't decrease after BIST exit");
+}
+
+ZTEST_F(usb_pd_bist_shared, verify_bist_shared_no_snk_entry)
+{
+	uint32_t bist_data;
+	uint32_t f5v_cap;
+
+	/*
+	 * Ensure we only enter BIST shared mode when acting as a source.  We
+	 * must not enter shared mode from PE_SNK_Ready.
+	 */
+
+	/* Attach a new source */
+	connect_source_to_port(&fixture->src, &fixture->src_ext, 1,
+			       fixture->tcpci_ps8xxx_emul,
+			       fixture->charger_emul);
+
+	/* Have the source send the BIST Enter Mode */
+	bist_data = BDO(BDO_MODE_SHARED_ENTER, 0);
+	zassume_ok(tcpci_partner_send_data_msg(&fixture->src, PD_DATA_BIST,
+					       &bist_data, 1, 0),
+		   "Failed to send BIST enter message");
+
+	/* Wait tBISTSharedTestMode (1 second) */
+	k_sleep(K_SECONDS(1));
+
+	/* Verify our low power sink on C0 still only has 1.5 A */
+	f5v_cap = fixture->snk_ext_500ma.last_5v_source_cap;
+	/* Capability should be 5V fixed, 1.5 A */
+	zassert_equal((f5v_cap & PDO_TYPE_MASK), PDO_TYPE_FIXED,
+		      "PDO type wrong");
+	zassert_equal(PDO_FIXED_VOLTAGE(f5v_cap), 5000, "PDO voltage wrong");
+	zassert_equal(PDO_FIXED_CURRENT(f5v_cap), 1500,
+		      "PDO current incorrect after bad BIST entry");
+}
+
+ZTEST_F(usb_pd_bist_shared, verify_bist_shared_exit_no_action)
+{
+	uint32_t bist_data;
+	uint32_t f5v_cap;
+
+	/*
+	 * Verify that if we receive a BIST shared mode exit with no entry, we
+	 * take no action on the port.
+	 */
+	tcpci_snk_emul_clear_last_5v_cap(&fixture->snk_ext_500ma);
+
+	bist_data = BDO(BDO_MODE_SHARED_EXIT, 0);
+	zassume_ok(tcpci_partner_send_data_msg(&fixture->sink_5v_500ma,
+					       PD_DATA_BIST, &bist_data, 1, 0),
+		   "Failed to send BIST exit message");
+
+	/* Wait for the time it would take to settle out exit */
+	k_sleep(K_SECONDS(5));
+
+	/* Verify we didn't receive any new source caps due to the mode exit */
+	f5v_cap = fixture->snk_ext_500ma.last_5v_source_cap;
+	zassert_equal(f5v_cap, 0, "Received unexpected source cap");
+}