Merge remote-tracking branch cros/main into firmware-fpmcu-dartmonkey-releasefirmware-fpmcu-dartmonkey-release

Generated by: ./util/update_release_branch.py --board dartmonkey --relevant_paths_file
./util/fingerprint-relevant-paths.txt firmware-fpmcu-dartmonkey-release

Relevant changes:

git log --oneline 6c1587ca70..28712dae9d -- board/nocturne_fp
board/dartmonkey 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
a0751778f4 board/nocturne_fp/ro_workarounds.c: 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
58f0246dbe board/nocturne_fp/board_ro.c: 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
84e53a65da board/nocturne_fp/board.h: 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
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:244387210 b:242720240 b:215613183 b:242720910 b:236386294
BUG=b:234181908 b:244781166 b:234781655 b:234143158 b:234181908
BUG=b:237344361 b:236025198 b:234181908 b:180945056 chromium:1098010
BUG=b:246424843 b:234181908 b:131913998
TEST=`make -j buildall`
TEST=./util/run_device_tests.py --board dartmonkey
     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 "panic_data_dartmonkey_v2.0.2887": PASSED
     Test "panic_data_nocturne_fp_v2.2.64": PASSED
     Test "panic_data_nami_fp_v2.2.144": PASSED
Force-Relevant-Builds: all
Signed-off-by: Tom Hughes <tomhughes@chromium.org>

Change-Id: I2c312583a709fedae8fe11d92c22328c3b634bc7

1 files changed, 44 insertions, 34 deletions

diff --git a/baseboard/brya/prochot.c b/baseboard/brya/prochot.c
index 666f2ca35b..f89ec5a263 100644
--- a/baseboard/brya/prochot.c
+++ b/baseboard/brya/prochot.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.
  */
@@ -16,10 +16,10 @@
 #include "task.h"
 
 /* Console output macros */
-#define CPRINTS(format, args...) cprints(CC_CHARGER, format, ## args)
+#define CPRINTS(format, args...) cprints(CC_CHARGER, format, ##args)
 
-#define ADT_RATING_W  (PD_MAX_POWER_MW / 1000)
-#define PROCHOT_EVENT_200MS_TICK    TASK_EVENT_CUSTOM_BIT(0)
+#define ADT_RATING_W (PD_MAX_POWER_MW / 1000)
+#define PROCHOT_EVENT_200MS_TICK TASK_EVENT_CUSTOM_BIT(0)
 
 struct batt_para {
 	int battery_continuous_discharge_mw;
@@ -80,8 +80,9 @@ static int get_batt_parameter(void)
 
 	rv |= sb_read(SB_DESIGN_VOLTAGE, &battery_design_voltage_mv);
 	rv |= sb_read(SB_DESIGN_CAPACITY, &battery_design_capacity_mAh);
-	batt_params.battery_design_mWh = (battery_design_voltage_mv *
-		battery_design_capacity_mAh) / 1000;
+	batt_params.battery_design_mWh =
+		(battery_design_voltage_mv * battery_design_capacity_mAh) /
+		1000;
 
 	if (sb_read(SB_RELATIVE_STATE_OF_CHARGE, &batt_params.state_of_charge))
 		batt_params.flags |= BATT_FLAG_BAD_STATE_OF_CHARGE;
@@ -109,7 +110,7 @@ static int set_register_charge_option(void)
 	int rv;
 
 	rv = i2c_read16(I2C_PORT_CHARGER, BQ25710_SMBUS_ADDR1_FLAGS,
-		    BQ25710_REG_CHARGE_OPTION_0, &reg);
+			BQ25710_REG_CHARGE_OPTION_0, &reg);
 	if (rv == EC_SUCCESS) {
 		reg = SET_BQ_FIELD(BQ257X0, CHARGE_OPTION_0, IADP_GAIN, 1, reg);
 		/* if AC only, disable IDPM,
@@ -127,7 +128,7 @@ static int set_register_charge_option(void)
 	}
 
 	return i2c_write16(I2C_PORT_CHARGER, BQ25710_SMBUS_ADDR1_FLAGS,
-				BQ25710_REG_CHARGE_OPTION_0, reg);
+			   BQ25710_REG_CHARGE_OPTION_0, reg);
 }
 
 static void assert_prochot(void)
@@ -154,7 +155,7 @@ static void assert_prochot(void)
 	/* When battery is discharging, the battery current will be negative */
 	if (batt_params.battery_continuous_discharge_mw < 0) {
 		total_W = adpt_mw +
-			ABS(batt_params.battery_continuous_discharge_mw);
+			  ABS(batt_params.battery_continuous_discharge_mw);
 	} else {
 		/* we won't assert prochot when battery is charging. */
 		total_W = adpt_mw;
@@ -177,15 +178,18 @@ static void assert_prochot(void)
 		if (!battery_hw_present()) {
 			gpio_set_level(GPIO_EC_PROCHOT_ODL, 1);
 		} else {
-			batt_params.battery_continuous_discharge_mw =
-			ABS(batt_params.battery_continuous_discharge_mw);
+			batt_params.battery_continuous_discharge_mw = ABS(
+				batt_params.battery_continuous_discharge_mw);
 			if ((batt_params.battery_continuous_discharge_mw /
-			 1000) > BATT_MAX_CONTINUE_DISCHARGE_WATT *
-			 PROCHOT_ASSERTION_BATTERY_RATIO / 100)
+			     1000) > BATT_MAX_CONTINUE_DISCHARGE_WATT *
+					     PROCHOT_ASSERTION_BATTERY_RATIO /
+					     100)
 				gpio_set_level(GPIO_EC_PROCHOT_ODL, 0);
-			else if ((batt_params.battery_continuous_discharge_mw
-			 / 1000) < BATT_MAX_CONTINUE_DISCHARGE_WATT *
-			 PROCHOT_DEASSERTION_BATTERY_RATIO / 100)
+			else if ((batt_params.battery_continuous_discharge_mw /
+				  1000) <
+				 BATT_MAX_CONTINUE_DISCHARGE_WATT *
+					 PROCHOT_DEASSERTION_BATTERY_RATIO /
+					 100)
 				gpio_set_level(GPIO_EC_PROCHOT_ODL, 1);
 		}
 		return;
