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, 58 insertions, 51 deletions

diff --git a/driver/accelgyro_lsm6dsm.c b/driver/accelgyro_lsm6dsm.c
index 78dafc0e52..2bf0215315 100644
--- a/driver/accelgyro_lsm6dsm.c
+++ b/driver/accelgyro_lsm6dsm.c
@@ -1,4 +1,4 @@
-/* Copyright 2016 The Chromium OS Authors. All rights reserved.
+/* Copyright 2016 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -9,6 +9,7 @@
  * This driver supports both devices LSM6DSM and LSM6DSL
  */
 
+#include "builtin/assert.h"
 #include "driver/accelgyro_lsm6dsm.h"
 #include "driver/mag_lis2mdl.h"
 #include "hooks.h"
@@ -25,11 +26,11 @@
 #endif
 
 #define CPUTS(outstr) cputs(CC_ACCEL, outstr)
-#define CPRINTF(format, args...) cprintf(CC_ACCEL, format, ## args)
-#define CPRINTS(format, args...) cprints(CC_ACCEL, format, ## args)
+#define CPRINTF(format, args...) cprintf(CC_ACCEL, format, ##args)
+#define CPRINTS(format, args...) cprints(CC_ACCEL, format, ##args)
 
 STATIC_IF(ACCEL_LSM6DSM_INT_ENABLE)
-	volatile uint32_t last_interrupt_timestamp;
+volatile uint32_t last_interrupt_timestamp;
 
 /**
  * Gets the sensor type associated with the dev_fifo enum. This type can be used
@@ -55,7 +56,7 @@ static inline uint8_t get_sensor_type(enum dev_fifo fifo_type)
 static inline int get_xyz_reg(enum motionsensor_type type)
 {
 	return LSM6DSM_ACCEL_OUT_X_L_ADDR -
-		(LSM6DSM_ACCEL_OUT_X_L_ADDR - LSM6DSM_GYRO_OUT_X_L_ADDR) * type;
+	       (LSM6DSM_ACCEL_OUT_X_L_ADDR - LSM6DSM_GYRO_OUT_X_L_ADDR) * type;
 }
 
 /**
@@ -77,13 +78,12 @@ __maybe_unused static int config_interrupt(const struct motion_sensor_t *accel)
 				   LSM6DSM_FIFO_CTRL1_ADDR,
 				   OUT_XYZ_SIZE / sizeof(uint16_t)));
 	int1_ctrl_val |= LSM6DSM_INT_FIFO_TH | LSM6DSM_INT_FIFO_OVR |
-		LSM6DSM_INT_FIFO_FULL;
+			 LSM6DSM_INT_FIFO_FULL;
 
 	return st_raw_write8(accel->port, accel->i2c_spi_addr_flags,
-			LSM6DSM_INT1_CTRL, int1_ctrl_val);
+			     LSM6DSM_INT1_CTRL, int1_ctrl_val);
 }
 
-
 /**
  * fifo_disable - set fifo mode
  * @accel: Motion sensor pointer: must be MOTIONSENSE_TYPE_ACCEL.
@@ -132,7 +132,6 @@ static int fifo_enable(const struct motion_sensor_t *accel)
 		MOTIONSENSE_TYPE_MAG,
 	};
 
-
 	/* Search for min and max odr values for acc, gyro. */
 	for (i = FIFO_DEV_GYRO; i < FIFO_DEV_NUM; i++) {
 		/* Check if sensor enabled with ODR. */
@@ -151,8 +150,7 @@ static int fifo_enable(const struct motion_sensor_t *accel)
 	}
 
 	/* FIFO ODR must be set before the decimation factors */
-	odr_reg_val = LSM6DSM_ODR_TO_REG(max_odr) <<
-					LSM6DSM_FIFO_CTRL5_ODR_OFF;
+	odr_reg_val = LSM6DSM_ODR_TO_REG(max_odr) << LSM6DSM_FIFO_CTRL5_ODR_OFF;
 	err = st_raw_write8(accel->port, accel->i2c_spi_addr_flags,
 			    LSM6DSM_FIFO_CTRL5_ADDR, odr_reg_val);
 
