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, 44 insertions, 41 deletions

diff --git a/common/usb_pd_console_cmd.c b/common/usb_pd_console_cmd.c
index 3ad1944494..23f2a27b1e 100644
--- a/common/usb_pd_console_cmd.c
+++ b/common/usb_pd_console_cmd.c
@@ -1,4 +1,4 @@
-/* Copyright 2020 The Chromium OS Authors. All rights reserved.
+/* Copyright 2020 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
@@ -23,24 +23,24 @@ static void dump_pe(int port)
 	const struct pd_discovery *disc =
 		pd_get_am_discovery(port, TCPCI_MSG_SOP);
 
-	static const char * const idh_ptype_names[]  = {
-		"UNDEF", "Hub", "Periph", "PCable", "ACable", "AMA",
-		"RSV6", "RSV7"};
-	static const char * const tx_names[] = {"SOP", "SOP'", "SOP''"};
+	static const char *const idh_ptype_names[] = { "UNDEF",	 "Hub",
+						       "Periph", "PCable",
+						       "ACable", "AMA",
+						       "RSV6",	 "RSV7" };
+	static const char *const tx_names[] = { "SOP", "SOP'", "SOP''" };
 
 	for (type = TCPCI_MSG_SOP; type < DISCOVERY_TYPE_COUNT; type++) {
 		resp = pd_get_identity_response(port, type);
 		if (pd_get_identity_discovery(port, type) != PD_DISC_COMPLETE) {
 			ccprintf("No %s identity discovered yet.\n",
-								tx_names[type]);
+				 tx_names[type]);
 			continue;
 		}
 
 		idh_ptype = resp->idh.product_type;
 		ccprintf("IDENT %s:\n", tx_names[type]);
 		ccprintf("\t[ID Header] %08x :: %s, VID:%04x\n",
-			 resp->raw_value[0],
-			 idh_ptype_names[idh_ptype],
+			 resp->raw_value[0], idh_ptype_names[idh_ptype],
 			 resp->idh.usb_vendor_id);
 
 		ccprintf("\t[Cert Stat] %08x\n", resp->cert.xid);
@@ -62,11 +62,11 @@ static void dump_pe(int port)
 		ccprintf("SVID[%d]: %04x MODES:", i, disc->svids[i].svid);
 		for (j = 0; j < disc->svids[j].mode_cnt; j++)
 			ccprintf(" [%d] %08x", j + 1,
-					disc->svids[i].mode_vdo[j]);
+				 disc->svids[i].mode_vdo[j]);
 		ccprintf("\n");
 
 		modep = pd_get_amode_data(port, TCPCI_MSG_SOP,
-				disc->svids[i].svid);
+					  disc->svids[i].svid);
 		if (modep) {
 			mode_caps = modep->data->mode_vdo[modep->opos - 1];
 			ccprintf("MODE[%d]: svid:%04x caps:%08x\n", modep->opos,
@@ -75,7 +75,7 @@ static void dump_pe(int port)
 	}
 }
 
-static int command_pe(int argc, char **argv)
+static int command_pe(int argc, const char **argv)
 {
 	int port;
 	char *e;
@@ -92,23 +92,21 @@ static int command_pe(int argc, char **argv)
 
 	return EC_SUCCESS;
 }
-DECLARE_CONSOLE_COMMAND(pe, command_pe,
-			"<port> dump",
-			"USB PE");
+DECLARE_CONSOLE_COMMAND(pe, command_pe, "<port> dump", "USB PE");
 #endif /* CONFIG_CMD_USB_PD_PE */
 
 #ifdef CONFIG_CMD_USB_PD_CABLE
