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

diff --git a/zephyr/test/drivers/default/src/console_cmd/charge_manager.c b/zephyr/test/drivers/default/src/console_cmd/charge_manager.c
new file mode 100644
index 0000000000..f6ee049ea1
--- /dev/null
+++ b/zephyr/test/drivers/default/src/console_cmd/charge_manager.c
@@ -0,0 +1,118 @@
+/* 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/shell/shell.h>
+#include <zephyr/ztest.h>
+
+#include "charge_manager.h"
+#include "console.h"
+#include "emul/emul_isl923x.h"
+#include "emul/tcpc/emul_tcpci.h"
+#include "emul/tcpc/emul_tcpci_partner_snk.h"
+#include "tcpm/tcpci.h"
+#include "test/drivers/test_state.h"
+#include "test/drivers/utils.h"
+
+struct console_cmd_charge_manager_fixture {
+	struct tcpci_partner_data sink_5v_3a;
+	struct tcpci_snk_emul_data sink_ext;
+	const struct emul *tcpci_emul;
+	const struct emul *charger_emul;
+};
+
+static void *console_cmd_charge_manager_setup(void)
+{
+	static struct console_cmd_charge_manager_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);
+
+	/* Initialized the sink to request 5V and 3A */
+	tcpci_partner_init(&test_fixture.sink_5v_3a, PD_REV20);
+	test_fixture.sink_5v_3a.extensions = tcpci_snk_emul_init(
+		&test_fixture.sink_ext, &test_fixture.sink_5v_3a, NULL);
+	test_fixture.sink_ext.pdo[1] =
+		PDO_FIXED(5000, 3000, PDO_FIXED_UNCONSTRAINED);
+
+	return &test_fixture;
+}
+
+static void console_cmd_charge_manager_after(void *state)
+{
+	struct console_cmd_charge_manager_fixture *fixture = state;
+
+	shell_execute_cmd(get_ec_shell(), "chgoverride -1");
+	disconnect_sink_from_port(fixture->tcpci_emul);
+}
+
+ZTEST_SUITE(console_cmd_charge_manager, drivers_predicate_post_main,
+	    console_cmd_charge_manager_setup, NULL,
+	    console_cmd_charge_manager_after, NULL);
+
+/**
+ * Test the chgsup (charge supplier info) command. This command only prints to
+ * console some information which is not yet possible to verify. So just check
+ * that the console command ran successfully.
+ */
+ZTEST_USER(console_cmd_charge_manager, test_chgsup)
+{
+	zassert_ok(shell_execute_cmd(get_ec_shell(), "chgsup"), NULL);
+}
+
+/**
+ * Test chgoverride command with no arguments. This should just print the
+ * current override port.
+ */
+ZTEST_USER(console_cmd_charge_manager, test_chgoverride_missing_port)
+{
+	zassert_ok(shell_execute_cmd(get_ec_shell(), "chgoverride"), NULL);
+}
+
+ZTEST_USER(console_cmd_charge_manager, test_chgoverride_off_from_off)
+{
+	zassert_ok(shell_execute_cmd(get_ec_shell(), "chgoverride -1"), NULL);
+	zassert_equal(charge_manager_get_override(), OVERRIDE_OFF, NULL);
+}
+
+ZTEST_USER(console_cmd_charge_manager, test_chgoverride_disable_from_off)
+{
+	zassert_ok(shell_execute_cmd(get_ec_shell(), "chgoverride -2"), NULL);
+	zassert_equal(charge_manager_get_override(), OVERRIDE_DONT_CHARGE,
+		      NULL);
+}
+
+ZTEST_USER(console_cmd_charge_manager, test_chgoverride_0_from_off)
+{
+	zassert_ok(shell_execute_cmd(get_ec_shell(), "chgoverride 0"), NULL);
+	zassert_equal(charge_manager_get_override(), 0, NULL);
+}
+
+ZTEST_USER_F(console_cmd_charge_manager, test_chgoverride_0_from_sink)
+{
+	test_set_chipset_to_g3();
+	k_sleep(K_SECONDS(1));
+
+	/* 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));
+
+	connect_sink_to_port(&fixture->sink_5v_3a, fixture->tcpci_emul,
+			     fixture->charger_emul);
+	zassert_equal(shell_execute_cmd(get_ec_shell(), "chgoverride 0"),
+		      EC_ERROR_INVAL, NULL);
+}
+
+ZTEST_USER(console_cmd_charge_manager, test_chgoverride_invalid_port)
+{
+	char cmd[256];
+
+	zassume_true(sprintf(cmd, "chgoverride %d", CHARGE_PORT_COUNT) > 0,
+		     NULL);
+	zassert_equal(shell_execute_cmd(get_ec_shell(), cmd), EC_ERROR_PARAM1,
+		      NULL);
+}