@@ -174,12 +172,13 @@ static int fifo_enable(const struct motion_sensor_t *accel)
 	st_raw_write8(accel->port, accel->i2c_spi_addr_flags,
 		      LSM6DSM_FIFO_CTRL3_ADDR,
 		      (decimators[FIFO_DEV_GYRO] << LSM6DSM_FIFO_DEC_G_OFF) |
-		      (decimators[FIFO_DEV_ACCEL] << LSM6DSM_FIFO_DEC_XL_OFF));
+			      (decimators[FIFO_DEV_ACCEL]
+			       << LSM6DSM_FIFO_DEC_XL_OFF));
 	if (IS_ENABLED(CONFIG_LSM6DSM_SEC_I2C)) {
 		ASSERT(ARRAY_SIZE(decimators) > FIFO_DEV_MAG);
 		st_raw_write8(accel->port, accel->i2c_spi_addr_flags,
-				LSM6DSM_FIFO_CTRL4_ADDR,
-				decimators[FIFO_DEV_MAG]);
+			      LSM6DSM_FIFO_CTRL4_ADDR,
+			      decimators[FIFO_DEV_MAG]);
 
 		/*
 		 * FIFO ODR is limited by odr of gyro or accel.
@@ -204,12 +203,12 @@ static int fifo_enable(const struct motion_sensor_t *accel)
 		 */
 		if (max_odr > MAX(odrs[FIFO_DEV_ACCEL], odrs[FIFO_DEV_GYRO])) {
 			st_write_data_with_mask(accel,
-				LSM6DSM_ODR_REG(accel->type),
-				LSM6DSM_ODR_MASK,
-				LSM6DSM_ODR_TO_REG(max_odr));
+						LSM6DSM_ODR_REG(accel->type),
+						LSM6DSM_ODR_MASK,
+						LSM6DSM_ODR_TO_REG(max_odr));
 		} else {
-			st_write_data_with_mask(accel,
-				LSM6DSM_ODR_REG(accel->type),
+			st_write_data_with_mask(
+				accel, LSM6DSM_ODR_REG(accel->type),
 				LSM6DSM_ODR_MASK,
 				LSM6DSM_ODR_TO_REG(odrs[FIFO_DEV_ACCEL]));
 		}
@@ -275,8 +274,7 @@ static int fifo_next(struct lsm6dsm_data *private)
  * push_fifo_data - Scan data pattern and push upside
  */
 static void push_fifo_data(struct motion_sensor_t *accel, uint8_t *fifo,
-			   uint16_t flen,
-			   uint32_t timestamp)
+			   uint16_t flen, uint32_t timestamp)
 {
 	struct motion_sensor_t *s;
 	struct lsm6dsm_data *private = LSM6DSM_GET_DATA(accel);
@@ -310,7 +308,6 @@ static void push_fifo_data(struct motion_sensor_t *accel, uint8_t *fifo,
 				st_normalize(s, axis, fifo);
 			}
 
-
 			if (IS_ENABLED(CONFIG_ACCEL_FIFO)) {
 				struct ec_response_motion_sensor_data vect;
 
@@ -356,8 +353,7 @@ static int load_fifo(struct motion_sensor_t *s, const struct fstatus *fsts)
 
 		/* Read data and copy in buffer. */
 		err = st_raw_read_n_noinc(s->port, s->i2c_spi_addr_flags,
-					  LSM6DSM_FIFO_DATA_ADDR,
-					  fifo, length);
+					  LSM6DSM_FIFO_DATA_ADDR, fifo, length);
 		if (err != EC_SUCCESS)
 			return err;
 
@@ -398,17 +394,13 @@ static int irq_handler(struct motion_sensor_t *s, uint32_t *event)
 	    (!(*event & CONFIG_ACCEL_LSM6DSM_INT_EVENT)))
 		return EC_ERROR_NOT_HANDLED;
 