-static const char * const cable_type[] = {
+static const char *const cable_type[] = {
 	[IDH_PTYPE_PCABLE] = "Passive",
 	[IDH_PTYPE_ACABLE] = "Active",
 };
 
-static const char * const cable_curr[] = {
+static const char *const cable_curr[] = {
 	[USB_VBUS_CUR_3A] = "3A",
 	[USB_VBUS_CUR_5A] = "5A",
 };
 
-static int command_cable(int argc, char **argv)
+static int command_cable(int argc, const char **argv)
 {
 	int port;
 	char *e;
@@ -127,8 +125,7 @@ static int command_cable(int argc, char **argv)
 	ptype = get_usb_pd_cable_type(port);
 
 	ccprintf("Cable Type: ");
-	if (ptype != IDH_PTYPE_PCABLE &&
-		ptype != IDH_PTYPE_ACABLE) {
+	if (ptype != IDH_PTYPE_PCABLE && ptype != IDH_PTYPE_ACABLE) {
 		ccprintf("Not Emark Cable\n");
 		return EC_SUCCESS;
 	}
@@ -137,8 +134,9 @@ static int command_cable(int argc, char **argv)
 	cable_rev = pd_get_rev(port, TCPCI_MSG_SOP_PRIME);
 	disc = pd_get_am_discovery(port, TCPCI_MSG_SOP_PRIME);
 	cable_mode_resp.raw_value =
-		pd_get_tbt_mode_vdo(port, TCPCI_MSG_SOP_PRIME);
-
+		IS_ENABLED(CONFIG_USB_PD_TBT_COMPAT_MODE) ?
+			pd_get_tbt_mode_vdo(port, TCPCI_MSG_SOP_PRIME) :
+			0;
 
 	/* Cable revision */
 	ccprintf("Cable Rev: %d.0\n", cable_rev + 1);
@@ -148,13 +146,15 @@ static int command_cable(int argc, char **argv)
 	 * connector type (Bit 19:18) and current handling capability bit 6:5
 	 */
 	ccprintf("Connector Type: %d\n",
-				disc->identity.product_t1.p_rev20.connector);
+		 disc->identity.product_t1.p_rev20.connector);
 
 	if (disc->identity.product_t1.p_rev20.vbus_cur) {
 		ccprintf("Cable Current: %s\n",
-		   disc->identity.product_t1.p_rev20.vbus_cur >
-		      ARRAY_SIZE(cable_curr) ? "Invalid" :
-		      cable_curr[disc->identity.product_t1.p_rev20.vbus_cur]);
+			 disc->identity.product_t1.p_rev20.vbus_cur >
+					 ARRAY_SIZE(cable_curr) ?
+				 "Invalid" :
+				 cable_curr[disc->identity.product_t1.p_rev20
+						    .vbus_cur]);
 	} else
 		ccprintf("Cable Current: Invalid\n");
 
@@ -164,7 +164,7 @@ static int command_cable(int argc, char **argv)
 	 */
 	if (ptype == IDH_PTYPE_PCABLE)
 		ccprintf("USB Superspeed Signaling support: %d\n",
-			disc->identity.product_t1.p_rev20.ss);
+			 disc->identity.product_t1.p_rev20.ss);
 
 	/*
 	 * For Rev 3.0 active cables and Rev 2.0 active and passive cables,
@@ -172,7 +172,8 @@ static int command_cable(int argc, char **argv)
 	 */
 	if (ptype == IDH_PTYPE_ACABLE)
 		ccprintf("SOP'' Controller: %s present\n",
-		      disc->identity.product_t1.a_rev20.sop_p_p ? "" : "Not");
+			 disc->identity.product_t1.a_rev20.sop_p_p ? "" :
+								     "Not");
 
 	if (cable_rev == PD_REV30) {
 		/*
@@ -180,15 +181,16 @@ static int command_cable(int argc, char **argv)
 		 * same bits 10:9.
 		 */
 		ccprintf("Max vbus voltage: %d\n",
-			20 + 10 * disc->identity.product_t1.p_rev30.vbus_max);
+			 20 + 10 * disc->identity.product_t1.p_rev30.vbus_max);
 
 		/* For Rev 3.0 Active cables */
 		if (ptype == IDH_PTYPE_ACABLE) {
 			ccprintf("SS signaling: USB_SS_GEN%u\n",
-				disc->identity.product_t2.a2_rev30.usb_gen ?
-									2 : 1);
+				 disc->identity.product_t2.a2_rev30.usb_gen ?
+					 2 :
+					 1);
 			ccprintf("Number of SS lanes supported: %u\n",
-				disc->identity.product_t2.a2_rev30.usb_lanes);
+				 disc->identity.product_t2.a2_rev30.usb_lanes);
 		}
 	}
 
@@ -196,28 +198,29 @@ static int command_cable(int argc, char **argv)
 		return EC_SUCCESS;
 
 	ccprintf("Rounded support: %s\n",
-		cable_mode_resp.tbt_rounded ==
-			TBT_GEN3_GEN4_ROUNDED_NON_ROUNDED ? "Yes" : "No");
+		 cable_mode_resp.tbt_rounded ==
+				 TBT_GEN3_GEN4_ROUNDED_NON_ROUNDED ?
+			 "Yes" :
+			 "No");
 
 	ccprintf("Optical cable: %s\n",
-		cable_mode_resp.tbt_cable == TBT_CABLE_OPTICAL ? "Yes" : "No");
+		 cable_mode_resp.tbt_cable == TBT_CABLE_OPTICAL ? "Yes" : "No");
 
 	ccprintf("Retimer support: %s\n",
-		cable_mode_resp.retimer_type == USB_RETIMER ?
-			"Yes" : "No");
+		 cable_mode_resp.retimer_type == USB_RETIMER ? "Yes" : "No");
 
 	ccprintf("Link training: %s-directional\n",
-		cable_mode_resp.lsrx_comm == BIDIR_LSRX_COMM ? "Bi" : "Uni");
+		 cable_mode_resp.lsrx_comm == BIDIR_LSRX_COMM ? "Bi" : "Uni");
 
 	ccprintf("Thunderbolt cable type: %s\n",
-		cable_mode_resp.tbt_active_passive == TBT_CABLE_ACTIVE ?
-		"Active" : "Passive");
+		 cable_mode_resp.tbt_active_passive == TBT_CABLE_ACTIVE ?
+			 "Active" :
+			 "Passive");
 
 	return EC_SUCCESS;
 }
 
-DECLARE_CONSOLE_COMMAND(pdcable, command_cable,
-			"<port>",
+DECLARE_CONSOLE_COMMAND(pdcable, command_cable, "<port>",
 			"Cable Characteristics");
 #endif /* CONFIG_CMD_USB_PD_CABLE */