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

diff --git a/core/minute-ia/interrupts.c b/core/minute-ia/interrupts.c
index 2d55d3129e..34baa68fa8 100644
--- a/core/minute-ia/interrupts.c
+++ b/core/minute-ia/interrupts.c
@@ -1,4 +1,4 @@
-/* Copyright 2016 The Chromium OS Authors. All rights reserved.
+/* Copyright 2016 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
@@ -20,8 +20,8 @@
 
 /* Console output macros */
 #define CPUTS(outstr) cputs(CC_SYSTEM, outstr)
-#define CPRINTF(format, args...) cprintf(CC_SYSTEM, format, ## args)
-#define CPRINTS(format, args...) cprints(CC_SYSTEM, format, ## args)
+#define CPRINTF(format, args...) cprintf(CC_SYSTEM, format, ##args)
+#define CPRINTS(format, args...) cprints(CC_SYSTEM, format, ##args)
 
 /* The IDT  - initialized in init.S */
 extern struct idt_entry __idt[NUM_VECTORS];
@@ -54,7 +54,7 @@ static void set_ioapic_redtbl_raw(const uint32_t irq, const uint32_t val)
  * bitmap for current IRQ's mask status
  * ISH support max 64 IRQs, 64 bit bitmap value is ok
  */
-#define ISH_MAX_IOAPIC_IRQS	(64)
+#define ISH_MAX_IOAPIC_IRQS (64)
 uint64_t ioapic_irq_mask_bitmap;
 
 /**
@@ -70,7 +70,7 @@ uint64_t disable_all_interrupts(void)
 	uint64_t saved_map;
 	int i;
 
-	saved_map =  ioapic_irq_mask_bitmap;
+	saved_map = ioapic_irq_mask_bitmap;
 
 	for (i = 0; i < ISH_MAX_IOAPIC_IRQS; i++) {
 		if (((uint64_t)0x1 << i) & saved_map)
@@ -179,27 +179,27 @@ static const irq_desc_t system_irqs[] = {
  * and go directly to the CPU core, so get_current_interrupt_vector
  * cannot be used.
  */
