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, 43 insertions, 63 deletions

diff --git a/zephyr/subsys/ap_pwrseq/signal_adc.c b/zephyr/subsys/ap_pwrseq/signal_adc.c
index 4b8f0e0366..c23cd0d30a 100644
--- a/zephyr/subsys/ap_pwrseq/signal_adc.c
+++ b/zephyr/subsys/ap_pwrseq/signal_adc.c
@@ -1,4 +1,4 @@
-/* Copyright 2022 The Chromium OS Authors. All rights reserved.
+/* 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.
  */
@@ -11,7 +11,7 @@
 #include <power_signals.h>
 #include <signal_adc.h>
 
-#define MY_COMPAT	intel_ap_pwrseq_adc
+#define MY_COMPAT intel_ap_pwrseq_adc
 
 #if HAS_ADC_SIGNALS
 
@@ -26,74 +26,59 @@ struct adc_config {
 	enum power_signal signal;
 };
 
-#define	ADC_HIGH_DEV(id)	DEVICE_DT_GET(DT_IO_CHANNELS_CTLR(id))
+#define ADC_HIGH_DEV(id) DEVICE_DT_GET(DT_IO_CHANNELS_CTLR(id))
 
-#define	ADC_HIGH_CHAN(id)	DT_IO_CHANNELS_INPUT(id)
+#define ADC_HIGH_CHAN(id) DT_IO_CHANNELS_INPUT(id)
 
-#define	ADC_THRESH(id)	DT_PROP(id, threshold_mv)
+#define ADC_THRESH(id) DT_PROP(id, threshold_mv)
 
-#define INIT_ADC_CONFIG(id)	\
-{									\
-	.dev_trig_high = DEVICE_DT_GET(DT_PHANDLE(id, trigger_high)),	\
-	.dev_trig_low = DEVICE_DT_GET(DT_PHANDLE(id, trigger_low)),	\
-	.adc_dev = ADC_HIGH_DEV(DT_PHANDLE(id, trigger_high)),		\
-	.adc_ch = ADC_HIGH_CHAN(DT_PHANDLE(id, trigger_high)),	\
-	.threshold = ADC_THRESH(DT_PHANDLE(id, trigger_high)),		\
-	.signal = PWR_SIGNAL_ENUM(id),					\
-},
+#define INIT_ADC_CONFIG(id)                                                   \
+	{                                                                     \
+		.dev_trig_high = DEVICE_DT_GET(DT_PHANDLE(id, trigger_high)), \
+		.dev_trig_low = DEVICE_DT_GET(DT_PHANDLE(id, trigger_low)),   \
+		.adc_dev = ADC_HIGH_DEV(DT_PHANDLE(id, trigger_high)),        \
+		.adc_ch = ADC_HIGH_CHAN(DT_PHANDLE(id, trigger_high)),        \
+		.threshold = ADC_THRESH(DT_PHANDLE(id, trigger_high)),        \
+		.signal = PWR_SIGNAL_ENUM(id),                                \
+	},
 
-static const struct adc_config config[] = {
-DT_FOREACH_STATUS_OKAY(MY_COMPAT, INIT_ADC_CONFIG)
-};
+static const struct adc_config config[] = { DT_FOREACH_STATUS_OKAY(
+	MY_COMPAT, INIT_ADC_CONFIG) };
 
 /*
  * Bit allocations for atomic state
  */
-enum {
-	ADC_BIT_VALUE = 0,
-	ADC_BIT_LOW_ENABLED = 1,
-	ADC_BIT_HIGH_ENABLED = 2
-};
+enum { ADC_BIT_VALUE = 0, ADC_BIT_LOW_ENABLED = 1, ADC_BIT_HIGH_ENABLED = 2 };
 
 atomic_t adc_state[ARRAY_SIZE(config)];
 
