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

diff --git a/zephyr/test/drivers/default/src/virtual_battery.c b/zephyr/test/drivers/default/src/virtual_battery.c
new file mode 100644
index 0000000000..0e69c641a5
--- /dev/null
+++ b/zephyr/test/drivers/default/src/virtual_battery.c
@@ -0,0 +1,259 @@
+/* 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/kernel.h>
+#include <zephyr/ztest.h>
+
+#include "battery.h"
+#include "battery_smart.h"
+#include "ec_commands.h"
+#include "emul/emul_smart_battery.h"
+#include "host_command.h"
+#include "test/drivers/test_state.h"
+
+/* The param buffer has at most 2 msg's (write + read) and 1 byte write len. */
+static uint8_t param_buf[sizeof(struct ec_params_i2c_passthru) +
+			 sizeof(struct ec_params_i2c_passthru_msg) * 2 + 1];
+
+/* The response buffer has at most 32 bytes returned result. */
+static uint8_t response_buf[sizeof(struct ec_response_i2c_passthru) + 32];
+
+static void i2c_passthru_xfer(uint8_t port, uint8_t addr, uint8_t *write_buf,
+			      int write_len, uint8_t **read_buf, int read_len)
+{
+	struct ec_params_i2c_passthru *params =
+		(struct ec_params_i2c_passthru *)&param_buf;
+	struct ec_response_i2c_passthru *response =
+		(struct ec_response_i2c_passthru *)&response_buf;
+	struct ec_params_i2c_passthru_msg *msg = params->msg;
+	struct host_cmd_handler_args args =
+		BUILD_HOST_COMMAND_SIMPLE(EC_CMD_I2C_PASSTHRU, 0);
+	uint8_t *pdata;
+	int size;
+
+	params->port = port;
+	params->num_msgs = (read_len != 0) + (write_len != 0);
+
+	size = sizeof(*params) + params->num_msgs * sizeof(*msg);
+	pdata = (uint8_t *)params + size;
+
+	if (write_len) {
+		msg->addr_flags = addr;
+		msg->len = write_len;
+		memcpy(pdata, write_buf, write_len);
+		msg++;
+	}
+
+	if (read_len) {
+		msg->addr_flags = addr | EC_I2C_FLAG_READ;
+		msg->len = read_len;
+	}
+
+	args.params = params;
+	args.params_size = size + write_len;
+	args.response = response;
+	args.response_max = sizeof(*response) + read_len;
+
+	/* Execute the I2C passthru host command */
+	zassert_ok(host_command_process(&args), NULL);
+	zassert_ok(args.result, NULL);
+	zassert_ok(response->i2c_status, NULL);
+	zassert_equal(args.response_size, sizeof(*response) + read_len, NULL);
+
+	/* Return the data portion */
+	if (read_len)
+		*read_buf = response->data;
+}
+
+static inline void virtual_battery_xfer(uint8_t *write_buf, int write_len,
+					uint8_t **read_buf, int read_len)
+{
+	i2c_passthru_xfer(I2C_PORT_VIRTUAL_BATTERY, VIRTUAL_BATTERY_ADDR_FLAGS,
+			  write_buf, write_len, read_buf, read_len);
+}
+
+static uint16_t virtual_battery_read16(uint8_t command)
+{
+	uint8_t write_buf[1] = { command };
+	uint8_t *read_buf;
+
+	virtual_battery_xfer(write_buf, 1, &read_buf, 2);
+
+	/* Little endian */
+	return ((int)read_buf[1] << 8) | read_buf[0];
+}
+
+static void virtual_battery_write16(uint8_t command, uint16_t data)
+{
+	uint8_t write_buf[3] = { command };
+
+	*((uint16_t *)&write_buf[1]) = data;
+
+	virtual_battery_xfer(write_buf, 3, NULL, 0);
+}
+
+static int virtual_battery_read_str(uint8_t command, char **read_buf,
+				    int read_len)
+{
+	uint8_t write_buf[1] = { command };
+	int len;
+
+	virtual_battery_xfer(write_buf, 1, (uint8_t **)read_buf, read_len);
+
+	/* Battery v2 embeds the strlen in the first byte so shift 1 byte. */
+	len = **read_buf;
+	(*read_buf)++;
+
+	return len;
+}
+
+static void virtual_battery_read_data(uint8_t command, char **read_buf,
+				      int read_len)
+{
+	uint8_t write_buf[1] = { command };
+
+	virtual_battery_xfer(write_buf, 1, (uint8_t **)read_buf, read_len);
+}
+
+#define BATTERY_NODE DT_NODELABEL(battery)
+
+ZTEST_USER(virtual_battery, test_read_regs)
+{
+	const struct emul *emul = EMUL_DT_GET(BATTERY_NODE);
+	struct sbat_emul_bat_data *bat = sbat_emul_get_bat_data(emul);
+	int16_t int16;
+	uint16_t word;
+	int expected;
+	char *str;
+	int len;
+
+	/*
+	 * Iterate all the registers, which issues the I2C passthru host
+	 * command to query the emulated smart battery. Most of the values
+	 * are the same as the emulated battery, but with some exceptions.
+	 */
+	word = virtual_battery_read16(SB_BATTERY_MODE);
+	zassert_equal(bat->mode, word, "%d != %d", bat->mode, word);
+
+	word = virtual_battery_read16(SB_SERIAL_NUMBER);
+	zassert_equal(bat->sn, word, "%d != %d", bat->sn, word);
+
+	word = virtual_battery_read16(SB_VOLTAGE);
+	zassert_equal(bat->volt, word, "%d != %d", bat->volt, word);
+
+	/* The expected value is calculated */
+	expected = 100 * bat->cap / bat->full_cap;
+	word = virtual_battery_read16(SB_RELATIVE_STATE_OF_CHARGE);
+
+	zassert_equal(expected, word, "%d != %d", expected, word);
+
+	word = virtual_battery_read16(SB_TEMPERATURE);
+	zassert_equal(bat->temp, word, "%d != %d", bat->temp, word);
+
+	int16 = virtual_battery_read16(SB_CURRENT);
+	zassert_equal(bat->cur, int16, "%d != %d", bat->cur, int16);
+
+	int16 = virtual_battery_read16(SB_AVERAGE_CURRENT);
+	zassert_equal(bat->avg_cur, int16, "%d != %d", bat->avg_cur, int16);
+
+	/* The virtual battery modifies the return value to make kernel happy */
+	expected = BATTERY_LEVEL_SHUTDOWN;
+	word = virtual_battery_read16(SB_MAX_ERROR);
+	zassert_equal(expected, word, "%d != %d", expected, word);
+
+	word = virtual_battery_read16(SB_FULL_CHARGE_CAPACITY);
+	zassert_equal(bat->full_cap, word, "%d != %d", bat->full_cap, word);
+
+	word = virtual_battery_read16(SB_CYCLE_COUNT);
+	zassert_equal(bat->cycle_count, word, "%d != %d", bat->cycle_count,
+		      word);
+
+	word = virtual_battery_read16(SB_DESIGN_CAPACITY);
+	zassert_equal(bat->design_cap, word, "%d != %d", bat->design_cap, word);
+
+	word = virtual_battery_read16(SB_REMAINING_CAPACITY);
+	zassert_equal(bat->cap, word, "%d != %d", bat->cap, word);
+
+	len = virtual_battery_read_str(SB_MANUFACTURER_NAME, &str,
+				       SB_MAX_STR_SIZE);
+	zassert_equal(bat->mf_name_len, len, "%d != %d", bat->mf_name_len, len);
+	zassert_mem_equal(str, bat->mf_name, bat->mf_name_len, "%s != %s", str,
+			  bat->mf_name);
+
+	len = virtual_battery_read_str(SB_DEVICE_NAME, &str, SB_MAX_STR_SIZE);
+	zassert_equal(bat->dev_name_len, len, "%d != %d", bat->dev_name_len,
+		      len);
+	zassert_mem_equal(str, bat->dev_name, bat->dev_name_len, "%s != %s",
+			  str, bat->dev_name);
+
+	len = virtual_battery_read_str(SB_DEVICE_CHEMISTRY, &str,
+				       SB_MAX_STR_SIZE);
+	zassert_equal(bat->dev_chem_len, len, "%d != %d", bat->dev_chem_len,
+		      len);
+	zassert_mem_equal(str, bat->dev_chem, bat->dev_chem_len, "%s != %s",
+			  str, bat->dev_chem);
+
+	/* Use the API to query the expected value */
+	battery_time_to_full(&expected);
+	word = virtual_battery_read16(SB_AVERAGE_TIME_TO_FULL);
+	zassert_equal(expected, word, "%d != %d", expected, word);
+
+	battery_time_to_empty(&expected);
+	word = virtual_battery_read16(SB_AVERAGE_TIME_TO_EMPTY);
+	zassert_equal(expected, word, "%d != %d", expected, word);
+
+	battery_run_time_to_empty(&expected);
+	word = virtual_battery_read16(SB_RUN_TIME_TO_EMPTY);
+	zassert_equal(expected, word, "%d != %d", expected, word);
+
+	word = virtual_battery_read16(SB_CHARGING_CURRENT);
+	zassert_equal(bat->desired_charg_cur, word, "%d != %d",
+		      bat->desired_charg_cur, word);
+
+	word = virtual_battery_read16(SB_CHARGING_VOLTAGE);
+	zassert_equal(bat->desired_charg_volt, word, "%d != %d",
+		      bat->desired_charg_volt, word);
+
+	word = virtual_battery_read16(SB_MANUFACTURE_DATE);
+	zassert_equal(bat->mf_date, word, "%d != %d", bat->mf_date, word);
+
+	/* Hard-coded return value: v1.1 without PEC */
+	expected = 0x0011;
+	word = virtual_battery_read16(SB_SPECIFICATION_INFO);
+	zassert_equal(expected, word, "%d != %d", expected, word);
+
+	zassume_ok(battery_status(&expected));
+	word = virtual_battery_read16(SB_BATTERY_STATUS);
+	zassert_equal(expected, word, "%d != %d", expected, word);
+
+	zassume_ok(battery_design_voltage(&expected));
+	word = virtual_battery_read16(SB_DESIGN_VOLTAGE);
+	zassert_equal(expected, word, "%d != %d", expected, word);
+
+	virtual_battery_read_data(SB_MANUFACTURER_DATA, &str, bat->mf_data_len);
+	zassert_mem_equal(str, bat->mf_data, bat->mf_data_len, "%s != %s", str,
+			  bat->mf_data);
+
+	/* At present, this command is used nowhere in our codebase. */
+	virtual_battery_read_data(SB_MANUFACTURE_INFO, &str, bat->mf_info_len);
+	zassert_mem_equal(str, bat->mf_info, bat->mf_info_len, "%s != %s", str,
+			  bat->mf_info);
+}
+
+ZTEST_USER(virtual_battery, test_write_mfgacc)
+{
+	struct sbat_emul_bat_data *bat;
+	const struct emul *emul = EMUL_DT_GET(BATTERY_NODE);
+	uint16_t cmd = PARAM_OPERATION_STATUS;
+
+	bat = sbat_emul_get_bat_data(emul);
+
+	/* Write the command to the SB_MANUFACTURER_ACCESS and check */
+	virtual_battery_write16(SB_MANUFACTURER_ACCESS, cmd);
+	zassert_equal(bat->mf_access, cmd, "%d != %d", bat->mf_access, cmd);
+}
+
+ZTEST_SUITE(virtual_battery, drivers_predicate_post_main, NULL, NULL, NULL,
+	    NULL);