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, 41 insertions, 46 deletions

diff --git a/zephyr/drivers/cros_rtc/nxp_rtc_pcf85063a.c b/zephyr/drivers/cros_rtc/nxp_rtc_pcf85063a.c
index e7821c1dac..c5580eaeef 100644
--- a/zephyr/drivers/cros_rtc/nxp_rtc_pcf85063a.c
+++ b/zephyr/drivers/cros_rtc/nxp_rtc_pcf85063a.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 The Chromium OS Authors. All rights reserved.
+/* Copyright 2021 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -58,12 +58,12 @@ static int pcf85063a_read_time_regs(const struct device *dev, bool is_alarm)
 		num_reg = NUM_TIMER_REGS;
 	}
 
-	return i2c_burst_read(config->bus,
-		config->i2c_addr_flags, start_reg, data->time_reg, num_reg);
+	return i2c_burst_read(config->bus, config->i2c_addr_flags, start_reg,
+			      data->time_reg, num_reg);
 }
 
-static int pcf85063a_read_reg(const struct device *dev,
-						uint8_t reg, uint8_t *val)
+static int pcf85063a_read_reg(const struct device *dev, uint8_t reg,
+			      uint8_t *val)
 {
 	const struct nxp_rtc_pcf85063a_config *const config = DRV_CONFIG(dev);
 
@@ -95,13 +95,12 @@ static int pcf85063a_write_time_regs(const struct device *dev, bool is_alarm)
 		tx_buf[i] = data->time_reg[i];
 	}
 
-	return i2c_burst_write(config->bus,
-			config->i2c_addr_flags, start_reg, tx_buf, num_reg);
+	return i2c_burst_write(config->bus, config->i2c_addr_flags, start_reg,
+			       tx_buf, num_reg);
 }
 
-
-static int pcf85063a_write_reg(const struct device *dev,
-						uint8_t reg, uint8_t val)
+static int pcf85063a_write_reg(const struct device *dev, uint8_t reg,
+			       uint8_t val)
 {
 	const struct nxp_rtc_pcf85063a_config *const config = DRV_CONFIG(dev);
 	uint8_t tx_buf[2];
@@ -109,8 +108,8 @@ static int pcf85063a_write_reg(const struct device *dev,
 	tx_buf[0] = reg;
 	tx_buf[1] = val;
 
-	return i2c_write(config->bus,
-		tx_buf, sizeof(tx_buf), config->i2c_addr_flags);
+	return i2c_write(config->bus, tx_buf, sizeof(tx_buf),
+			 config->i2c_addr_flags);
 }
 
 /*
@@ -138,7 +137,7 @@ static uint8_t dec_to_bcd(uint32_t val, enum bcd_mask mask)
 }
 
 static int nxp_rtc_pcf85063a_read_seconds(const struct device *dev,
-					uint32_t *value, bool is_alarm)
+					  uint32_t *value, bool is_alarm)
 {
 	struct nxp_rtc_pcf85063a_data *data = DRV_DATA(dev);
 	struct calendar_date time;
@@ -152,31 +151,30 @@ static int nxp_rtc_pcf85063a_read_seconds(const struct device *dev,
 
 	if (is_alarm) {
 		*value = (bcd_to_dec(data->time_reg[DAYS], DAYS_MASK) *
-				SECS_PER_DAY) +
-			(bcd_to_dec(data->time_reg[HOURS], HOURS24_MASK) *
-				SECS_PER_HOUR) +
-			(bcd_to_dec(data->time_reg[MINUTES], MINUTES_MASK) *
-				SECS_PER_MINUTE) +
-			bcd_to_dec(data->time_reg[SECONDS], SECONDS_MASK);
+			  SECS_PER_DAY) +
+			 (bcd_to_dec(data->time_reg[HOURS], HOURS24_MASK) *
+			  SECS_PER_HOUR) +
+			 (bcd_to_dec(data->time_reg[MINUTES], MINUTES_MASK) *
+			  SECS_PER_MINUTE) +
+			 bcd_to_dec(data->time_reg[SECONDS], SECONDS_MASK);
 	} else {
 		time.year = bcd_to_dec(data->time_reg[YEARS], YEARS_MASK);
-		time.month =
-			bcd_to_dec(data->time_reg[MONTHS], MONTHS_MASK);
+		time.month = bcd_to_dec(data->time_reg[MONTHS], MONTHS_MASK);
 		time.day = bcd_to_dec(data->time_reg[DAYS], DAYS_MASK);
 
 		*value = date_to_sec(time) - SECS_TILL_YEAR_2K +
-			(bcd_to_dec(data->time_reg[HOURS], HOURS24_MASK) *
-				SECS_PER_HOUR) +
-			(bcd_to_dec(data->time_reg[MINUTES], MINUTES_MASK) *
-				SECS_PER_MINUTE) +
-			bcd_to_dec(data->time_reg[SECONDS], SECONDS_MASK);
+			 (bcd_to_dec(data->time_reg[HOURS], HOURS24_MASK) *
+			  SECS_PER_HOUR) +
+			 (bcd_to_dec(data->time_reg[MINUTES], MINUTES_MASK) *
+			  SECS_PER_MINUTE) +
+			 bcd_to_dec(data->time_reg[SECONDS], SECONDS_MASK);
 	}
 
 	return ret;
 }
 
 static int nxp_rtc_pcf85063a_write_seconds(const struct device *dev,
-				uint32_t value, bool is_alarm)
+					   uint32_t value, bool is_alarm)
 {
 	struct nxp_rtc_pcf85063a_data *data = DRV_DATA(dev);
 	struct calendar_date time;
@@ -186,8 +184,7 @@ static int nxp_rtc_pcf85063a_write_seconds(const struct device *dev,
 
 	if (!is_alarm) {
 		data->time_reg[YEARS] = dec_to_bcd(time.year, YEARS_MASK);
-		data->time_reg[MONTHS] =
-				dec_to_bcd(time.month, MONTHS_MASK);
+		data->time_reg[MONTHS] = dec_to_bcd(time.month, MONTHS_MASK);
 	}
 
 	data->time_reg[DAYS] = dec_to_bcd(time.day, DAYS_MASK);
@@ -223,7 +220,7 @@ static int nxp_rtc_pcf85063a_write_seconds(const struct device *dev,
 }
 
 static int nxp_rtc_pcf85063a_configure(const struct device *dev,
-				   cros_rtc_alarm_callback_t callback)
+				       cros_rtc_alarm_callback_t callback)
 {
 	struct nxp_rtc_pcf85063a_data *data = DRV_DATA(dev);
 
@@ -237,7 +234,7 @@ static int nxp_rtc_pcf85063a_configure(const struct device *dev,
 }
 
 static int nxp_rtc_pcf85063a_get_value(const struct device *dev,
-							uint32_t *value)
+				       uint32_t *value)
 {
 	return nxp_rtc_pcf85063a_read_seconds(dev, value, false);
 }
@@ -248,7 +245,8 @@ static int nxp_rtc_pcf85063a_set_value(const struct device *dev, uint32_t value)
 }
 
 static int nxp_rtc_pcf85063a_get_alarm(const struct device *dev,
-			uint32_t *seconds, uint32_t *microseconds)
+				       uint32_t *seconds,
+				       uint32_t *microseconds)
 {
 	*microseconds = 0;
 	return nxp_rtc_pcf85063a_read_seconds(dev, seconds, true);
@@ -275,7 +273,7 @@ static int nxp_rtc_pcf85063a_reset_alarm(const struct device *dev)
 }
 
 static int nxp_rtc_pcf85063a_set_alarm(const struct device *dev,
-			uint32_t seconds, uint32_t microseconds)
+				       uint32_t seconds, uint32_t microseconds)
 {
 	int ret;
 
@@ -297,7 +295,7 @@ static int nxp_rtc_pcf85063a_set_alarm(const struct device *dev,
 }
 
 static void nxp_pcf85063a_isr(const struct device *port,
-				struct gpio_callback *cb, uint32_t pin)
+			      struct gpio_callback *cb, uint32_t pin)
 {
 	struct nxp_rtc_pcf85063a_data *data =
 		CONTAINER_OF(cb, struct nxp_rtc_pcf85063a_data, gpio_cb);
@@ -400,8 +398,8 @@ static int nxp_rtc_pcf85063a_init(const struct device *dev)
 		return ret;
 	}
 
-	gpio_init_callback(&data->gpio_cb,
-			nxp_pcf85063a_isr, BIT(config->gpio_alert.pin));
+	gpio_init_callback(&data->gpio_cb, nxp_pcf85063a_isr,
+			   BIT(config->gpio_alert.pin));
 
 	ret = gpio_add_callback(config->gpio_alert.port, &data->gpio_cb);
 
@@ -416,8 +414,7 @@ static int nxp_rtc_pcf85063a_init(const struct device *dev)
 					       GPIO_INT_EDGE_FALLING);
 }
 
-#define PCF85063A_INT_GPIOS \
-	DT_PHANDLE(DT_NODELABEL(pcf85063a), int_pin)
+#define PCF85063A_INT_GPIOS DT_PHANDLE(DT_NODELABEL(pcf85063a), int_pin)
 
 /*
  * dt_flags is a uint8_t type.  However, for platform/ec
@@ -426,19 +423,17 @@ static int nxp_rtc_pcf85063a_init(const struct device *dev)
  * Cast back to a gpio_dt_flags to compile, discarding the bits
  * that are not supported by the Zephyr GPIO API.
  */