-static void set_trigger(const struct device *dev,
-			atomic_t *state,
-			int bit,
+static void set_trigger(const struct device *dev, atomic_t *state, int bit,
 			bool enable)
 {
 	/*
 	 * Only enable or disable if the trigger is not
 	 * already enabled or disabled.
 	 */
-	if (enable
-		? !atomic_test_and_set_bit(state, bit)
-		: atomic_test_and_clear_bit(state, bit)) {
+	if (enable ? !atomic_test_and_set_bit(state, bit) :
+		     atomic_test_and_clear_bit(state, bit)) {
 		struct sensor_value val;
 
 		val.val1 = enable;
-		sensor_attr_set(dev,
-				SENSOR_CHAN_VOLTAGE,
-				SENSOR_ATTR_ALERT,
+		sensor_attr_set(dev, SENSOR_CHAN_VOLTAGE, SENSOR_ATTR_ALERT,
 				&val);
 	}
 }
 
 static void set_low_trigger(enum pwr_sig_adc adc, bool enable)
 {
-	set_trigger(config[adc].dev_trig_low,
-		    &adc_state[adc],
-		    ADC_BIT_LOW_ENABLED,
-		    enable);
-
+	set_trigger(config[adc].dev_trig_low, &adc_state[adc],
+		    ADC_BIT_LOW_ENABLED, enable);
 }
 
 static void set_high_trigger(enum pwr_sig_adc adc, bool enable)
 {
-	set_trigger(config[adc].dev_trig_high,
-		    &adc_state[adc],
-		    ADC_BIT_HIGH_ENABLED,
-		    enable);
+	set_trigger(config[adc].dev_trig_high, &adc_state[adc],
+		    ADC_BIT_HIGH_ENABLED, enable);
 }
 
 static void trigger_high(enum pwr_sig_adc adc)
@@ -156,34 +141,30 @@ int power_signal_adc_disable(enum pwr_sig_adc adc)
 
 #define PWR_ADC_ENUM(id) TAG_ADC(PWR_SIG_TAG_ADC, PWR_SIGNAL_ENUM(id))
 
-#define ADC_CB(id, lev)	cb_##lev##_##id
+#define ADC_CB(id, lev) cb_##lev##_##id
 
-#define ADC_CB_DEFINE(id, lev)					\
-static void ADC_CB(id, lev)(const struct device *dev,		\
-		       const struct sensor_trigger *trigger)	\
-{								\
-	trigger_##lev(PWR_ADC_ENUM(id));			\
-}
+#define ADC_CB_DEFINE(id, lev)                                            \
+	static void ADC_CB(id, lev)(const struct device *dev,             \
+				    const struct sensor_trigger *trigger) \
+	{                                                                 \
+		trigger_##lev(PWR_ADC_ENUM(id));                          \
+	}
 
 DT_FOREACH_STATUS_OKAY_VARGS(MY_COMPAT, ADC_CB_DEFINE, high)
 DT_FOREACH_STATUS_OKAY_VARGS(MY_COMPAT, ADC_CB_DEFINE, low)
 
-#define ADC_CB_COMMA(id, lev)	ADC_CB(id, lev),
+#define ADC_CB_COMMA(id, lev) ADC_CB(id, lev),
 
 void power_signal_adc_init(void)
 {
-	struct sensor_trigger trig = {
-		.type = SENSOR_TRIG_THRESHOLD,
-		.chan = SENSOR_CHAN_VOLTAGE
-	};
-	sensor_trigger_handler_t low_cb[] = {
-		DT_FOREACH_STATUS_OKAY_VARGS(MY_COMPAT, ADC_CB_COMMA, low)
-	};
-	sensor_trigger_handler_t high_cb[] = {
-		DT_FOREACH_STATUS_OKAY_VARGS(MY_COMPAT, ADC_CB_COMMA, high)
-	};
+	struct sensor_trigger trig = { .type = SENSOR_TRIG_THRESHOLD,
+				       .chan = SENSOR_CHAN_VOLTAGE };
+	sensor_trigger_handler_t low_cb[] = { DT_FOREACH_STATUS_OKAY_VARGS(
+		MY_COMPAT, ADC_CB_COMMA, low) };
+	sensor_trigger_handler_t high_cb[] = { DT_FOREACH_STATUS_OKAY_VARGS(
+		MY_COMPAT, ADC_CB_COMMA, high) };
 	int i, rv;
-	int32_t val;
+	int32_t val = 0;
 
 	for (i = 0; i < ARRAY_SIZE(low_cb); i++) {
 		/*
@@ -202,11 +183,10 @@ void power_signal_adc_init(void)
 
 		rv = adc_read(dev, &seq);
 		if (rv) {
-			LOG_ERR("ADC %s:%d initial read failed",
-				dev->name, config[i].adc_ch);
+			LOG_ERR("ADC %s:%d initial read failed", dev->name,
+				config[i].adc_ch);
 		} else {
-			adc_raw_to_millivolts(adc_ref_internal(dev),
-					      ADC_GAIN_1,
+			adc_raw_to_millivolts(adc_ref_internal(dev), ADC_GAIN_1,
 					      CONFIG_PLATFORM_EC_ADC_RESOLUTION,
 					      &val);
 			if (val >= config[i].threshold) {