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, 89 insertions, 49 deletions

diff --git a/board/nami/led.c b/board/nami/led.c
index 17af4d5f82..ce9cefed7f 100644
--- a/board/nami/led.c
+++ b/board/nami/led.c
@@ -1,4 +1,4 @@
-/* Copyright 2017 The Chromium OS Authors. All rights reserved.
+/* Copyright 2017 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
@@ -38,8 +38,8 @@
 #include "timer.h"
 #include "util.h"
 
-const enum ec_led_id supported_led_ids[] = {
-		EC_LED_ID_BATTERY_LED, EC_LED_ID_POWER_LED};
+const enum ec_led_id supported_led_ids[] = { EC_LED_ID_BATTERY_LED,
+					     EC_LED_ID_POWER_LED };
 const int supported_led_ids_count = ARRAY_SIZE(supported_led_ids);
 
 enum led_color {
@@ -79,19 +79,19 @@ struct led_pattern {
 	uint8_t pulse;
 };
 
-#define PULSE_NO		0
-#define PULSE(interval)		(BIT(7) | (interval))
-#define BLINK(interval) 	(interval)
-#define ALTERNATE(interval)	(BIT(6) | (interval))
-#define IS_PULSING(pulse)	((pulse) & 0x80)
-#define IS_ALTERNATE(pulse)	((pulse) & 0x40)
-#define PULSE_INTERVAL(pulse)	(((pulse) & 0x3f) * 100 * MSEC)
+#define PULSE_NO 0
+#define PULSE(interval) (BIT(7) | (interval))
+#define BLINK(interval) (interval)
+#define ALTERNATE(interval) (BIT(6) | (interval))
+#define IS_PULSING(pulse) ((pulse)&0x80)
+#define IS_ALTERNATE(pulse) ((pulse)&0x40)
+#define PULSE_INTERVAL(pulse) (((pulse)&0x3f) * 100 * MSEC)
 
 /* 40 msec for nice and smooth transition. */
-#define LED_PULSE_TICK_US	(40 * MSEC)
+#define LED_PULSE_TICK_US (40 * MSEC)
 
 typedef struct led_pattern led_patterns[LED_CHARGE_STATE_COUNT]
