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, 107 insertions, 104 deletions

diff --git a/chip/stm32/usb_spi.h b/chip/stm32/usb_spi.h
index fa86ba3651..3ff582dd14 100644
--- a/chip/stm32/usb_spi.h
+++ b/chip/stm32/usb_spi.h
@@ -1,4 +1,4 @@
-/* Copyright 2014 The Chromium OS Authors. All rights reserved.
+/* Copyright 2014 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -268,48 +268,48 @@
  *                      http://libusb.sourceforge.net/api-1.0/group__misc.html
  */
 
-#define USB_SPI_FULL_DUPLEX_ENABLED         (UINT16_MAX)
+#define USB_SPI_FULL_DUPLEX_ENABLED (UINT16_MAX)
 
-#define USB_SPI_PAYLOAD_SIZE_V2_START       (58)
+#define USB_SPI_PAYLOAD_SIZE_V2_START (58)
 
-#define USB_SPI_PAYLOAD_SIZE_V2_RESPONSE    (60)
+#define USB_SPI_PAYLOAD_SIZE_V2_RESPONSE (60)
 
-#define USB_SPI_PAYLOAD_SIZE_V2_CONTINUE    (60)
+#define USB_SPI_PAYLOAD_SIZE_V2_CONTINUE (60)
 
-#define USB_SPI_PAYLOAD_SIZE_V2_ERROR       (60)
+#define USB_SPI_PAYLOAD_SIZE_V2_ERROR (60)
 
