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

diff --git a/board/dojo/led.c b/board/dojo/led.c
index 38d0e4904b..4b2b379a1b 100644
--- a/board/dojo/led.c
+++ b/board/dojo/led.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.
  */
@@ -38,7 +38,7 @@ enum led_color {
 	LED_OFF = 0,
 	LED_AMBER,
 	LED_WHITE,
-	LED_COLOR_COUNT  /* Number of colors, not a color itself */
+	LED_COLOR_COUNT /* Number of colors, not a color itself */
 };
 
 enum led_port {
@@ -49,15 +49,15 @@ enum led_port {
 static void battery_led_set_color(enum led_port port, enum led_color color)
 {
 	pwm_enable(port ? PWM_CH_LED_C1_AMBER : PWM_CH_LED_C0_AMBER,
-	           (color == LED_AMBER) ? BAT_LED_ON : BAT_LED_OFF);
+		   (color == LED_AMBER) ? BAT_LED_ON : BAT_LED_OFF);
 	pwm_enable(port ? PWM_CH_LED_C1_WHITE : PWM_CH_LED_C0_WHITE,
-	           (color == LED_WHITE) ? BAT_LED_ON : BAT_LED_OFF);
+		   (color == LED_WHITE) ? BAT_LED_ON : BAT_LED_OFF);
 }
 
 static void power_led_set_color(enum led_color color)
 {
 	pwm_enable(PWM_CH_LED_PWR,
-	           (color == LED_WHITE) ? PWR_LED_ON : PWR_LED_OFF);
+		   (color == LED_WHITE) ? PWR_LED_ON : PWR_LED_OFF);
 }
 
 void led_get_brightness_range(enum ec_led_id led_id, uint8_t *brightness_range)