-					[LED_POWER_STATE_COUNT];
+				       [LED_POWER_STATE_COUNT];
 
 /*
  * Nami/Vayne - One dual color LED:
@@ -105,11 +105,17 @@ typedef struct led_pattern led_patterns[LED_CHARGE_STATE_COUNT]
  */
 const static led_patterns battery_pattern_0 = {
 	/* discharging: s0, s3, s5 */
-	{{LED_WHITE, PULSE_NO}, {LED_WHITE, PULSE(10)}, {LED_OFF,  PULSE_NO}},
+	{ { LED_WHITE, PULSE_NO },
+	  { LED_WHITE, PULSE(10) },
+	  { LED_OFF, PULSE_NO } },
 	/* charging: s0, s3, s5 */
-	{{LED_AMBER, PULSE_NO}, {LED_AMBER, PULSE_NO}, {LED_AMBER, PULSE_NO}},
+	{ { LED_AMBER, PULSE_NO },
+	  { LED_AMBER, PULSE_NO },
+	  { LED_AMBER, PULSE_NO } },
 	/* full: s0, s3, s5 */
-	{{LED_WHITE, PULSE_NO}, {LED_WHITE, PULSE_NO}, {LED_WHITE, PULSE_NO}},
+	{ { LED_WHITE, PULSE_NO },
+	  { LED_WHITE, PULSE_NO },
+	  { LED_WHITE, PULSE_NO } },
 };
 
 /*
@@ -117,11 +123,15 @@ const static led_patterns battery_pattern_0 = {
  */
 const static led_patterns battery_pattern_1 = {
 	/* discharging: s0, s3, s5 */
-	{{LED_OFF,   PULSE_NO}, {LED_OFF,   PULSE_NO}, {LED_OFF,   PULSE_NO}},
+	{ { LED_OFF, PULSE_NO }, { LED_OFF, PULSE_NO }, { LED_OFF, PULSE_NO } },
 	/* charging: s0, s3, s5 */
-	{{LED_AMBER, PULSE_NO}, {LED_AMBER, PULSE_NO}, {LED_AMBER, PULSE_NO}},
+	{ { LED_AMBER, PULSE_NO },
+	  { LED_AMBER, PULSE_NO },
+	  { LED_AMBER, PULSE_NO } },
 	/* full: s0, s3, s5 */
-	{{LED_WHITE, PULSE_NO}, {LED_WHITE, PULSE_NO}, {LED_WHITE, PULSE_NO}},
+	{ { LED_WHITE, PULSE_NO },
+	  { LED_WHITE, PULSE_NO },
+	  { LED_WHITE, PULSE_NO } },
 };
 
 /*
@@ -132,11 +142,15 @@ const static led_patterns battery_pattern_1 = {
  */
 const static led_patterns battery_pattern_2 = {
 	/* discharging: s0, s3, s5 */
-	{{LED_OFF,   PULSE_NO}, {LED_OFF,   PULSE_NO}, {LED_OFF,   PULSE_NO}},
+	{ { LED_OFF, PULSE_NO }, { LED_OFF, PULSE_NO }, { LED_OFF, PULSE_NO } },
 	/* charging: s0, s3, s5 */
-	{{LED_AMBER, PULSE_NO}, {LED_AMBER, PULSE_NO}, {LED_AMBER, PULSE_NO}},
+	{ { LED_AMBER, PULSE_NO },
+	  { LED_AMBER, PULSE_NO },
+	  { LED_AMBER, PULSE_NO } },
 	/* full: s0, s3, s5 */
-	{{LED_WHITE, PULSE_NO}, {LED_WHITE, PULSE_NO}, {LED_WHITE, PULSE_NO}},
+	{ { LED_WHITE, PULSE_NO },
+	  { LED_WHITE, PULSE_NO },
+	  { LED_WHITE, PULSE_NO } },
 };
 
 /*
@@ -144,11 +158,17 @@ const static led_patterns battery_pattern_2 = {
  */
 const static led_patterns power_pattern_1 = {
 	/* discharging: s0, s3, s5 */
-	{{LED_WHITE, PULSE_NO}, {LED_WHITE, BLINK(10)}, {LED_OFF, PULSE_NO}},
+	{ { LED_WHITE, PULSE_NO },
+	  { LED_WHITE, BLINK(10) },
+	  { LED_OFF, PULSE_NO } },
 	/* charging: s0, s3, s5 */
-	{{LED_WHITE, PULSE_NO}, {LED_WHITE, BLINK(10)}, {LED_OFF, PULSE_NO}},
+	{ { LED_WHITE, PULSE_NO },
+	  { LED_WHITE, BLINK(10) },
+	  { LED_OFF, PULSE_NO } },
 	/* full: s0, s3, s5 */
-	{{LED_WHITE, PULSE_NO}, {LED_WHITE, BLINK(10)}, {LED_OFF, PULSE_NO}},
+	{ { LED_WHITE, PULSE_NO },
+	  { LED_WHITE, BLINK(10) },
+	  { LED_OFF, PULSE_NO } },
 };
 
 /*
@@ -159,11 +179,17 @@ const static led_patterns power_pattern_1 = {
  */
 const static led_patterns power_pattern_2 = {
 	/* discharging: s0, s3, s5 */
-	{{LED_WHITE, 0}, {LED_WHITE, ALTERNATE(BLINK(10))}, {LED_OFF, 0}},
+	{ { LED_WHITE, 0 },
+	  { LED_WHITE, ALTERNATE(BLINK(10)) },
+	  { LED_OFF, 0 } },
 	/* charging: s0, s3, s5 */
-	{{LED_WHITE, 0}, {LED_WHITE, ALTERNATE(BLINK(10))}, {LED_OFF, 0}},
+	{ { LED_WHITE, 0 },
+	  { LED_WHITE, ALTERNATE(BLINK(10)) },
+	  { LED_OFF, 0 } },
 	/* full: s0, s3, s5 */
-	{{LED_WHITE, 0}, {LED_WHITE, ALTERNATE(BLINK(10))}, {LED_OFF, 0}},
+	{ { LED_WHITE, 0 },
+	  { LED_WHITE, ALTERNATE(BLINK(10)) },
+	  { LED_OFF, 0 } },
 };
 
 /*
@@ -178,30 +204,42 @@ const static led_patterns power_pattern_2 = {
  */
 const static led_patterns battery_pattern_3 = {
 	/* discharging: s0, s3, s5 */
-	{{LED_WHITE, 0}, {LED_AMBER, ALTERNATE(BLINK(10))}, {LED_OFF, 0}},
+	{ { LED_WHITE, 0 },
+	  { LED_AMBER, ALTERNATE(BLINK(10)) },
+	  { LED_OFF, 0 } },
 	/* charging: s0, s3, s5 */
-	{{LED_AMBER, PULSE_NO}, {LED_AMBER, PULSE_NO}, {LED_AMBER,  PULSE_NO}},
+	{ { LED_AMBER, PULSE_NO },
+	  { LED_AMBER, PULSE_NO },
+	  { LED_AMBER, PULSE_NO } },
 	/* full: s0, s3, s5 */
-	{{LED_WHITE, PULSE_NO}, {LED_WHITE, PULSE_NO}, {LED_WHITE,  PULSE_NO}},
+	{ { LED_WHITE, PULSE_NO },
+	  { LED_WHITE, PULSE_NO },
+	  { LED_WHITE, PULSE_NO } },
 };
 
 const static led_patterns battery_pattern_4 = {
 	/* discharging: s0, s3, s5 */
-	{{LED_WHITE, PULSE_NO}, {LED_WHITE, BLINK(10)}, {LED_OFF, PULSE_NO}},
+	{ { LED_WHITE, PULSE_NO },
+	  { LED_WHITE, BLINK(10) },
+	  { LED_OFF, PULSE_NO } },
 	/* charging: s0, s3, s5 */
-	{{LED_AMBER, PULSE_NO}, {LED_AMBER, PULSE_NO},  {LED_AMBER, PULSE_NO}},
+	{ { LED_AMBER, PULSE_NO },
+	  { LED_AMBER, PULSE_NO },
+	  { LED_AMBER, PULSE_NO } },
 	/* full: s0, s3, s5 */
-	{{LED_WHITE, PULSE_NO}, {LED_WHITE, PULSE_NO},  {LED_WHITE, PULSE_NO}},
+	{ { LED_WHITE, PULSE_NO },
+	  { LED_WHITE, PULSE_NO },
+	  { LED_WHITE, PULSE_NO } },
 };
 
 /* Patterns for battery LED and power LED. Initialized at run-time. */
 static led_patterns const *patterns[2];
 /* Pattern for battery error. Only blinking battery LED is supported. */
