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

diff --git a/include/panic.h b/include/panic.h
index 6e4f17fcb9..9a1a78844e 100644
--- a/include/panic.h
+++ b/include/panic.h
@@ -1,4 +1,4 @@
-/* Copyright 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright 2012 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
@@ -15,6 +15,19 @@
 
 #include "software_panic.h"
 
+/*
+ * Define these helpers if needed. While normally they would be derived from
+ * common.h, we cannot include that header here because this file is also used
+ * in the ectool and the build breaks.
+ */
+#ifndef test_mockable_noreturn
+#if defined(TEST_BUILD) || defined(CONFIG_ZTEST)
+#define test_mockable_noreturn __attribute__((weak))
+#else
+#define test_mockable_noreturn noreturn
+#endif
+#endif /* test_mockable_noreturn */
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -66,21 +79,21 @@ struct cortex_panic_data {
 /* NDS32 N8 registers saved on panic */
 struct nds32_n8_panic_data {
 	uint32_t itype;
-	uint32_t regs[16];        /* r0-r10, r15, fp, gp, lp, sp */
+	uint32_t regs[16]; /* r0-r10, r15, fp, gp, lp, sp */
 	uint32_t ipc;
 	uint32_t ipsw;
 };
 
 /* RISC-V RV32I registers saved on panic */
 struct rv32i_panic_data {
-	uint32_t regs[31];        /* sp, ra, gp, tp, a0-a7, t0-t6, s0-s11 */
-	uint32_t mepc;            /* mepc */
-	uint32_t mcause;          /* mcause */
+	uint32_t regs[31]; /* sp, ra, gp, tp, a0-a7, t0-t6, s0-s11 */
+	uint32_t mepc; /* mepc */
+	uint32_t mcause; /* mcause */
 };
 
 /* x86 registers saved on panic */
 struct x86_panic_data {
-	uint32_t vector;          /* Exception vector number */
+	uint32_t vector; /* Exception vector number */
 
 	/* Data pushed when exception handler called */
 	uint32_t error_code;
@@ -102,18 +115,18 @@ struct x86_panic_data {
 
 /* Data saved across reboots */
 struct panic_data {
-	uint8_t arch;             /* Architecture (PANIC_ARCH_*) */
-	uint8_t struct_version;   /* Structure version (currently 2) */
-	uint8_t flags;            /* Flags (PANIC_DATA_FLAG_*) */
-	uint8_t reserved;         /* Reserved; set 0 */
+	uint8_t arch; /* Architecture (PANIC_ARCH_*) */
+	uint8_t struct_version; /* Structure version (currently 2) */
+	uint8_t flags; /* Flags (PANIC_DATA_FLAG_*) */
+	uint8_t reserved; /* Reserved; set 0 */
 
 	/* core specific panic data */
 	union {
-		struct cortex_panic_data cm;       /* Cortex-Mx registers */
+		struct cortex_panic_data cm; /* Cortex-Mx registers */
 		struct nds32_n8_panic_data nds_n8; /* NDS32 N8 registers */
-		struct x86_panic_data x86;         /* Intel x86 */
+		struct x86_panic_data x86; /* Intel x86 */
 #ifndef CONFIG_DO_NOT_INCLUDE_RV32I_PANIC_DATA
-		struct rv32i_panic_data riscv;     /* RISC-V RV32I */
+		struct rv32i_panic_data riscv; /* RISC-V RV32I */
 #endif
 	};
 
@@ -121,21 +134,21 @@ struct panic_data {
 	 * These fields go at the END of the struct so we can find it at the
 	 * end of memory.
 	 */
-	uint32_t struct_size;     /* Size of this struct */
-	uint32_t magic;           /* PANIC_SAVE_MAGIC if valid */
+	uint32_t struct_size; /* Size of this struct */
+	uint32_t magic; /* PANIC_SAVE_MAGIC if valid */
 };
 
 #ifdef CONFIG_RO_PANIC_DATA_SIZE
 BUILD_ASSERT(sizeof(struct panic_data) == CONFIG_RO_PANIC_DATA_SIZE);
 #endif
 
-#define PANIC_DATA_MAGIC 0x21636e50  /* "Pnc!" */
+#define PANIC_DATA_MAGIC 0x21636e50 /* "Pnc!" */
 enum panic_arch {
-	PANIC_ARCH_CORTEX_M = 1,     /* Cortex-M architecture */
-	PANIC_ARCH_NDS32_N8 = 2,     /* NDS32 N8 architecture */
-	PANIC_ARCH_X86 = 3,          /* Intel x86 */
+	PANIC_ARCH_CORTEX_M = 1, /* Cortex-M architecture */
+	PANIC_ARCH_NDS32_N8 = 2, /* NDS32 N8 architecture */
+	PANIC_ARCH_X86 = 3, /* Intel x86 */
 #ifndef CONFIG_DO_NOT_INCLUDE_RV32I_PANIC_DATA
-	PANIC_ARCH_RISCV_RV32I = 4,  /* RISC-V RV32I */
+	PANIC_ARCH_RISCV_RV32I = 4, /* RISC-V RV32I */
 #endif
 };
 
@@ -144,13 +157,13 @@ enum panic_arch {
 
 /* Flags for panic_data.flags */
 /* panic_data.frame is valid */
-#define PANIC_DATA_FLAG_FRAME_VALID    BIT(0)
+#define PANIC_DATA_FLAG_FRAME_VALID BIT(0)
 /* Already printed at console */
-#define PANIC_DATA_FLAG_OLD_CONSOLE    BIT(1)
+#define PANIC_DATA_FLAG_OLD_CONSOLE BIT(1)
 /* Already returned via host command */
-#define PANIC_DATA_FLAG_OLD_HOSTCMD    BIT(2)
+#define PANIC_DATA_FLAG_OLD_HOSTCMD BIT(2)
 /* Already reported via host event */
-#define PANIC_DATA_FLAG_OLD_HOSTEVENT  BIT(3)
+#define PANIC_DATA_FLAG_OLD_HOSTEVENT BIT(3)
 
 /**
  * Write a string to the panic reporting device
@@ -170,8 +183,8 @@ void panic_puts(const char *s);
  * @param format	printf-style format string
  * @param ...		Arguments to process
  */
-__attribute__((__format__(__printf__, 1, 2)))
-void panic_printf(const char *format, ...);
+__attribute__((__format__(__printf__, 1, 2))) void
+panic_printf(const char *format, ...);
 
 /*
  * Print saved panic information
@@ -197,10 +210,10 @@ void panic_data_ccprint(const struct panic_data *pdata);
  * @param linenum	Line number where assertion happened
  */
 #ifdef CONFIG_DEBUG_ASSERT_BRIEF
-noreturn void panic_assert_fail(const char *fname, int linenum);
+test_mockable_noreturn void panic_assert_fail(const char *fname, int linenum);
 #else
-noreturn void panic_assert_fail(const char *msg, const char *func,
-				const char *fname, int linenum);
+test_mockable_noreturn void panic_assert_fail(const char *msg, const char *func,
+					      const char *fname, int linenum);
 #endif
 
 /**
@@ -208,19 +221,27 @@ noreturn void panic_assert_fail(const char *msg, const char *func,
  *
  * @param msg	Panic message
  */
-noreturn void panic(const char *msg);
+#if !(defined(TEST_FUZZ) || defined(CONFIG_ZTEST))
+noreturn
+#endif
+	void
+	panic(const char *msg);
 
 /**
  * Display a default message and reset
  */
-noreturn void panic_reboot(void);
+#if !(defined(TEST_FUZZ) || defined(CONFIG_ZTEST))
+noreturn
+#endif
+	void
+	panic_reboot(void);
 
 #ifdef CONFIG_SOFTWARE_PANIC
 /**
  * Store a panic log and halt the system for a software-related reason, such as
  * stack overflow or assertion failure.
  */
-noreturn void software_panic(uint32_t reason, uint32_t info);
+test_mockable_noreturn void software_panic(uint32_t reason, uint32_t info);
 
 /**
  * Log a panic in the panic log, but don't halt the system. Normally
@@ -254,8 +275,8 @@ void ignore_bus_fault(int ignored);
  * Return a pointer to the saved data from a previous panic that can be
  * safely interpreted
  *
- * @param pointer to the valid panic data, or NULL if none available (for example,
- * the last reboot was not caused by a panic).
+ * @param pointer to the valid panic data, or NULL if none available (for
+ * example, the last reboot was not caused by a panic).
  */
 struct panic_data *panic_get_data(void);
 
@@ -294,4 +315,4 @@ void chip_panic_data_backup(void);
 }
 #endif
 
-#endif  /* __CROS_EC_PANIC_H */
+#endif /* __CROS_EC_PANIC_H */