@@ -195,42 +199,48 @@ static void assert_prochot(void)
 		/* if adapter >= 60W */
 		/* if no battery or battery < 10% */
 		if (!battery_hw_present() ||
-		batt_params.state_of_charge <= 10) {
-			if (total_W > ADT_RATING_W *
-			PROCHOT_ASSERTION_PD_RATIO / 100)
+		    batt_params.state_of_charge <= 10) {
+			if (total_W >
+			    ADT_RATING_W * PROCHOT_ASSERTION_PD_RATIO / 100)
 				gpio_set_level(GPIO_EC_PROCHOT_ODL, 0);
-			else if (total_W <= ADT_RATING_W *
-			PROCHOT_DEASSERTION_PD_RATIO / 100)
+			else if (total_W <=
+				 ADT_RATING_W * PROCHOT_DEASSERTION_PD_RATIO /
+					 100)
 				gpio_set_level(GPIO_EC_PROCHOT_ODL, 1);
 		} else {
 			/* AC + battery */
-			if (total_W > (ADT_RATING_W +
-			BATT_MAX_CONTINUE_DISCHARGE_WATT))
+			if (total_W >
+			    (ADT_RATING_W + BATT_MAX_CONTINUE_DISCHARGE_WATT))
 				gpio_set_level(GPIO_EC_PROCHOT_ODL, 0);
-			else if (total_W < (ADT_RATING_W +
-			BATT_MAX_CONTINUE_DISCHARGE_WATT) *
-			PROCHOT_DEASSERTION_PD_BATTERY_RATIO / 100)
+			else if (total_W <
+				 (ADT_RATING_W +
+				  BATT_MAX_CONTINUE_DISCHARGE_WATT) *
+					 PROCHOT_DEASSERTION_PD_BATTERY_RATIO /
+					 100)
 				gpio_set_level(GPIO_EC_PROCHOT_ODL, 1);
 		}
 	} else {
 		/* if adapter < 60W */
 		/* if no battery or battery < 10% */
 		if (!battery_hw_present() ||
-		batt_params.state_of_charge <= 10) {
+		    batt_params.state_of_charge <= 10) {
 			if (total_W > (adapter_wattage *
-			PROCHOT_ASSERTION_ADAPTER_RATIO / 100))
+				       PROCHOT_ASSERTION_ADAPTER_RATIO / 100))
 				gpio_set_level(GPIO_EC_PROCHOT_ODL, 0);
-			else if (total_W <= (adapter_wattage *
-			PROCHOT_DEASSERTION_ADAPTER_RATIO / 100))
+			else if (total_W <=
+				 (adapter_wattage *
+				  PROCHOT_DEASSERTION_ADAPTER_RATIO / 100))
 				gpio_set_level(GPIO_EC_PROCHOT_ODL, 1);
 		} else {
 			/* AC + battery */
 			if (total_W > (adapter_wattage +
-				BATT_MAX_CONTINUE_DISCHARGE_WATT))
+				       BATT_MAX_CONTINUE_DISCHARGE_WATT))
 				gpio_set_level(GPIO_EC_PROCHOT_ODL, 0);
-			else if (total_W < (adapter_wattage +
-				(BATT_MAX_CONTINUE_DISCHARGE_WATT *
-				PROCHOT_DEASSERTION_ADAPTER_BATT_RATIO / 100)))
+			else if (total_W <
+				 (adapter_wattage +
+				  (BATT_MAX_CONTINUE_DISCHARGE_WATT *
+				   PROCHOT_DEASSERTION_ADAPTER_BATT_RATIO /
+				   100)))
 				gpio_set_level(GPIO_EC_PROCHOT_ODL, 1);
 		}
 	}