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

diff --git a/zephyr/test/drivers/src/integration/usbc/usb_malfunction_sink.c b/zephyr/test/drivers/src/integration/usbc/usb_malfunction_sink.c
deleted file mode 100644
index c3788791e2..0000000000
--- a/zephyr/test/drivers/src/integration/usbc/usb_malfunction_sink.c
+++ /dev/null
@@ -1,259 +0,0 @@
-/* Copyright 2022 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include <stdint.h>
-#include <zephyr/sys/byteorder.h>
-#include <ztest.h>
-
-#include "battery_smart.h"
-#include "emul/emul_isl923x.h"
-#include "emul/emul_smart_battery.h"
-#include "emul/tcpc/emul_tcpci_partner_faulty_snk.h"
-#include "emul/tcpc/emul_tcpci_partner_snk.h"
-#include "tcpm/tcpci.h"
-#include "test/drivers/test_state.h"
-#include "test/drivers/utils.h"
-#include "usb_pd.h"
-
-struct usb_malfunction_sink_fixture {
-	struct tcpci_partner_data sink;
-	struct tcpci_faulty_snk_emul_data faulty_snk_ext;
-	struct tcpci_snk_emul_data snk_ext;
-	const struct emul *tcpci_emul;
-	const struct emul *charger_emul;
-	struct tcpci_faulty_snk_action actions[2];
-};
-
-static void
-connect_sink_to_port(struct usb_malfunction_sink_fixture *fixture)
-{
-	/*
-	 * TODO(b/221439302) Updating the TCPCI emulator registers, updating the
-	 *   vbus, as well as alerting should all be a part of the connect
-	 *   function.
-	 */
-	isl923x_emul_set_adc_vbus(fixture->charger_emul, 0);
-	tcpci_emul_set_reg(fixture->tcpci_emul, TCPC_REG_POWER_STATUS,
-			   TCPC_REG_POWER_STATUS_VBUS_DET);
-	tcpci_emul_set_reg(fixture->tcpci_emul, TCPC_REG_EXT_STATUS,
-			   TCPC_REG_EXT_STATUS_SAFE0V);
-	tcpci_tcpc_alert(0);
-	/*
-	 * TODO(b/226567798) Wait for TCPC init and DRPToggle. It is required,
-	 *   because tcpci_emul_reset_rule_before reset registers including
-	 *   Looking4Connection bit in CC_STATUS register.
-	 */
-	k_sleep(K_SECONDS(1));
-	zassume_ok(tcpci_partner_connect_to_tcpci(&fixture->sink,
-						  fixture->tcpci_emul),
-		   NULL);
-
-	/* Wait for PD negotiation and current ramp.
-	 * TODO(b/213906889): Check message timing and contents.
-	 */
-	k_sleep(K_SECONDS(10));
-}
-
-static inline void disconnect_sink_from_port(
-	struct usb_malfunction_sink_fixture *fixture)
-{
-	zassume_ok(tcpci_emul_disconnect_partner(fixture->tcpci_emul), NULL);
-	k_sleep(K_SECONDS(1));
-}
-
-static void *usb_malfunction_sink_setup(void)
-{
-	static struct usb_malfunction_sink_fixture test_fixture;
-
-	/* Get references for the emulators */
-	test_fixture.tcpci_emul =
-		emul_get_binding(DT_LABEL(DT_NODELABEL(tcpci_emul)));
-	test_fixture.charger_emul =
-		emul_get_binding(DT_LABEL(DT_NODELABEL(isl923x_emul)));
-	tcpci_emul_set_rev(test_fixture.tcpci_emul, TCPCI_EMUL_REV2_0_VER1_1);
-	tcpc_config[0].flags = tcpc_config[0].flags |
-			       TCPC_FLAGS_TCPCI_REV2_0;
-
-	/* Initialized the sink to request 5V and 3A */
-	tcpci_partner_init(&test_fixture.sink, PD_REV20);
-	test_fixture.sink.extensions =
-		tcpci_faulty_snk_emul_init(
-			&test_fixture.faulty_snk_ext, &test_fixture.sink,
-			tcpci_snk_emul_init(&test_fixture.snk_ext,
-					    &test_fixture.sink, NULL));
-	test_fixture.snk_ext.pdo[1] =
-		PDO_FIXED(5000, 3000, PDO_FIXED_UNCONSTRAINED);
-
-	return &test_fixture;
-}
-
-static void usb_malfunction_sink_before(void *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));
-
-}
-
-static void usb_malfunction_sink_after(void *data)
-{
-	struct usb_malfunction_sink_fixture *fixture = data;
-
-	tcpci_faulty_snk_emul_clear_actions_list(&fixture->faulty_snk_ext);
-	disconnect_sink_from_port(fixture);
-	tcpci_partner_common_clear_logged_msgs(&fixture->sink);
-}
-
-ZTEST_SUITE(usb_malfunction_sink, drivers_predicate_post_main,
-	    usb_malfunction_sink_setup,
-	    usb_malfunction_sink_before,
-	    usb_malfunction_sink_after, NULL);
-
-ZTEST_F(usb_malfunction_sink, test_fail_source_cap_and_pd_disable)
-{
-	struct ec_response_typec_status typec_status;
-
-	/*
-	 * Fail on SourceCapabilities message to make TCPM change PD port state
-	 * to disabled
-	 */
-	this->actions[0].action_mask = TCPCI_FAULTY_SNK_FAIL_SRC_CAP;
-	this->actions[0].count = TCPCI_FAULTY_SNK_INFINITE_ACTION;
-	tcpci_faulty_snk_emul_append_action(&this->faulty_snk_ext,
-					    &this->actions[0]);
-
-	connect_sink_to_port(this);
-
-	typec_status = host_cmd_typec_status(0);
-
-	/* Device is connected, but PD wasn't able to establish contract */
-	zassert_true(typec_status.pd_enabled, NULL);
-	zassert_true(typec_status.dev_connected, NULL);
-	zassert_false(typec_status.sop_connected, NULL);
-}
-
-ZTEST_F(usb_malfunction_sink, test_fail_source_cap_and_pd_connect)
-{
-	struct ec_response_usb_pd_power_info info;
-	struct ec_response_typec_status typec_status;
-
-	/*
-	 * Fail only few times on SourceCapabilities message to prevent entering
-	 * PE_SRC_Disabled state by TCPM
-	 */
-	this->actions[0].action_mask = TCPCI_FAULTY_SNK_FAIL_SRC_CAP;
-	this->actions[0].count = 3;
-	tcpci_faulty_snk_emul_append_action(&this->faulty_snk_ext,
-					    &this->actions[0]);
-
-	connect_sink_to_port(this);
-
-	typec_status = host_cmd_typec_status(0);
-
-	zassert_true(typec_status.pd_enabled, NULL);
-	zassert_true(typec_status.dev_connected, NULL);
-	zassert_true(typec_status.sop_connected, NULL);
-
-	info = host_cmd_power_info(0);
-
-	zassert_equal(info.role, USB_PD_PORT_POWER_SOURCE,
-		      "Expected role to be %d, but got %d",
-		      USB_PD_PORT_POWER_SOURCE, info.role);
-	zassert_equal(info.type, USB_CHG_TYPE_NONE,
-		      "Expected type to be %d, but got %d", USB_CHG_TYPE_NONE,
-		      info.type);
-	zassert_equal(info.meas.voltage_max, 0,
-		      "Expected charge voltage max of 0mV, but got %dmV",
-		      info.meas.voltage_max);
-	zassert_within(
-		info.meas.voltage_now, 5000, 500,
-		"Charging voltage expected to be near 5000mV, but was %dmV",
-		info.meas.voltage_now);
-	zassert_equal(info.meas.current_max, 1500,
-		      "Current max expected to be 1500mV, but was %dmV",
-		      info.meas.current_max);
-	zassert_equal(info.meas.current_lim, 0,
-		     "VBUS max is set to 0mA, but PD is reporting %dmA",
-		     info.meas.current_lim);
-	zassert_equal(info.max_power, 0,
-		      "Charging expected to be at %duW, but PD max is %duW",
-		      0, info.max_power);
-}
-
-ZTEST_F(usb_malfunction_sink, test_ignore_source_cap)
-{
-	struct tcpci_partner_log_msg *msg;
-	uint16_t header;
-	bool expect_hard_reset = false;
-	int msg_cnt = 0;
-
-	this->actions[0].action_mask = TCPCI_FAULTY_SNK_IGNORE_SRC_CAP;
-	this->actions[0].count = TCPCI_FAULTY_SNK_INFINITE_ACTION;
-	tcpci_faulty_snk_emul_append_action(&this->faulty_snk_ext,
-					    &this->actions[0]);
-
-	tcpci_partner_common_enable_pd_logging(&this->sink, true);
-	connect_sink_to_port(this);
-	tcpci_partner_common_enable_pd_logging(&this->sink, false);
-
-	/*
-	 * If test is failing, printing logged message may be useful to diagnose
-	 * problem:
-	 * tcpci_partner_common_print_logged_msgs(&this->sink);
-	 */
-
-	/* Check if SourceCapability message alternate with HardReset */
-	SYS_SLIST_FOR_EACH_CONTAINER(&this->sink.msg_log, msg, node) {
-		if (expect_hard_reset) {
-			zassert_equal(msg->sop, TCPCI_MSG_TX_HARD_RESET,
-				      "Expected message %d to be hard reset",
-				      msg_cnt);
-		} else {
-			header = sys_get_le16(msg->buf);
-			zassert_equal(msg->sop, TCPCI_MSG_SOP,
-				      "Expected message %d to be SOP message, not 0x%x",
-				      msg_cnt, msg->sop);
-			zassert_not_equal(PD_HEADER_CNT(header), 0,
-					  "Expected message %d to has at least one data object",
-					  msg_cnt);
-			zassert_equal(PD_HEADER_TYPE(header),
-				      PD_DATA_SOURCE_CAP,
-				      "Expected message %d to be SourceCapabilities, not 0x%x",
-				      msg_cnt, PD_HEADER_TYPE(header));
-		}
-
-		msg_cnt++;
-		expect_hard_reset = !expect_hard_reset;
-	}
-}
-
-ZTEST_F(usb_malfunction_sink, test_ignore_source_cap_and_pd_disable)
-{
-	struct ec_response_typec_status typec_status;
-
-	/*
-	 * Ignore first SourceCapabilities message and discard others by sending
-	 * different messages. This will lead to PD disable.
-	 */
-	this->actions[0].action_mask = TCPCI_FAULTY_SNK_IGNORE_SRC_CAP;
-	this->actions[0].count = 1;
-	tcpci_faulty_snk_emul_append_action(&this->faulty_snk_ext,
-					    &this->actions[0]);
-	this->actions[1].action_mask = TCPCI_FAULTY_SNK_DISCARD_SRC_CAP;
-	this->actions[1].count = TCPCI_FAULTY_SNK_INFINITE_ACTION;
-	tcpci_faulty_snk_emul_append_action(&this->faulty_snk_ext,
-					    &this->actions[1]);
-
-	connect_sink_to_port(this);
-
-	typec_status = host_cmd_typec_status(0);
-
-	/* Device is connected, but PD wasn't able to establish contract */
-	zassert_true(typec_status.pd_enabled, NULL);
-	zassert_true(typec_status.dev_connected, NULL);
-	zassert_false(typec_status.sop_connected, NULL);
-}