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, 54 deletions

diff --git a/board/nipperkin/thermal.c b/board/nipperkin/thermal.c
index eecf23a9e3..117a6d08fa 100644
--- a/board/nipperkin/thermal.c
+++ b/board/nipperkin/thermal.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.
  */
@@ -18,7 +18,7 @@
 
 /* Console output macros */
 #define CPUTS(outstr) cputs(CC_THERMAL, outstr)
-#define CPRINTS(format, args...) cprints(CC_THERMAL, format, ## args)
+#define CPRINTS(format, args...) cprints(CC_THERMAL, format, ##args)
 
 const struct fan_conf fan_conf_0 = {
 	.flags = FAN_USE_RPM_MODE,
@@ -59,52 +59,51 @@ struct fan_step {
 static const struct fan_step fan_step_table[] = {
 	{
 		/* level 0 */
-		.on = {51, 0, 44, -1, -1, -1},
-		.off = {99, 99, 99, -1, -1, -1},
-		.rpm = {0},
+		.on = { 51, 0, 44, -1, -1, -1 },
+		.off = { 99, 99, 99, -1, -1, -1 },
+		.rpm = { 0 },
 	},
 	{
 		/* level 1 */
-		.on = {52, 0, 47, -1, -1, -1},
-		.off = {50, 99, 43, -1, -1, -1},
-		.rpm = {3000},
+		.on = { 52, 0, 47, -1, -1, -1 },
+		.off = { 50, 99, 43, -1, -1, -1 },
+		.rpm = { 3000 },
 	},
 	{
 		/* level 2 */
-		.on = {53, 0, 49, -1, -1, -1},
-		.off = {51, 99, 45, -1, -1, -1},
-		.rpm = {3400},
+		.on = { 53, 0, 49, -1, -1, -1 },
+		.off = { 51, 99, 45, -1, -1, -1 },
+		.rpm = { 3400 },
 	},
 	{
 		/* level 3 */
-		.on = {54, 0, 51, -1, -1, -1},
-		.off = {52, 99, 47, -1, -1, -1},
-		.rpm = {3800},
+		.on = { 54, 0, 51, -1, -1, -1 },
+		.off = { 52, 99, 47, -1, -1, -1 },
+		.rpm = { 3800 },
 	},
 	{
 		/* level 4 */
-		.on = {56, 50, 53, -1, -1, -1},
-		.off = {53, 47, 49, -1, -1, -1},
-		.rpm = {4100},
+		.on = { 56, 50, 53, -1, -1, -1 },
+		.off = { 53, 47, 49, -1, -1, -1 },
+		.rpm = { 4100 },
 	},
 	{
 		/* level 5 */
-		.on = {57, 52, 55, -1, -1, -1},
-		.off = {55, 49, 51, -1, -1, -1},
-		.rpm = {4400},
+		.on = { 57, 52, 55, -1, -1, -1 },
+		.off = { 55, 49, 51, -1, -1, -1 },
+		.rpm = { 4400 },
 	},
 	{
 		/* level 6 */
-		.on = {100, 100, 100, -1, -1, -1},
-		.off = {56, 51, 53, -1, -1, -1},
-		.rpm = {4900},
+		.on = { 100, 100, 100, -1, -1, -1 },
+		.off = { 56, 51, 53, -1, -1, -1 },
+		.rpm = { 4900 },
 	},
 };
 
 #define NUM_FAN_LEVELS ARRAY_SIZE(fan_step_table)
 
-BUILD_ASSERT(ARRAY_SIZE(fan_step_table) ==
-	ARRAY_SIZE(fan_step_table));
+BUILD_ASSERT(ARRAY_SIZE(fan_step_table) == ARRAY_SIZE(fan_step_table));
 
 int fan_table_to_rpm(int fan, int *temp)
 {
@@ -121,30 +120,29 @@ int fan_table_to_rpm(int fan, int *temp)
 	 *  3. invariant path. (return the current RPM)
 	 */
 	if (temp[TEMP_SENSOR_CHARGER] < prev_tmp[TEMP_SENSOR_CHARGER] ||
-		temp[TEMP_SENSOR_MEMORY] < prev_tmp[TEMP_SENSOR_MEMORY] ||
-		temp[TEMP_SENSOR_SOC] < prev_tmp[TEMP_SENSOR_SOC]) {
+	    temp[TEMP_SENSOR_MEMORY] < prev_tmp[TEMP_SENSOR_MEMORY] ||
+	    temp[TEMP_SENSOR_SOC] < prev_tmp[TEMP_SENSOR_SOC]) {
 		for (i = current_level; i > 0; i--) {
 			if (temp[TEMP_SENSOR_CHARGER] <
-				fan_step_table[i].off[TEMP_SENSOR_CHARGER] &&
-				temp[TEMP_SENSOR_MEMORY] <
-				fan_step_table[i].off[TEMP_SENSOR_MEMORY] &&
-				temp[TEMP_SENSOR_SOC] <
-				fan_step_table[i].off[TEMP_SENSOR_SOC]) {
+				    fan_step_table[i].off[TEMP_SENSOR_CHARGER] &&
+			    temp[TEMP_SENSOR_MEMORY] <
+				    fan_step_table[i].off[TEMP_SENSOR_MEMORY] &&
+			    temp[TEMP_SENSOR_SOC] <
+				    fan_step_table[i].off[TEMP_SENSOR_SOC]) {
 				current_level = i - 1;
 			} else
 				break;
 		}
 	} else if (temp[TEMP_SENSOR_CHARGER] > prev_tmp[TEMP_SENSOR_CHARGER] ||
-			temp[TEMP_SENSOR_MEMORY]
-				> prev_tmp[TEMP_SENSOR_MEMORY] ||
-			temp[TEMP_SENSOR_SOC] > prev_tmp[TEMP_SENSOR_SOC]) {
+		   temp[TEMP_SENSOR_MEMORY] > prev_tmp[TEMP_SENSOR_MEMORY] ||
+		   temp[TEMP_SENSOR_SOC] > prev_tmp[TEMP_SENSOR_SOC]) {
 		for (i = current_level; i < NUM_FAN_LEVELS; i++) {
 			if ((temp[TEMP_SENSOR_CHARGER] >
-				fan_step_table[i].on[TEMP_SENSOR_CHARGER] &&
-				temp[TEMP_SENSOR_MEMORY] >
-				fan_step_table[i].on[TEMP_SENSOR_MEMORY]) ||
-				temp[TEMP_SENSOR_SOC] >
-				fan_step_table[i].on[TEMP_SENSOR_SOC]) {
+				     fan_step_table[i].on[TEMP_SENSOR_CHARGER] &&
+			     temp[TEMP_SENSOR_MEMORY] >
+				     fan_step_table[i].on[TEMP_SENSOR_MEMORY]) ||
+			    temp[TEMP_SENSOR_SOC] >
+				    fan_step_table[i].on[TEMP_SENSOR_SOC]) {
 				current_level = i + 1;
 			} else
 				break;
@@ -167,15 +165,12 @@ int fan_table_to_rpm(int fan, int *temp)
 
 void board_override_fan_control(int fan, int *tmp)
 {
-	if (chipset_in_state(CHIPSET_STATE_ON |
-		CHIPSET_STATE_ANY_SUSPEND)) {
+	if (chipset_in_state(CHIPSET_STATE_ON | CHIPSET_STATE_ANY_SUSPEND)) {
 		fan_set_rpm_mode(FAN_CH(fan), 1);
-		fan_set_rpm_target(FAN_CH(fan),
-			fan_table_to_rpm(fan, tmp));
+		fan_set_rpm_target(FAN_CH(fan), fan_table_to_rpm(fan, tmp));
 	}
 }
 
-
 struct chg_curr_step {
 	int on;
 	int off;
@@ -183,12 +178,11 @@ struct chg_curr_step {
 };
 
 static const struct chg_curr_step chg_curr_table[] = {
-	{.on =  0, .off =  0, .curr_ma = 3566},
-	{.on = 66, .off = 65, .curr_ma = 2500},
-	{.on = 70, .off = 69, .curr_ma = 1500},
+	{ .on = 0, .off = 0, .curr_ma = 3566 },
+	{ .on = 66, .off = 65, .curr_ma = 2500 },
+	{ .on = 70, .off = 69, .curr_ma = 1500 },
 };
 
-
 #define NUM_CHG_CURRENT_LEVELS ARRAY_SIZE(chg_curr_table)
 
 int charger_profile_override(struct charge_state_data *curr)
@@ -200,7 +194,6 @@ int charger_profile_override(struct charge_state_data *curr)
 	static int current_level;
 	static int prev_tmp;
 
-
 	if (!(curr->batt.flags & BATT_FLAG_RESPONSIVE))
 		return 0;
 
@@ -214,12 +207,13 @@ int charger_profile_override(struct charge_state_data *curr)
 
 	if (chipset_in_state(CHIPSET_STATE_ON)) {
 		if (chg_temp_c < prev_tmp) {
-			if ((chg_temp_c <= chg_curr_table[current_level].off)
-				&& (current_level > 0))
+			if ((chg_temp_c <= chg_curr_table[current_level].off) &&
+			    (current_level > 0))
 				current_level -= 1;
 		} else if (chg_temp_c > prev_tmp) {
-			if ((chg_temp_c >= chg_curr_table[current_level + 1].on)
-				&& (current_level < NUM_CHG_CURRENT_LEVELS - 1))
+			if ((chg_temp_c >=
+			     chg_curr_table[current_level + 1].on) &&
+			    (current_level < NUM_CHG_CURRENT_LEVELS - 1))
 				current_level += 1;
 		}