-#define USB_SPI_MIN_PACKET_SIZE             (2)
+#define USB_SPI_MIN_PACKET_SIZE (2)
 
 enum packet_id_type {
 	/* Request USB SPI configuration data from device. */
 	USB_SPI_PKT_ID_CMD_GET_USB_SPI_CONFIG = 0,
 	/* USB SPI configuration data from device. */
-	USB_SPI_PKT_ID_RSP_USB_SPI_CONFIG     = 1,
+	USB_SPI_PKT_ID_RSP_USB_SPI_CONFIG = 1,
 	/*
 	 * Start a USB SPI transfer specifying number of bytes to write,
 	 * read and deliver first packet of data to write.
 	 */
-	USB_SPI_PKT_ID_CMD_TRANSFER_START     = 2,
+	USB_SPI_PKT_ID_CMD_TRANSFER_START = 2,
 	/* Additional packets containing write payload. */
-	USB_SPI_PKT_ID_CMD_TRANSFER_CONTINUE  = 3,
+	USB_SPI_PKT_ID_CMD_TRANSFER_CONTINUE = 3,
 	/*
 	 * Request the device restart the response enabling us to recover
 	 * from packet loss without another SPI transfer.
 	 */
-	USB_SPI_PKT_ID_CMD_RESTART_RESPONSE   = 4,
+	USB_SPI_PKT_ID_CMD_RESTART_RESPONSE = 4,
 	/*
 	 * First packet of USB SPI response with the status code
 	 * and read payload if it was successful.
 	 */
-	USB_SPI_PKT_ID_RSP_TRANSFER_START     = 5,
+	USB_SPI_PKT_ID_RSP_TRANSFER_START = 5,
 	/* Additional packets containing read payload. */
-	USB_SPI_PKT_ID_RSP_TRANSFER_CONTINUE  = 6,
+	USB_SPI_PKT_ID_RSP_TRANSFER_CONTINUE = 6,
 	/*
 	 * Request assertion or deassertion of chip select
 	 */
-	USB_SPI_PKT_ID_CMD_CHIP_SELECT        = 7,
+	USB_SPI_PKT_ID_CMD_CHIP_SELECT = 7,
 	/* Response to above request. */
-	USB_SPI_PKT_ID_RSP_CHIP_SELECT        = 8,
+	USB_SPI_PKT_ID_RSP_CHIP_SELECT = 8,
 };
 
 enum feature_bitmap {
@@ -383,25 +383,25 @@ struct usb_spi_packet_ctx {
 };
 
 enum usb_spi_error {
-	USB_SPI_SUCCESS                 = 0x0000,
-	USB_SPI_TIMEOUT                 = 0x0001,
-	USB_SPI_BUSY                    = 0x0002,
-	USB_SPI_WRITE_COUNT_INVALID     = 0x0003,
-	USB_SPI_READ_COUNT_INVALID      = 0x0004,
-	USB_SPI_DISABLED                = 0x0005,
+	USB_SPI_SUCCESS = 0x0000,
+	USB_SPI_TIMEOUT = 0x0001,
+	USB_SPI_BUSY = 0x0002,
+	USB_SPI_WRITE_COUNT_INVALID = 0x0003,
+	USB_SPI_READ_COUNT_INVALID = 0x0004,
+	USB_SPI_DISABLED = 0x0005,
 	/* The RX continue packet's data index is invalid. */
-	USB_SPI_RX_BAD_DATA_INDEX       = 0x0006,
+	USB_SPI_RX_BAD_DATA_INDEX = 0x0006,
 	/* The RX endpoint has received more data than write count. */
-	USB_SPI_RX_DATA_OVERFLOW        = 0x0007,
+	USB_SPI_RX_DATA_OVERFLOW = 0x0007,
 	/* An unexpected packet arrived on the device. */
-	USB_SPI_RX_UNEXPECTED_PACKET    = 0x0008,
+	USB_SPI_RX_UNEXPECTED_PACKET = 0x0008,
 	/* The device does not support full duplex mode. */
 	USB_SPI_UNSUPPORTED_FULL_DUPLEX = 0x0009,
-	USB_SPI_UNKNOWN_ERROR           = 0x8000,
+	USB_SPI_UNKNOWN_ERROR = 0x8000,
 };
 
 enum usb_spi_request {
-	USB_SPI_REQ_ENABLE  = 0x0000,
+	USB_SPI_REQ_ENABLE = 0x0000,
 	USB_SPI_REQ_DISABLE = 0x0001,
 };
 
@@ -416,11 +416,11 @@ enum usb_spi_request {
 #ifdef CONFIG_USB_SPI_BUFFER_SIZE
 #define USB_SPI_BUFFER_SIZE CONFIG_USB_SPI_BUFFER_SIZE
 #else
-#define USB_SPI_BUFFER_SIZE	(USB_SPI_PAYLOAD_SIZE_V2_START + \
-				(4 * USB_SPI_PAYLOAD_SIZE_V2_CONTINUE))
+#define USB_SPI_BUFFER_SIZE \
+	(USB_SPI_PAYLOAD_SIZE_V2_START + (4 * USB_SPI_PAYLOAD_SIZE_V2_CONTINUE))
 #endif
-#define USB_SPI_MAX_WRITE_COUNT	USB_SPI_BUFFER_SIZE
-#define USB_SPI_MAX_READ_COUNT	USB_SPI_BUFFER_SIZE
+#define USB_SPI_MAX_WRITE_COUNT USB_SPI_BUFFER_SIZE
+#define USB_SPI_MAX_READ_COUNT USB_SPI_BUFFER_SIZE
 
 /* Protocol uses two-byte length fields.  Larger buffer makes no sense. */
 BUILD_ASSERT(USB_SPI_BUFFER_SIZE <= 65536);
@@ -541,78 +541,82 @@ struct usb_spi_config {
  * FLAGS encodes different run-time control parameters. See
  * USB_SPI_CONFIG_FLAGS_* for definitions.
  */
-#define USB_SPI_CONFIG(NAME,						\
-		       INTERFACE,					\
-		       ENDPOINT,					\
-		       FLAGS)						\
-	static uint16_t CONCAT2(NAME, _buffer_)[(USB_SPI_BUFFER_SIZE + 1) / 2];\
-	static usb_uint CONCAT2(NAME, _ep_rx_buffer_)[USB_MAX_PACKET_SIZE / 2] __usb_ram; \
-	static usb_uint CONCAT2(NAME, _ep_tx_buffer_)[USB_MAX_PACKET_SIZE / 2] __usb_ram; \
-	static void CONCAT2(NAME, _deferred_)(void);			\
-	DECLARE_DEFERRED(CONCAT2(NAME, _deferred_));			\
-	struct usb_spi_state CONCAT2(NAME, _state_) = {			\
-		.enabled_host   = 0,					\
-		.enabled_device = 0,					\
-		.enabled        = 0,					\
+#define USB_SPI_CONFIG(NAME, INTERFACE, ENDPOINT, FLAGS)                    \
+	static uint16_t CONCAT2(NAME,                                       \
+				_buffer_)[(USB_SPI_BUFFER_SIZE + 1) / 2];   \
+	static usb_uint CONCAT2(                                            \
+		NAME, _ep_rx_buffer_)[USB_MAX_PACKET_SIZE / 2] __usb_ram;   \
+	static usb_uint CONCAT2(                                            \
+		NAME, _ep_tx_buffer_)[USB_MAX_PACKET_SIZE / 2] __usb_ram;   \
+	static void CONCAT2(NAME, _deferred_)(void);                        \
+	DECLARE_DEFERRED(CONCAT2(NAME, _deferred_));                        \
+	struct usb_spi_state CONCAT2(NAME, _state_) = {                     \
+		.enabled_host = 0,                                          \
+		.enabled_device = 0,                                        \
+		.enabled = 0,                                               \
 		.spi_write_ctx.buffer = (uint8_t *)CONCAT2(NAME, _buffer_), \
-		.spi_read_ctx.buffer = (uint8_t *)CONCAT2(NAME, _buffer_), \
-	};								\
-	struct usb_spi_config const NAME = {				\
-		.state     = &CONCAT2(NAME, _state_),			\
-		.interface = INTERFACE,					\
-		.endpoint  = ENDPOINT,					\
-		.deferred  = &CONCAT2(NAME, _deferred__data),		\
-		.ep_rx_ram = CONCAT2(NAME, _ep_rx_buffer_),		\
-		.ep_tx_ram = CONCAT2(NAME, _ep_tx_buffer_),		\
-		.flags     = FLAGS,		\
-	};								\
-	const struct usb_interface_descriptor				\
-	USB_IFACE_DESC(INTERFACE) = {					\
-		.bLength            = USB_DT_INTERFACE_SIZE,		\
-		.bDescriptorType    = USB_DT_INTERFACE,			\
-		.bInterfaceNumber   = INTERFACE,			\
-		.bAlternateSetting  = 0,				\
-		.bNumEndpoints      = 2,				\
-		.bInterfaceClass    = USB_CLASS_VENDOR_SPEC,		\
-		.bInterfaceSubClass = USB_SUBCLASS_GOOGLE_SPI,		\
-		.bInterfaceProtocol = USB_PROTOCOL_GOOGLE_SPI,		\
-		.iInterface         = USB_STR_SPI_NAME,			\
-	};								\
-	const struct usb_endpoint_descriptor				\
-	USB_EP_DESC(INTERFACE, 0) = {					\
-		.bLength          = USB_DT_ENDPOINT_SIZE,		\
-		.bDescriptorType  = USB_DT_ENDPOINT,			\
-		.bEndpointAddress = 0x80 | ENDPOINT,			\
-		.bmAttributes     = 0x02 /* Bulk IN */,			\
-		.wMaxPacketSize   = USB_MAX_PACKET_SIZE,		\
-		.bInterval        = 10,					\
-	};								\
-	const struct usb_endpoint_descriptor				\
-	USB_EP_DESC(INTERFACE, 1) = {					\
-		.bLength          = USB_DT_ENDPOINT_SIZE,		\
-		.bDescriptorType  = USB_DT_ENDPOINT,			\
-		.bEndpointAddress = ENDPOINT,				\
-		.bmAttributes     = 0x02 /* Bulk OUT */,		\
-		.wMaxPacketSize   = USB_MAX_PACKET_SIZE,		\
-		.bInterval        = 0,					\
-	};								\
-	static void CONCAT2(NAME, _ep_tx_)   (void) { usb_spi_tx   (&NAME); } \
-	static void CONCAT2(NAME, _ep_rx_)   (void) { usb_spi_rx   (&NAME); } \
-	static void CONCAT2(NAME, _ep_event_)(enum usb_ep_event evt)	\
-	{								\
-		usb_spi_event(&NAME, evt);				\
-	}								\
-	USB_DECLARE_EP(ENDPOINT,					\
-		       CONCAT2(NAME, _ep_tx_),				\
-		       CONCAT2(NAME, _ep_rx_),				\
-		       CONCAT2(NAME, _ep_event_));			\
-	static int CONCAT2(NAME, _interface_)(usb_uint *rx_buf,		\
-					      usb_uint *tx_buf)		\
-	{ return usb_spi_interface(&NAME, rx_buf, tx_buf); }		\
-	USB_DECLARE_IFACE(INTERFACE,					\
-			  CONCAT2(NAME, _interface_));			\
-	static void CONCAT2(NAME, _deferred_)(void)			\
-	{ usb_spi_deferred(&NAME); }
+		.spi_read_ctx.buffer = (uint8_t *)CONCAT2(NAME, _buffer_),  \
+	};                                                                  \
+	struct usb_spi_config const NAME = {                                \
+		.state = &CONCAT2(NAME, _state_),                           \
+		.interface = INTERFACE,                                     \
+		.endpoint = ENDPOINT,                                       \
+		.deferred = &CONCAT2(NAME, _deferred__data),                \
+		.ep_rx_ram = CONCAT2(NAME, _ep_rx_buffer_),                 \
+		.ep_tx_ram = CONCAT2(NAME, _ep_tx_buffer_),                 \
+		.flags = FLAGS,                                             \
+	};                                                                  \
+	const struct usb_interface_descriptor USB_IFACE_DESC(INTERFACE) = { \
+		.bLength = USB_DT_INTERFACE_SIZE,                           \
+		.bDescriptorType = USB_DT_INTERFACE,                        \
+		.bInterfaceNumber = INTERFACE,                              \
+		.bAlternateSetting = 0,                                     \
+		.bNumEndpoints = 2,                                         \
+		.bInterfaceClass = USB_CLASS_VENDOR_SPEC,                   \
+		.bInterfaceSubClass = USB_SUBCLASS_GOOGLE_SPI,              \
+		.bInterfaceProtocol = USB_PROTOCOL_GOOGLE_SPI,              \
+		.iInterface = USB_STR_SPI_NAME,                             \
+	};                                                                  \
+	const struct usb_endpoint_descriptor USB_EP_DESC(INTERFACE, 0) = {  \
+		.bLength = USB_DT_ENDPOINT_SIZE,                            \
+		.bDescriptorType = USB_DT_ENDPOINT,                         \
+		.bEndpointAddress = 0x80 | ENDPOINT,                        \
+		.bmAttributes = 0x02 /* Bulk IN */,                         \
+		.wMaxPacketSize = USB_MAX_PACKET_SIZE,                      \
+		.bInterval = 10,                                            \
+	};                                                                  \
+	const struct usb_endpoint_descriptor USB_EP_DESC(INTERFACE, 1) = {  \
+		.bLength = USB_DT_ENDPOINT_SIZE,                            \
+		.bDescriptorType = USB_DT_ENDPOINT,                         \
+		.bEndpointAddress = ENDPOINT,                               \
+		.bmAttributes = 0x02 /* Bulk OUT */,                        \
+		.wMaxPacketSize = USB_MAX_PACKET_SIZE,                      \
+		.bInterval = 0,                                             \
+	};                                                                  \
+	static void CONCAT2(NAME, _ep_tx_)(void)                            \
+	{                                                                   \
+		usb_spi_tx(&NAME);                                          \
+	}                                                                   \
+	static void CONCAT2(NAME, _ep_rx_)(void)                            \
+	{                                                                   \
+		usb_spi_rx(&NAME);                                          \
+	}                                                                   \
+	static void CONCAT2(NAME, _ep_event_)(enum usb_ep_event evt)        \
+	{                                                                   \
+		usb_spi_event(&NAME, evt);                                  \
+	}                                                                   \
+	USB_DECLARE_EP(ENDPOINT, CONCAT2(NAME, _ep_tx_),                    \
+		       CONCAT2(NAME, _ep_rx_), CONCAT2(NAME, _ep_event_));  \
+	static int CONCAT2(NAME, _interface_)(usb_uint * rx_buf,            \
+					      usb_uint * tx_buf)            \
+	{                                                                   \
+		return usb_spi_interface(&NAME, rx_buf, tx_buf);            \
+	}                                                                   \
+	USB_DECLARE_IFACE(INTERFACE, CONCAT2(NAME, _interface_));           \
+	static void CONCAT2(NAME, _deferred_)(void)                         \
+	{                                                                   \
+		usb_spi_deferred(&NAME);                                    \
+	}
 
 /*
  * Handle SPI request in a deferred callback.
@@ -636,9 +640,8 @@ void usb_spi_enable(struct usb_spi_config const *config, int enabled);
 void usb_spi_tx(struct usb_spi_config const *config);
 void usb_spi_rx(struct usb_spi_config const *config);
 void usb_spi_event(struct usb_spi_config const *config, enum usb_ep_event evt);
-int  usb_spi_interface(struct usb_spi_config const *config,
-		       usb_uint *rx_buf,
-		       usb_uint *tx_buf);
+int usb_spi_interface(struct usb_spi_config const *config, usb_uint *rx_buf,
+		      usb_uint *tx_buf);
 
 /*
  * These functions should be implemented by the board to provide any board