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, 48 insertions, 37 deletions

diff --git a/chip/it83xx/i2c_peripheral.c b/chip/it83xx/i2c_peripheral.c
index 1590c39bca..80fea907fd 100644
--- a/chip/it83xx/i2c_peripheral.c
+++ b/chip/it83xx/i2c_peripheral.c
@@ -1,4 +1,4 @@
-/* Copyright 2019 The Chromium OS Authors. All rights reserved.
+/* Copyright 2019 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -10,13 +10,14 @@
 #include "gpio.h"
 #include "hooks.h"
 #include "i2c_peripheral.h"
+#include "printf.h"
 #include "registers.h"
 #include <stddef.h>
 #include <string.h>
 #include "task.h"
 
 /* Console output macros */
-#define CPRINTS(format, args...) cprints(CC_I2C, format, ## args)
+#define CPRINTS(format, args...) cprints(CC_I2C, format, ##args)
 
 /* The size must be a power of 2 */
 #define I2C_MAX_BUFFER_SIZE 0x100
@@ -27,10 +28,10 @@
 
 /* Store controller to peripheral data of channel D, E, F by DMA */
 static uint8_t in_data[I2C_ENHANCED_PORT_COUNT][I2C_MAX_BUFFER_SIZE]
-			__attribute__((section(".h2ram.pool.i2cslv")));
+	__attribute__((section(".h2ram.pool.i2cslv")));
 /* Store peripheral to controller data of channel D, E, F by DMA */
 static uint8_t out_data[I2C_ENHANCED_PORT_COUNT][I2C_MAX_BUFFER_SIZE]
-			__attribute__((section(".h2ram.pool.i2cslv")));
+	__attribute__((section(".h2ram.pool.i2cslv")));
 /* Store read and write data of channel A by FIFO mode */
 static uint8_t pbuffer[I2C_MAX_BUFFER_SIZE];
 