-static struct led_pattern battery_error = {LED_AMBER, BLINK(10)};
+static struct led_pattern battery_error = { LED_AMBER, BLINK(10) };
 /* Pattern for low state of charge. Only battery LED is supported. */
-static struct led_pattern low_battery = {LED_WHITE, BLINK(10)};
+static struct led_pattern low_battery = { LED_WHITE, BLINK(10) };
 /* Pattern for factory mode. Blinking 2-color battery LED. */
-static struct led_pattern battery_factory = {LED_FACTORY, BLINK(20)};
+static struct led_pattern battery_factory = { LED_FACTORY, BLINK(20) };
 static int low_battery_soc;
 static void led_charge_hook(void);
 static enum led_power_state power_state;
@@ -222,7 +260,7 @@ static void led_init(void)
 			patterns[1] = &power_pattern_1;
 		}
 		battery_error.pulse = BLINK(5);
-		low_battery_soc = 100;  /* 10.0% */
+		low_battery_soc = 100; /* 10.0% */
 		break;
 	case PROJECT_PANTHEON:
 		patterns[0] = &battery_pattern_2;
@@ -452,7 +490,7 @@ void config_led(enum ec_led_id id, enum led_charge_state charge)
 
 	pattern = patterns[id];
 	if (!pattern)
-		return;	/* This LED isn't present */
+		return; /* This LED isn't present */
 
 	start_tick(id, &(*pattern)[charge][power_state]);
 }
@@ -499,14 +537,15 @@ static void call_handler(void)
 		led_alert(1);
 		break;
 	case PWR_STATE_IDLE:
-		/* External power connected in IDLE. This is also used to show
-		 * factory mode when 'ectool chargecontrol idle' is run during
-		 * factory process. */
-		if (charge_get_flags() & CHARGE_FLAG_FORCE_IDLE)
-			led_factory(1);
+		/* External power connected in IDLE. */
 		break;
-	default:
-		;
+	case PWR_STATE_FORCED_IDLE:
+		/* This is used to show factory mode when
+		 * 'ectool chargecontrol idle' is run during factory process.
+		 */
+		led_factory(1);
+		break;
+	default:;
 	}
 }
 
@@ -548,7 +587,7 @@ static void print_config(enum ec_led_id id)
 	ccprintf("  Interval:%d\n", tick[id].interval);
 }
 
-static int command_led(int argc, char **argv)
+static int command_led(int argc, const char **argv)
 {
 	enum ec_led_id id = EC_LED_ID_BATTERY_LED;
 	static int alert = 0;
@@ -587,9 +626,10 @@ static int command_led(int argc, char **argv)
 	}
 	return EC_SUCCESS;
 }
-DECLARE_CONSOLE_COMMAND(led, command_led,
-			"[debug|red|green|amber|off|alert|s0|s3|s5|conf|factory]",
-			"Turn on/off LED.");
+DECLARE_CONSOLE_COMMAND(
+	led, command_led,
+	"[debug|red|green|amber|off|alert|s0|s3|s5|conf|factory]",
+	"Turn on/off LED.");
 
 void led_get_brightness_range(enum ec_led_id led_id, uint8_t *brightness_range)
 {