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, 34 insertions, 35 deletions

diff --git a/common/hooks.c b/common/hooks.c
index 061586c4cb..3bd9689d64 100644
--- a/common/hooks.c
+++ b/common/hooks.c
@@ -1,4 +1,4 @@
-/* Copyright 2013 The Chromium OS Authors. All rights reserved.
+/* Copyright 2013 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -14,7 +14,7 @@
 
 #ifdef CONFIG_HOOK_DEBUG
 #define CPUTS(outstr) cputs(CC_HOOK, outstr)
-#define CPRINTS(format, args...) cprints(CC_HOOK, format, ## args)
+#define CPRINTS(format, args...) cprints(CC_HOOK, format, ##args)
 #else
 #define CPUTS(outstr)
 #define CPRINTS(format, args...)
@@ -32,37 +32,38 @@ struct hook_ptrs {
  * order as enum hook_type.
  */
 static const struct hook_ptrs hook_list[] = {
-	{__hooks_init, __hooks_init_end},
-	{__hooks_pre_freq_change, __hooks_pre_freq_change_end},
-	{__hooks_freq_change, __hooks_freq_change_end},
-	{__hooks_sysjump, __hooks_sysjump_end},
-	{__hooks_chipset_pre_init, __hooks_chipset_pre_init_end},
-	{__hooks_chipset_startup, __hooks_chipset_startup_end},
-	{__hooks_chipset_resume, __hooks_chipset_resume_end},
-	{__hooks_chipset_suspend, __hooks_chipset_suspend_end},
+	{ __hooks_init, __hooks_init_end },
+	{ __hooks_pre_freq_change, __hooks_pre_freq_change_end },
+	{ __hooks_freq_change, __hooks_freq_change_end },
+	{ __hooks_sysjump, __hooks_sysjump_end },
+	{ __hooks_chipset_pre_init, __hooks_chipset_pre_init_end },
+	{ __hooks_chipset_startup, __hooks_chipset_startup_end },
+	{ __hooks_chipset_resume, __hooks_chipset_resume_end },
+	{ __hooks_chipset_suspend, __hooks_chipset_suspend_end },
 #ifdef CONFIG_CHIPSET_RESUME_INIT_HOOK
-	{__hooks_chipset_resume_init, __hooks_chipset_resume_init_end},
-	{__hooks_chipset_suspend_complete,
-	 __hooks_chipset_suspend_complete_end},
+	{ __hooks_chipset_resume_init, __hooks_chipset_resume_init_end },
+	{ __hooks_chipset_suspend_complete,
+	  __hooks_chipset_suspend_complete_end },
 #endif
-	{__hooks_chipset_shutdown, __hooks_chipset_shutdown_end},
-	{__hooks_chipset_shutdown_complete,
-	 __hooks_chipset_shutdown_complete_end},
-	{__hooks_chipset_hard_off, __hooks_chipset_hard_off_end},
-	{__hooks_chipset_reset, __hooks_chipset_reset_end},
-	{__hooks_ac_change, __hooks_ac_change_end},
-	{__hooks_lid_change, __hooks_lid_change_end},
-	{__hooks_tablet_mode_change, __hooks_tablet_mode_change_end},
-	{__hooks_base_attached_change, __hooks_base_attached_change_end},
-	{__hooks_pwrbtn_change, __hooks_pwrbtn_change_end},
-	{__hooks_battery_soc_change, __hooks_battery_soc_change_end},
+	{ __hooks_chipset_shutdown, __hooks_chipset_shutdown_end },
+	{ __hooks_chipset_shutdown_complete,
+	  __hooks_chipset_shutdown_complete_end },
+	{ __hooks_chipset_hard_off, __hooks_chipset_hard_off_end },
+	{ __hooks_chipset_reset, __hooks_chipset_reset_end },
+	{ __hooks_ac_change, __hooks_ac_change_end },
+	{ __hooks_lid_change, __hooks_lid_change_end },
+	{ __hooks_tablet_mode_change, __hooks_tablet_mode_change_end },
+	{ __hooks_base_attached_change, __hooks_base_attached_change_end },
+	{ __hooks_pwrbtn_change, __hooks_pwrbtn_change_end },
+	{ __hooks_battery_soc_change, __hooks_battery_soc_change_end },
 #ifdef CONFIG_USB_SUSPEND
-	{__hooks_usb_change, __hooks_usb_change_end},
+	{ __hooks_usb_change, __hooks_usb_change_end },
 #endif
-	{__hooks_tick, __hooks_tick_end},
-	{__hooks_second, __hooks_second_end},
-	{__hooks_usb_pd_disconnect, __hooks_usb_pd_disconnect_end},
-	{__hooks_usb_pd_connect, __hooks_usb_pd_connect_end},
+	{ __hooks_tick, __hooks_tick_end },
+	{ __hooks_second, __hooks_second_end },
+	{ __hooks_usb_pd_disconnect, __hooks_usb_pd_disconnect_end },
+	{ __hooks_usb_pd_connect, __hooks_usb_pd_connect_end },
+	{ __hooks_power_supply_change, __hooks_power_supply_change_end },
 };
 
 /* Times for deferrable functions */
@@ -149,7 +150,7 @@ int hook_call_deferred(const struct deferred_data *data, int us)
 	int i = data - __deferred_funcs;
 
 	if (data < __deferred_funcs || data >= __deferred_funcs_end)
-		return EC_ERROR_INVAL;  /* Routine not registered */
+		return EC_ERROR_INVAL; /* Routine not registered */
 
 	if (us == -1) {
 		/* Cancel */
@@ -195,7 +196,7 @@ void hook_task(void *u)
 				 */
 				__deferred_until[i] = 0;
 				interrupt_enable();
-				CPRINTS("hook call deferred 0x%pP",
+				CPRINTS("hook call deferred 0x%p",
 					__deferred_funcs[i].routine);
 				__deferred_funcs[i].routine();
 				interrupt_disable();
@@ -264,7 +265,7 @@ static void print_hook_delay(uint32_t interval, uint32_t delay, uint32_t avg)
 	ccprintf("  Average:     %7d us (%d%%)\n\n", avg, percent_avg);
 }
 
-static int command_stats(int argc, char **argv)
+static int command_stats(int argc, const char **argv)
 {
 	int i;
 
@@ -283,7 +284,5 @@ static int command_stats(int argc, char **argv)
 
 	return EC_SUCCESS;
 }
-DECLARE_CONSOLE_COMMAND(hookstats, command_stats,
-			NULL,
-			"Print stats of hooks");
+DECLARE_CONSOLE_COMMAND(hookstats, command_stats, NULL, "Print stats of hooks");
 #endif