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, 27 insertions, 26 deletions

diff --git a/util/comm-i2c.c b/util/comm-i2c.c
index d76749fbe5..1548beaaa2 100644
--- a/util/comm-i2c.c
+++ b/util/comm-i2c.c
@@ -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.
  */
@@ -27,7 +27,7 @@
 
 #define I2C_ADAPTER_NODE "/sys/class/i2c-adapter/i2c-%d/%d-%04x/name"
 #define I2C_ADAPTER_NAME "cros-ec-i2c"
-#define I2C_MAX_ADAPTER  32
+#define I2C_MAX_ADAPTER 32
 #define I2C_NODE "/dev/i2c-%d"
 
 #ifdef DEBUG
@@ -62,9 +62,8 @@ static void dump_buffer(const uint8_t *data, int length)
  * Sends a command to the EC (protocol v3). Returns the command status code
  * (>= 0), or a negative EC_RES_* value on error.
  */
-static int ec_command_i2c_3(int command, int version,
-			    const void *outdata, int outsize,
-			    void *indata, int insize)
+static int ec_command_i2c_3(int command, int version, const void *outdata,
+			    int outsize, void *indata, int insize)
 {
 	int ret = -EC_RES_ERROR;
 	int error;
@@ -87,8 +86,8 @@ static int ec_command_i2c_3(int command, int version,
 			insize, ec_max_insize);
 		return -EC_RES_ERROR;
 	}
-	req_len = I2C_REQUEST_HEADER_SIZE + sizeof(struct ec_host_request)
-		+ outsize;
+	req_len = I2C_REQUEST_HEADER_SIZE + sizeof(struct ec_host_request) +
+		  outsize;
 	req_buf = (uint8_t *)(calloc(1, req_len));
 	if (!req_buf)
 		goto done;
@@ -102,8 +101,8 @@ static int ec_command_i2c_3(int command, int version,
 	req->reserved = 0;
 	req->data_len = outsize;
 
-	memcpy(&req_buf[I2C_REQUEST_HEADER_SIZE
-			+ sizeof(struct ec_host_request)],
+	memcpy(&req_buf[I2C_REQUEST_HEADER_SIZE +
+			sizeof(struct ec_host_request)],
 	       outdata, outsize);
 
 	req->checksum =
@@ -115,8 +114,8 @@ static int ec_command_i2c_3(int command, int version,
 	i2c_msg.len = req_len;
 	i2c_msg.buf = req_buf;
 
-	resp_len = I2C_RESPONSE_HEADER_SIZE + sizeof(struct ec_host_response)
-		+ insize;
+	resp_len = I2C_RESPONSE_HEADER_SIZE + sizeof(struct ec_host_response) +
+		   insize;
 	resp_buf = (uint8_t *)(calloc(1, resp_len));
 	if (!resp_buf)
 		goto done;
@@ -135,8 +134,8 @@ static int ec_command_i2c_3(int command, int version,
 	data.nmsgs = 1;
 	error = ioctl(i2c_fd, I2C_RDWR, &data);
 	if (error < 0) {
-		fprintf(stderr, "I2C write failed: %d (err: %d, %s)\n",
-			error, errno, strerror(errno));
+		fprintf(stderr, "I2C write failed: %d (err: %d, %s)\n", error,
+			errno, strerror(errno));
 		goto done;
 	}
 
@@ -146,8 +145,8 @@ static int ec_command_i2c_3(int command, int version,
 	i2c_msg.buf = resp_buf;
 	error = ioctl(i2c_fd, I2C_RDWR, &data);
 	if (error < 0) {
-		fprintf(stderr, "I2C read failed: %d (err: %d, %s)\n",
-			error, errno, strerror(errno));
+		fprintf(stderr, "I2C read failed: %d (err: %d, %s)\n", error,
+			errno, strerror(errno));
 		goto done;
 	}
 
@@ -177,15 +176,16 @@ static int ec_command_i2c_3(int command, int version,
 		goto done;
 	}
 
-	if ((uint8_t)sum_bytes(&resp_buf[I2C_RESPONSE_HEADER_SIZE], resp_buf[1])
-			!= 0) {
+	if ((uint8_t)sum_bytes(&resp_buf[I2C_RESPONSE_HEADER_SIZE],
+			       resp_buf[1]) != 0) {
 		debug("Bad checksum on EC response.\n");
 		ret = -EC_RES_INVALID_CHECKSUM;
 		goto done;
 	}
 
-	memcpy(indata, &resp_buf[I2C_RESPONSE_HEADER_SIZE
-				 + sizeof(struct ec_host_response)],
+	memcpy(indata,
+	       &resp_buf[I2C_RESPONSE_HEADER_SIZE +
+			 sizeof(struct ec_host_response)],
 	       insize);
 
 	ret = resp->data_len;
@@ -208,7 +208,8 @@ int comm_init_i2c(int i2c_bus)
 		i = i2c_bus;
 
 		if (i >= I2C_MAX_ADAPTER) {
-			fprintf(stderr, "Invalid I2C bus number %d. (The highest possible bus number is %d.)\n",
+			fprintf(stderr,
+				"Invalid I2C bus number %d. (The highest possible bus number is %d.)\n",
 				i, I2C_MAX_ADAPTER);
 			return -1;
 		}
@@ -217,8 +218,8 @@ int comm_init_i2c(int i2c_bus)
 		for (i = 0; i < I2C_MAX_ADAPTER; i++) {
 			FILE *f;
 
-			if (asprintf(&file_path, I2C_ADAPTER_NODE,
-				     i, i, EC_I2C_ADDR) < 0)
+			if (asprintf(&file_path, I2C_ADAPTER_NODE, i, i,
+				     EC_I2C_ADDR) < 0)
 				return -1;
 			f = fopen(file_path, "r");
 			if (f) {
@@ -248,10 +249,10 @@ int comm_init_i2c(int i2c_bus)
 	free(file_path);
 
 	ec_command_proto = ec_command_i2c_3;
-	ec_max_outsize = I2C_MAX_HOST_PACKET_SIZE - I2C_REQUEST_HEADER_SIZE
-		- sizeof(struct ec_host_request);
-	ec_max_insize = I2C_MAX_HOST_PACKET_SIZE - I2C_RESPONSE_HEADER_SIZE
-		- sizeof(struct ec_host_response);
+	ec_max_outsize = I2C_MAX_HOST_PACKET_SIZE - I2C_REQUEST_HEADER_SIZE -
+			 sizeof(struct ec_host_request);
+	ec_max_insize = I2C_MAX_HOST_PACKET_SIZE - I2C_RESPONSE_HEADER_SIZE -
+			sizeof(struct ec_host_response);
 
 	return 0;
 }