-#define DEFINE_EXN_HANDLER(vector)			\
+#define DEFINE_EXN_HANDLER(vector) \
 	_DEFINE_EXN_HANDLER(vector, exception_panic_##vector)
-#define _DEFINE_EXN_HANDLER(vector, name)		\
-	void __keep name(void);				\
-	noreturn void name(void)	\
-	{						\
-		__asm__ ("push $0\n"			\
-			 "push $" #vector "\n"		\
-			 "call exception_panic\n");	\
-		__builtin_unreachable();		\
+#define _DEFINE_EXN_HANDLER(vector, name)          \
+	void __keep name(void);                    \
+	noreturn void name(void)                   \
+	{                                          \
+		__asm__("push $0\n"                \
+			"push $" #vector "\n"      \
+			"call exception_panic\n"); \
+		__builtin_unreachable();           \
 	}
 
-#define DEFINE_EXN_HANDLER_W_ERRORCODE(vector)		\
+#define DEFINE_EXN_HANDLER_W_ERRORCODE(vector) \
 	_DEFINE_EXN_HANDLER_W_ERRORCODE(vector, exception_panic_##vector)
-#define _DEFINE_EXN_HANDLER_W_ERRORCODE(vector, name)	\
-	void __keep name(void);				\
-	noreturn void name(void)	\
-	{						\
-		__asm__ ("push $" #vector "\n"		\
-			 "call exception_panic\n");	\
-		__builtin_unreachable();		\
+#define _DEFINE_EXN_HANDLER_W_ERRORCODE(vector, name) \
+	void __keep name(void);                       \
+	noreturn void name(void)                      \
+	{                                             \
+		__asm__("push $" #vector "\n"         \
+			"call exception_panic\n");    \
+		__builtin_unreachable();              \
 	}
 
 DEFINE_EXN_HANDLER(0);
@@ -228,15 +228,10 @@ DEFINE_EXN_HANDLER(20);
  * watchdog timer expiration. However, this time, hardware does not
  * push errorcode, and we must account for that by pushing zero.
  */
-noreturn __keep
-void exception_panic_wdt(uint32_t cs)
+noreturn __keep void exception_panic_wdt(uint32_t cs)
 {
-	exception_panic(
-		CONFIG_MIA_WDT_VEC,
-		0,
-		(uint32_t)__builtin_return_address(0),
-		cs,
-		0);
+	exception_panic(CONFIG_MIA_WDT_VEC, 0,
+			(uint32_t)__builtin_return_address(0), cs, 0);
 }
 
 void set_interrupt_gate(uint8_t num, isr_handler_t func, uint8_t flags)
@@ -244,7 +239,7 @@ void set_interrupt_gate(uint8_t num, isr_handler_t func, uint8_t flags)
 	uint16_t code_segment;
 
 	/* When the flat model is used the CS will never change. */
-	__asm volatile ("mov %%cs, %0":"=r" (code_segment));
+	__asm volatile("mov %%cs, %0" : "=r"(code_segment));
 
 	__idt[num].dword_lo = GEN_IDT_DESC_LO(func, code_segment, flags);
 	__idt[num].dword_up = GEN_IDT_DESC_UP(func, code_segment, flags);
@@ -384,26 +379,28 @@ void handle_lapic_lvt_error(void)
 
 /* LAPIC LVT error is not an IRQ and can not use DECLARE_IRQ() to call. */
 void _lapic_error_handler(void);
-__asm__ (
-	".section .text._lapic_error_handler\n"
+__asm__(".section .text._lapic_error_handler\n"
 	"_lapic_error_handler:\n"
-		"pusha\n"
-		ASM_LOCK_PREFIX "addl $1, __in_isr\n"
-		"movl %esp, %eax\n"
-		"movl $stack_end, %esp\n"
-		"push %eax\n"
+	"pusha\n" ASM_LOCK_PREFIX "addl $1, __in_isr\n"
+	"movl %esp, %eax\n"
+	"movl $stack_end, %esp\n"
+	"push %eax\n"
 #ifdef CONFIG_TASK_PROFILING
-		"push $" STRINGIFY(CONFIG_IRQ_COUNT) "\n"
-		"call task_start_irq_handler\n"
-		"addl $0x04, %esp\n"
+	"push $" STRINGIFY(
+		CONFIG_IRQ_COUNT) "\n"
+				  "call task_start_irq_handler\n"
+				  "addl $0x04, %esp\n"
 #endif
-		"call handle_lapic_lvt_error\n"
-		"pop %esp\n"
-		"movl $0x00, (0xFEE000B0)\n"	/* Set EOI for LAPIC */
-		ASM_LOCK_PREFIX "subl $1, __in_isr\n"
-		"popa\n"
-		"iret\n"
-	);
+				  "call handle_lapic_lvt_error\n"
+				  "pop %esp\n"
+				  "movl $0x00, (0xFEE000B0)\n" /* Set
+								  EOI
+								  for
+								  LAPIC
+								*/
+	ASM_LOCK_PREFIX "subl $1, __in_isr\n"
+				  "popa\n"
+				  "iret\n");
 
 /* Should only be called in interrupt context */
 void unhandled_vector(void)
@@ -411,7 +408,7 @@ void unhandled_vector(void)
 	uint32_t vec = get_current_interrupt_vector();
 	CPRINTF("Ignoring vector 0x%0x!\n", vec);
 	/* Put the vector number in eax so default_int_handler can use it */
-	asm("" : : "a" (vec));
+	asm("" : : "a"(vec));
 }
 
 /**
@@ -454,8 +451,7 @@ void init_interrupts(void)
 
 	/* Setup gates for IRQs declared by drivers using DECLARE_IRQ */
 	for (p = __irq_data; p < __irq_data_end; p++)
-		set_interrupt_gate(IRQ_TO_VEC(p->irq),
-				   p->handler,
+		set_interrupt_gate(IRQ_TO_VEC(p->irq), p->handler,
 				   IDT_DESC_FLAGS);
 
 	/* Software generated IRQ */
@@ -474,11 +470,11 @@ void init_interrupts(void)
 	for (entry = 0; entry < num_system_irqs; entry++)
 		set_ioapic_redtbl_raw(system_irqs[entry].irq,
 				      system_irqs[entry].vector |
-				      IOAPIC_REDTBL_DELMOD_FIXED |
-				      IOAPIC_REDTBL_DESTMOD_PHYS |
-				      IOAPIC_REDTBL_MASK |
-				      system_irqs[entry].polarity |
-				      system_irqs[entry].trigger);
+					      IOAPIC_REDTBL_DELMOD_FIXED |
+					      IOAPIC_REDTBL_DESTMOD_PHYS |
+					      IOAPIC_REDTBL_MASK |
+					      system_irqs[entry].polarity |
+					      system_irqs[entry].trigger);
 
 	set_interrupt_gate(ISH_TS_VECTOR, __switchto, IDT_DESC_FLAGS);