@@ -48,7 +49,7 @@ void buffer_index_reset(void)
 
 /* Data structure to define I2C peripheral control configuration. */
 struct i2c_periph_ctrl_t {
-	int irq;              /* peripheral irq */
+	int irq; /* peripheral irq */
 	/* offset from base 0x00F03500 register; -1 means unused. */
 	int offset;
 	enum clock_gate_offsets clock_gate;
@@ -57,14 +58,22 @@ struct i2c_periph_ctrl_t {
 
 /* I2C peripheral control */
 const struct i2c_periph_ctrl_t i2c_periph_ctrl[] = {
-	[IT83XX_I2C_CH_A] = {.irq = IT83XX_IRQ_SMB_A, .offset = -1,
-		.clock_gate = CGC_OFFSET_SMBA, .dma_index = -1},
-	[IT83XX_I2C_CH_D] = {.irq = IT83XX_IRQ_SMB_D, .offset = 0x180,
-		.clock_gate = CGC_OFFSET_SMBD, .dma_index = 0},
-	[IT83XX_I2C_CH_E] = {.irq = IT83XX_IRQ_SMB_E, .offset = 0x0,
-		.clock_gate = CGC_OFFSET_SMBE, .dma_index = 1},
-	[IT83XX_I2C_CH_F] = {.irq = IT83XX_IRQ_SMB_F, .offset = 0x80,
-		.clock_gate = CGC_OFFSET_SMBF, .dma_index = 2},
+	[IT83XX_I2C_CH_A] = { .irq = IT83XX_IRQ_SMB_A,
+			      .offset = -1,
+			      .clock_gate = CGC_OFFSET_SMBA,
+			      .dma_index = -1 },
+	[IT83XX_I2C_CH_D] = { .irq = IT83XX_IRQ_SMB_D,
+			      .offset = 0x180,
+			      .clock_gate = CGC_OFFSET_SMBD,
+			      .dma_index = 0 },
+	[IT83XX_I2C_CH_E] = { .irq = IT83XX_IRQ_SMB_E,
+			      .offset = 0x0,
+			      .clock_gate = CGC_OFFSET_SMBE,
+			      .dma_index = 1 },
+	[IT83XX_I2C_CH_F] = { .irq = IT83XX_IRQ_SMB_F,
+			      .offset = 0x80,
+			      .clock_gate = CGC_OFFSET_SMBF,
+			      .dma_index = 2 },
 };
 
 void i2c_peripheral_read_write_data(int port)
@@ -87,7 +96,8 @@ void i2c_peripheral_read_write_data(int port)
 				for (i = 0; i < I2C_READ_MAXFIFO_DATA; i++)
 					/* Return buffer data to controller */
 					IT83XX_SMB_SLDA =
-					pbuffer[(i + r_index) & I2C_SIZE_MASK];
+						pbuffer[(i + r_index) &
+							I2C_SIZE_MASK];
 
 				/* Index to next 16 bytes of read buffer */
 				r_index += I2C_READ_MAXFIFO_DATA;
@@ -97,9 +107,11 @@ void i2c_peripheral_read_write_data(int port)
 				/* FIFO Full */
 				if (IT83XX_SMB_SFFSTA & IT83XX_SMB_SFFFULL) {
 					for (i = 0; i < count; i++)
-				/* Get data from controller to buffer */
+						/* Get data from controller to
+						 * buffer */
 						pbuffer[(w_index + i) &
-					I2C_SIZE_MASK] = IT83XX_SMB_SLDA;
+							I2C_SIZE_MASK] =
+							IT83XX_SMB_SLDA;
 				}
 
 				/* Index to next byte of write buffer */
@@ -120,8 +132,8 @@ void i2c_peripheral_read_write_data(int port)
 			else {
 				for (i = 0; i < count; i++)
 					/* Get data from controller to buffer */
-					pbuffer[(i + w_index) &
-					I2C_SIZE_MASK] = IT83XX_SMB_SLDA;
+					pbuffer[(i + w_index) & I2C_SIZE_MASK] =
+						IT83XX_SMB_SLDA;
 			}
 
 			/* Reset read and write buffer index */
@@ -147,16 +159,15 @@ void i2c_peripheral_read_write_data(int port)
 
 		/* Interrupt pending */
 		if (IT83XX_I2C_STR(ch) & IT83XX_I2C_INTPEND) {
-
 			periph_status = IT83XX_I2C_IRQ_ST(ch);
 
 			/* Controller to read data */
 			if (periph_status & IT83XX_I2C_IDR_CLR) {
-			/*
-			 * TODO(b:129360157): Return buffer data by
-			 * "out_data" array.
-			 * Ex: Write data to buffer from 0x00 to 0xFF
-			 */
+				/*
+				 * TODO(b:129360157): Return buffer data by
+				 * "out_data" array.
+				 * Ex: Write data to buffer from 0x00 to 0xFF
+				 */
 				for (i = 0; i < I2C_MAX_BUFFER_SIZE; i++)
 					out_data[idx][i] = i;
 			}
@@ -168,13 +179,17 @@ void i2c_peripheral_read_write_data(int port)
 			/* Peripheral finish */
 			if (periph_status & IT83XX_I2C_P_CLR) {
 				if (wr_done[idx]) {
-			/*
-			 * TODO(b:129360157): Handle controller write
-			 * data by "in_data" array.
-			 */
-					CPRINTS("WData: %ph",
+					char str_buf[hex_str_buf_size(
+						I2C_MAX_BUFFER_SIZE)];
+					/*
+					 * TODO(b:129360157): Handle controller
+					 * write data by "in_data" array.
+					 */
+					snprintf_hex_buffer(
+						str_buf, sizeof(str_buf),
 						HEX_BUF(in_data[idx],
 							I2C_MAX_BUFFER_SIZE));
+					CPRINTS("WData: %s", str_buf);
 					wr_done[idx] = 0;
 				}
 			}
@@ -199,12 +214,10 @@ void i2c_periph_interrupt(int port)
 
 void i2c_peripheral_enable(int port, uint8_t periph_addr)
 {
-
 	clock_enable_peripheral(i2c_periph_ctrl[port].clock_gate, 0, 0);
 
 	/* I2C peripheral channel A FIFO mode */
 	if (port < I2C_STANDARD_PORT_COUNT) {
-
 		/* This field defines the SMCLK0/1/2 clock/data low timeout. */
 		IT83XX_SMB_25MS = I2C_CLK_LOW_TIMEOUT;
 
@@ -266,8 +279,8 @@ void i2c_peripheral_enable(int port, uint8_t periph_addr)
 		IT83XX_I2C_IDR(ch) = periph_addr << 1;
 
 		/* I2C interrupt enable and set acknowledge */
-		IT83XX_I2C_CTR(ch) = IT83XX_I2C_HALT |
-			IT83XX_I2C_INTEN | IT83XX_I2C_ACK;
+		IT83XX_I2C_CTR(ch) = IT83XX_I2C_HALT | IT83XX_I2C_INTEN |
+				     IT83XX_I2C_ACK;
 
 		/*
 		 * bit3 : Peripheral ID write flag
@@ -313,21 +326,19 @@ void i2c_peripheral_enable(int port, uint8_t periph_addr)
 		}
 
 		/* I2C module enable and command queue mode */
-		IT83XX_I2C_CTR1(ch) = IT83XX_I2C_COMQ_EN |
-			IT83XX_I2C_MDL_EN;
+		IT83XX_I2C_CTR1(ch) = IT83XX_I2C_COMQ_EN | IT83XX_I2C_MDL_EN;
 	}
 }
 
 static void i2c_peripheral_init(void)
 {
-	int  i, p;
+	int i, p;
 
 	/* DLM 52k~56k size select enable */
 	IT83XX_GCTRL_MCCR2 |= (1 << 4);
 
 	/* Enable I2C Peripheral function */
 	for (i = 0; i < i2c_periphs_used; i++) {
-
 		/* I2c peripheral port mapping. */
 		p = i2c_periph_ports[i].port;