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, 11 insertions, 24 deletions

diff --git a/chip/mchp/tfdp.c b/chip/mchp/tfdp.c
index b4368b46a8..eb9b903cb5 100644
--- a/chip/mchp/tfdp.c
+++ b/chip/mchp/tfdp.c
@@ -1,4 +1,4 @@
-/* Copyright 2017 The Chromium OS Authors. All rights reserved.
+/* Copyright 2017 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -17,12 +17,11 @@
 
 #ifdef CONFIG_MCHP_TFDP
 
-
 static uint32_t get_disable_intr(void)
 {
 	uint32_t m;
 
-	__asm__ __volatile__ ("mrs %0, primask;cpsid i" : "=r" (m));
+	__asm__ __volatile__("mrs %0, primask;cpsid i" : "=r"(m));
 
 	return m;
 }
@@ -30,10 +29,9 @@ static uint32_t get_disable_intr(void)
 static void restore_intr(uint32_t m)
 {
 	if (!m)
-		__asm__ __volatile__ ("cpsie i" : : : "memory");
+		__asm__ __volatile__("cpsie i" : : : "memory");
 }
 
-
 /**
  * tfdp_power - Gate clocks On/Off to TFDP block when idle
  *
@@ -48,7 +46,6 @@ void tfdp_power(uint8_t pwr_on)
 		MCHP_PCR_SLP_EN_DEV(MCHP_PCR_TFDP);
 }
 
-
 /**
  * tfdp_enable - Init Trace FIFO Data Port
  * @param uint8_t non-zero=enable TFDP, false=disable TFDP
@@ -57,8 +54,8 @@ void tfdp_power(uint8_t pwr_on)
  * Else GPIO170/171 set to GPIO input, internal pull-up enabled.
  * @note -
  */
-#define MCHP_TFDP_DATA	REG8(MCHP_TFDP_BASE + 0x00)
-#define MCHP_TFDP_CTRL	REG8(MCHP_TFDP_BASE + 0x04)
+#define MCHP_TFDP_DATA REG8(MCHP_TFDP_BASE + 0x00)
+#define MCHP_TFDP_CTRL REG8(MCHP_TFDP_BASE + 0x04)
 
 void tfdp_enable(uint8_t en, uint8_t pin_cfg)
 {
@@ -73,7 +70,6 @@ void tfdp_enable(uint8_t en, uint8_t pin_cfg)
 	}
 } /* end tfdp_enable() */
 
-
 /**
  * TFDPTrace0 - TRACE0: transmit 16-bit trace number lsb first
  * over TFDP.
@@ -106,7 +102,6 @@ void TFDPTrace0(uint16_t nbr)
 #endif
 }
 
-
 /**
  * TRDPTrace1 - TRACE1: transmit 16-bit trace number lsb first
  * and 16-bit data lsb first over TFDP.
@@ -144,7 +139,6 @@ void TFDPTrace1(uint16_t nbr, uint32_t p1)
 #endif
 }
 
-
 /**
  * TFDPTrace2 - TRACE2: transmit 16-bit trace number lsb first
  * and two 16-bit data parameters lsb first over TFDP.
@@ -187,7 +181,6 @@ void TFDPTrace2(uint16_t nbr, uint32_t p1, uint32_t p2)
 #endif
 }
 
-
 /**
  * TFDPTrace3 - TRACE3: transmit 16-bit trace number lsb first
  * and three 16-bit data parameters lsb first over TFDP.
@@ -203,8 +196,7 @@ void TFDPTrace2(uint16_t nbr, uint32_t p1, uint32_t p2)
  *       interrupts for critical section. These may use
  *       priviledged instructions.
  */
-void TFDPTrace3(uint16_t nbr, uint32_t p1,
-		uint32_t p2, uint32_t p3)
+void TFDPTrace3(uint16_t nbr, uint32_t p1, uint32_t p2, uint32_t p3)
 {
 #ifdef MCHP_TRACE_MASK_IRQ
 	uint32_t prim;
@@ -236,7 +228,6 @@ void TFDPTrace3(uint16_t nbr, uint32_t p1,
 #endif
 }
 
-
 /**
  * TFDPTrace4 - TRACE3: transmit 16-bit trace number lsb first
  * and four 16-bit data parameters lsb first over TFDP.
@@ -253,8 +244,8 @@ void TFDPTrace3(uint16_t nbr, uint32_t p1,
  *       interrupts for critical section. These may use
  *       priviledged instructions.
  */
-void TFDPTrace4(uint16_t nbr, uint32_t p1, uint32_t p2,
-		 uint32_t p3, uint32_t p4)
+void TFDPTrace4(uint16_t nbr, uint32_t p1, uint32_t p2, uint32_t p3,
+		uint32_t p4)
 {
 #ifdef MCHP_TRACE_MASK_IRQ
 	uint32_t prim;
@@ -290,7 +281,6 @@ void TFDPTrace4(uint16_t nbr, uint32_t p1, uint32_t p2,
 #endif
 }
 
-
 /**
  *  TFDPTrace11 - Transmit one 32-bit data item over TFDP
  *
@@ -327,7 +317,6 @@ void TFDPTrace11(uint16_t nbr, uint32_t p1)
 #endif
 }
 
-
 /**
  *  TFDPTrace12 - Transmit two 32-bit data items over TFDP
  *
@@ -383,8 +372,7 @@ void TFDPTrace12(uint16_t nbr, uint32_t p1, uint32_t p2)
  *  @param uint32_t p3 32-bit data3 to be transmitted
  *
  */
-void TFDPTrace13(uint16_t nbr, uint32_t p1,
-		 uint32_t p2, uint32_t p3)
+void TFDPTrace13(uint16_t nbr, uint32_t p1, uint32_t p2, uint32_t p3)
 {
 #ifdef MCHP_TRACE_MASK_IRQ
 	uint32_t prim;
@@ -438,8 +426,8 @@ void TFDPTrace13(uint16_t nbr, uint32_t p1,
  *  @param uint32_t p3 32-bit data3 to be transmitted
  *  @param uint32_t p4 32-bit data4 to be transmitted
  */
-void TFDPTrace14(uint16_t nbr, uint32_t p1, uint32_t p2,
-		 uint32_t p3, uint32_t p4)
+void TFDPTrace14(uint16_t nbr, uint32_t p1, uint32_t p2, uint32_t p3,
+		 uint32_t p4)
 {
 #ifdef MCHP_TRACE_MASK_IRQ
 	uint32_t prim;
@@ -493,7 +481,6 @@ void TFDPTrace14(uint16_t nbr, uint32_t p1, uint32_t p2,
 
 #endif /* #ifdef CONFIG_MCHP_TFDP */
 
-
 /* end tfdp.c */
 /**   @}
  */