-
 	while (!fifo_empty) {
 		/* Read how many data pattern on FIFO to read. */
-		RETURN_ERROR(st_raw_read_n_noinc(s->port,
-						 s->i2c_spi_addr_flags,
-						 LSM6DSM_FIFO_STS1_ADDR,
-						 (uint8_t *)&fsts,
-						 sizeof(fsts)));
+		RETURN_ERROR(st_raw_read_n_noinc(
+			s->port, s->i2c_spi_addr_flags, LSM6DSM_FIFO_STS1_ADDR,
+			(uint8_t *)&fsts, sizeof(fsts)));
 		if (fsts.len & (LSM6DSM_FIFO_DATA_OVR | LSM6DSM_FIFO_FULL))
-			CPRINTS("%s FIFO Overrun: %04x",
-					s->name, fsts.len);
+			CPRINTS("%s FIFO Overrun: %04x", s->name, fsts.len);
 		fifo_empty = fsts.len & LSM6DSM_FIFO_EMPTY;
 		if (!fifo_empty) {
 			commit_needed = true;
@@ -420,7 +412,7 @@ static int irq_handler(struct motion_sensor_t *s, uint32_t *event)
 
 	return EC_SUCCESS;
 }
-#endif  /* ACCEL_LSM6DSM_INT_ENABLE */
+#endif /* ACCEL_LSM6DSM_INT_ENABLE */
 
 /**
  * set_range - set full scale range
@@ -520,10 +512,10 @@ int lsm6dsm_set_data_rate(const struct motion_sensor_t *s, int rate, int rnd)
 		 * less often.
 		 */
 		if (normalized_rate > 0)
-			cal->batch_size = MAX(
-				MAG_CAL_MIN_BATCH_SIZE,
-				(normalized_rate * 1000) /
-					MAG_CAL_MIN_BATCH_WINDOW_US);
+			cal->batch_size =
+				MAX(MAG_CAL_MIN_BATCH_SIZE,
+				    (normalized_rate * 1000) /
+					    MAG_CAL_MIN_BATCH_WINDOW_US);
 		else
 			cal->batch_size = 0;
 		CPRINTS("Batch size: %d", cal->batch_size);
@@ -554,8 +546,8 @@ static int is_data_ready(const struct motion_sensor_t *s, int *ready)
 {
 	int ret, tmp;
 
-	ret = st_raw_read8(s->port, s->i2c_spi_addr_flags,
-			   LSM6DSM_STATUS_REG, &tmp);
+	ret = st_raw_read8(s->port, s->i2c_spi_addr_flags, LSM6DSM_STATUS_REG,
+			   &tmp);
 	if (ret != EC_SUCCESS) {
 		CPRINTS("%s type:0x%X RS Error", s->name, s->type);
 		return ret;
@@ -610,8 +602,8 @@ static int init(struct motion_sensor_t *s)
 	struct stprivate_data *data = s->drv_data;
 	uint8_t ctrl_reg, reg_val = 0;
 
-	ret = st_raw_read8(s->port, s->i2c_spi_addr_flags,
-			   LSM6DSM_WHO_AM_I_REG, &tmp);
+	ret = st_raw_read8(s->port, s->i2c_spi_addr_flags, LSM6DSM_WHO_AM_I_REG,
+			   &tmp);
 	if (ret != EC_SUCCESS)
 		return EC_ERROR_UNKNOWN;
 
@@ -648,8 +640,8 @@ static int init(struct motion_sensor_t *s)
 			goto err_unlock;
 
 		/* Power ON Accel. */
-		ret = st_raw_write8(s->port, s->i2c_spi_addr_flags,
-				    ctrl_reg, reg_val);
+		ret = st_raw_write8(s->port, s->i2c_spi_addr_flags, ctrl_reg,
+				    reg_val);
 		if (ret != EC_SUCCESS)
 			goto err_unlock;
 
@@ -669,12 +661,12 @@ static int init(struct motion_sensor_t *s)
 
 			/* Power ON Accel. */
 			ret = st_raw_write8(s->port, s->i2c_spi_addr_flags,
-					ctrl_reg, reg_val);
+					    ctrl_reg, reg_val);
 			if (ret != EC_SUCCESS)
 				goto err_unlock;
 
 			ret = st_raw_write8(s->port, s->i2c_spi_addr_flags,
-					LSM6DSM_CTRL3_ADDR, LSM6DSM_BOOT);
+					    LSM6DSM_CTRL3_ADDR, LSM6DSM_BOOT);
 			if (ret != EC_SUCCESS)
 				goto err_unlock;
 
@@ -686,7 +678,7 @@ static int init(struct motion_sensor_t *s)
 
 			/* Power OFF Accel. */
 			ret = st_raw_write8(s->port, s->i2c_spi_addr_flags,
-					ctrl_reg, 0);
+					    ctrl_reg, 0);
 			if (ret != EC_SUCCESS)
 				goto err_unlock;
 		}
@@ -695,11 +687,9 @@ static int init(struct motion_sensor_t *s)
 		 * Output data not updated until have been read.
 		 * Prefer interrupt to be active low.
 		 */
-		ret = st_raw_write8(s->port, s->i2c_spi_addr_flags,
-				    LSM6DSM_CTRL3_ADDR,
-				    LSM6DSM_BDU
-				    | LSM6DSM_H_L_ACTIVE
-				    | LSM6DSM_IF_INC);
+		ret = st_raw_write8(
+			s->port, s->i2c_spi_addr_flags, LSM6DSM_CTRL3_ADDR,
+			LSM6DSM_BDU | LSM6DSM_H_L_ACTIVE | LSM6DSM_IF_INC);
 		if (ret != EC_SUCCESS)
 			goto err_unlock;
 
@@ -736,6 +726,17 @@ static int read_temp(const struct motion_sensor_t *s, int *temp)
 	return EC_SUCCESS;
 }
 
+#ifdef CONFIG_BODY_DETECTION
+static int get_rms_noise(const struct motion_sensor_t *s)
+{
+	/*
+	 * RMS | Acceleration RMS noise in normal/low-power mode
+	 * FS = ±4 g | 2.0 mg(RMS)
+	 */
+	return 2000;
+}
+#endif
+
 const struct accelgyro_drv lsm6dsm_drv = {
 	.init = init,
 	.read = read,
@@ -749,4 +750,10 @@ const struct accelgyro_drv lsm6dsm_drv = {
 #ifdef ACCEL_LSM6DSM_INT_ENABLE
 	.irq_handler = irq_handler,
 #endif /* ACCEL_LSM6DSM_INT_ENABLE */
+#ifdef CONFIG_BODY_DETECTION
+	.get_rms_noise = get_rms_noise,
+#endif
+#ifdef CONFIG_GESTURE_HOST_DETECTION
+	.list_activities = st_list_activities,
+#endif
 };