@@ -83,17 +83,17 @@ void led_get_brightness_range(enum ec_led_id led_id, uint8_t *brightness_range)
 static int led_set_color(enum ec_led_id led_id, enum led_color color)
 {
 	switch (led_id) {
-		case EC_LED_ID_RIGHT_LED:
-			battery_led_set_color(RIGHT_PORT, color);
-			break;
-		case EC_LED_ID_LEFT_LED:
-			battery_led_set_color(LEFT_PORT, color);
-			break;
-		case EC_LED_ID_POWER_LED:
-			power_led_set_color(color);
-			break;
-		default:
-			return EC_ERROR_UNKNOWN;
+	case EC_LED_ID_RIGHT_LED:
+		battery_led_set_color(RIGHT_PORT, color);
+		break;
+	case EC_LED_ID_LEFT_LED:
+		battery_led_set_color(LEFT_PORT, color);
+		break;
+	case EC_LED_ID_POWER_LED:
+		power_led_set_color(color);
+		break;
+	default:
+		return EC_ERROR_UNKNOWN;
 	}
 
 	return EC_SUCCESS;
@@ -121,17 +121,16 @@ static void set_active_port_color(enum led_color color)
 
 	if (led_auto_control_is_enabled(EC_LED_ID_RIGHT_LED))
 		battery_led_set_color(RIGHT_PORT,
-		                      (port == RIGHT_PORT) ? color : LED_OFF);
+				      (port == RIGHT_PORT) ? color : LED_OFF);
 	if (led_auto_control_is_enabled(EC_LED_ID_LEFT_LED))
 		battery_led_set_color(LEFT_PORT,
-		                      (port == LEFT_PORT) ? color : LED_OFF);
+				      (port == LEFT_PORT) ? color : LED_OFF);
 }
 
 static void board_led_set_battery(void)
 {
 	static int battery_ticks;
 	int battery_led_blink_cycle;
-	uint32_t chflags = charge_get_flags();
 
 	battery_ticks++;
 
@@ -142,18 +141,20 @@ static void board_led_set_battery(void)
 		break;
 	case PWR_STATE_DISCHARGE:
 		if (charge_get_percent() <= 10) {
-			battery_led_blink_cycle = battery_ticks %
-			                          (2 * TIMES_TICK_ONE_SEC);
+			battery_led_blink_cycle =
+				battery_ticks % (2 * TIMES_TICK_ONE_SEC);
 			if (led_auto_control_is_enabled(EC_LED_ID_RIGHT_LED))
 				battery_led_set_color(RIGHT_PORT,
-				                      (battery_led_blink_cycle <
-				                      TIMES_TICK_ONE_SEC) ?
-				                      LED_AMBER : LED_OFF);
+						      (battery_led_blink_cycle <
+						       TIMES_TICK_ONE_SEC) ?
+							      LED_AMBER :
+							      LED_OFF);
 			if (led_auto_control_is_enabled(EC_LED_ID_LEFT_LED))
 				battery_led_set_color(LEFT_PORT,
-				                      (battery_led_blink_cycle <
-				                      TIMES_TICK_ONE_SEC) ?
-				                      LED_AMBER : LED_OFF);
+						      (battery_led_blink_cycle <
+						       TIMES_TICK_ONE_SEC) ?
+							      LED_AMBER :
+							      LED_OFF);
 		} else {
 			if (led_auto_control_is_enabled(EC_LED_ID_RIGHT_LED))
 				battery_led_set_color(RIGHT_PORT, LED_OFF);
@@ -165,27 +166,30 @@ static void board_led_set_battery(void)
 		battery_led_blink_cycle = battery_ticks % TIMES_TICK_ONE_SEC;
 		if (led_auto_control_is_enabled(EC_LED_ID_RIGHT_LED))
 			battery_led_set_color(RIGHT_PORT,
-			                      (battery_led_blink_cycle <
-			                      TIMES_TICK_HALF_SEC) ?
-			                      LED_AMBER : LED_OFF);
+					      (battery_led_blink_cycle <
+					       TIMES_TICK_HALF_SEC) ?
+						      LED_AMBER :
+						      LED_OFF);
 		if (led_auto_control_is_enabled(EC_LED_ID_LEFT_LED))
 			battery_led_set_color(LEFT_PORT,
-			                      (battery_led_blink_cycle <
-			                      TIMES_TICK_HALF_SEC) ?
-			                      LED_AMBER : LED_OFF);
+					      (battery_led_blink_cycle <
+					       TIMES_TICK_HALF_SEC) ?
+						      LED_AMBER :
+						      LED_OFF);
 		break;
 	case PWR_STATE_CHARGE_NEAR_FULL:
 		set_active_port_color(LED_WHITE);
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE) {
-			battery_led_blink_cycle = battery_ticks %
-			                          (2 * TIMES_TICK_ONE_SEC);
-			set_active_port_color((battery_led_blink_cycle <
-			                      TIMES_TICK_ONE_SEC) ?
-			                      LED_AMBER : LED_OFF);
-		} else
-			set_active_port_color(LED_WHITE);
+		set_active_port_color(LED_WHITE);
+		break;
+	case PWR_STATE_FORCED_IDLE:
+		battery_led_blink_cycle =
+			battery_ticks % (2 * TIMES_TICK_ONE_SEC);
+		set_active_port_color(
+			(battery_led_blink_cycle < TIMES_TICK_ONE_SEC) ?
+				LED_AMBER :
+				LED_OFF);
 		break;
 	default:
 		/* Other states don't alter LED behavior */
@@ -205,7 +209,8 @@ static void board_led_set_power(void)
 	} else if (chipset_in_state(CHIPSET_STATE_ANY_SUSPEND)) {
 		power_led_blink_cycle = power_ticks % (2 * TIMES_TICK_ONE_SEC);
 		power_led_set_color(power_led_blink_cycle < TIMES_TICK_ONE_SEC ?
-		                    LED_WHITE : LED_OFF);
+					    LED_WHITE :
+					    LED_OFF);
 	} else {
 		power_led_set_color(LED_OFF);
 	}
@@ -214,7 +219,7 @@ static void board_led_set_power(void)
 /* Called by hook task every TICK */
 static void led_tick(void)
 {
-	if(led_auto_control_is_enabled(EC_LED_ID_POWER_LED))
+	if (led_auto_control_is_enabled(EC_LED_ID_POWER_LED))
 		board_led_set_power();
 
 	board_led_set_battery();