-#define CROS_EC_GPIO_DT_SPEC_GET(node_id, prop)                     \
-	{                                                           \
-		.port = DEVICE_DT_GET(DT_GPIO_CTLR(node_id, prop)), \
-		.pin = DT_GPIO_PIN(node_id, prop),                  \
-		.dt_flags =                                         \
-		(gpio_dt_flags_t)DT_GPIO_FLAGS(node_id, prop),      \
+#define CROS_EC_GPIO_DT_SPEC_GET(node_id, prop)                            \
+	{                                                                  \
+		.port = DEVICE_DT_GET(DT_GPIO_CTLR(node_id, prop)),        \
+		.pin = DT_GPIO_PIN(node_id, prop),                         \
+		.dt_flags = (gpio_dt_flags_t)DT_GPIO_FLAGS(node_id, prop), \
 	}
 
 static const struct nxp_rtc_pcf85063a_config nxp_rtc_pcf85063a_cfg_0 = {
 	.bus = DEVICE_DT_GET(DT_INST_BUS(0)),
 	.i2c_addr_flags = DT_INST_REG_ADDR(0),
-	.gpio_alert =
-		CROS_EC_GPIO_DT_SPEC_GET(PCF85063A_INT_GPIOS, gpios)
+	.gpio_alert = CROS_EC_GPIO_DT_SPEC_GET(PCF85063A_INT_GPIOS, gpios)
 };
 
 static struct nxp_rtc_pcf85063a_data nxp_rtc_pcf85063a_data_0;