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, 53 insertions, 45 deletions

diff --git a/include/usb_pd_vdo.h b/include/usb_pd_vdo.h
index 9f6e35e117..ed1bc490f1 100644
--- a/include/usb_pd_vdo.h
+++ b/include/usb_pd_vdo.h
@@ -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.
  *
@@ -134,20 +134,20 @@ struct product_vdo {
 #define PD_PRODUCT_IS_TBT3(vdo) ((vdo) >> 3 & BIT(0))
 
 /* UFP VDO Version 1.2; update the value when UFP VDO version changes */
-#define VDO_UFP1(cap, ctype, alt, speed)			\
-	((0x2) << 29 | ((cap) & 0xf) << 24			\
-	| ((ctype) & 0x3) << 22 | ((alt) & 0x7) << 3 | ((speed) & 0x7))
+#define VDO_UFP1(cap, ctype, alt, speed)                         \
+	((0x2) << 29 | ((cap)&0xf) << 24 | ((ctype)&0x3) << 22 | \
+	 ((alt)&0x7) << 3 | ((speed)&0x7))
 
 /* UFP VDO 1 Alternate Modes */
-#define VDO_UFP1_ALT_MODE_TBT3           BIT(0)
-#define VDO_UFP1_ALT_MODE_RECONFIGURE    BIT(1)
+#define VDO_UFP1_ALT_MODE_TBT3 BIT(0)
+#define VDO_UFP1_ALT_MODE_RECONFIGURE BIT(1)
 #define VDO_UFP1_ALT_MODE_NO_RECONFIGURE BIT(2)
 
 /* UFP VDO 1 Device Capability */
-#define VDO_UFP1_CAPABILITY_USB20           BIT(0)
+#define VDO_UFP1_CAPABILITY_USB20 BIT(0)
 #define VDO_UFP1_CAPABILITY_USB20_BILLBOARD BIT(1)
-#define VDO_UFP1_CAPABILITY_USB32           BIT(2)
-#define VDO_UFP1_CAPABILITY_USB4            BIT(3)
+#define VDO_UFP1_CAPABILITY_USB32 BIT(2)
+#define VDO_UFP1_CAPABILITY_USB4 BIT(3)
 /*****************************************************************************/
 /*
  * Table 6-37 DFP VDO
@@ -170,15 +170,13 @@ struct product_vdo {
  * <4:0>   : Port number
  */
 /* DFP VDO Version 1.1; update the value when DFP VDO version changes */
-#define VDO_DFP(cap, ctype, port)			\
-	((0x1) << 29 | ((cap) & 0x7) << 24	\
-	| ((ctype) & 0x3) << 22 | ((port) & 0x1f))
+#define VDO_DFP(cap, ctype, port) \
+	((0x1) << 29 | ((cap)&0x7) << 24 | ((ctype)&0x3) << 22 | ((port)&0x1f))
 
 /* DFP VDO Host Capability */
 #define VDO_DFP_HOST_CAPABILITY_USB20 BIT(0)
 #define VDO_DFP_HOST_CAPABILITY_USB32 BIT(1)
-#define VDO_DFP_HOST_CAPABILITY_USB4  BIT(2)
-
+#define VDO_DFP_HOST_CAPABILITY_USB4 BIT(2)
 
 /*****************************************************************************/
 /*
@@ -246,6 +244,19 @@ struct product_vdo {
  * Table 5-1 Certified Cables Where USB4-compatible Operation is Expected
  * This table lists the USB-C cables those support USB4
  */
+enum usb_rev30_plug {
+	USB_REV30_TYPE_C = 2,
+	USB_REV30_CAPTIVE = 3,
+};
+
+enum usb_rev30_latency {
+	USB_REV30_LATENCY_1m = 1,
+	USB_REV30_LATENCY_2m = 2,
+	USB_REV30_LATENCY_3m = 3,
+	USB_REV30_LATENCY_4m = 4,
+	USB_REV30_LATENCY_5m = 5,
+	USB_REV30_LATENCY_6m = 6,
+};
 
 enum usb_rev30_ss {
 	USB_R30_SS_U2_ONLY,
@@ -267,7 +278,7 @@ enum usb_vbus_cur {
 
 union passive_cable_vdo_rev30 {
 	struct {
-		enum usb_rev30_ss ss: 3;
+		enum usb_rev30_ss ss : 3;
 		uint32_t reserved0 : 2;
 		enum usb_vbus_cur vbus_cur : 2;
 		uint32_t reserved1 : 2;
@@ -284,6 +295,11 @@ union passive_cable_vdo_rev30 {
 	uint32_t raw_value;
 };
 
+/* Macro passive VDO generator */
+#define VDO_REV30_PASSIVE(ss, vbus_cur, latency, plug)                \
+	((ss & 0x7) | (vbus_cur & 0x3) << 5 | (latency & 0xf) << 13 | \
+	 (plug & 0x3) << 18)
+
 /*****************************************************************************/
 /*
  * Table 6-39 Active Cable VDO 1
@@ -355,7 +371,7 @@ enum vdo_version {
 
 union active_cable_vdo1_rev30 {
 	struct {
-		enum usb_rev30_ss ss: 3;
+		enum usb_rev30_ss ss : 3;
 		uint32_t sop_p_p : 1;
 		uint32_t vbus_cable : 1;
 		enum usb_vbus_cur vbus_cur : 2;
@@ -541,17 +557,11 @@ union active_cable_vdo2_rev30 {
  *           1b – the VPD supports Charge Through
  *           0b – the VPD does not support Charge Through
  */
-#define VDO_VPD(hw, fw, vbus, ctc, vbusz, gndz, cts)  \
-	(((hw) & 0xf) << 28 | ((fw) & 0xf) << 24 \
-	 | ((vbus) & 0x3) << 15                  \
-	 | ((ctc) & 0x1) << 14			 \
-	 | ((vbusz) & 0x3f) << 7                 \
-	 | ((gndz) & 0x3f) << 1 | (cts))
-
-enum vpd_ctc_support {
-	VPD_CT_CURRENT_3A,
-	VPD_CT_CURRENT_5A
-};
+#define VDO_VPD(hw, fw, vbus, ctc, vbusz, gndz, cts)                \
+	(((hw)&0xf) << 28 | ((fw)&0xf) << 24 | ((vbus)&0x3) << 15 | \
+	 ((ctc)&0x1) << 14 | ((vbusz)&0x3f) << 7 | ((gndz)&0x3f) << 1 | (cts))
+
+enum vpd_ctc_support { VPD_CT_CURRENT_3A, VPD_CT_CURRENT_5A };
 
 enum vpd_vbus {
 	VPD_MAX_VBUS_20V,
@@ -566,12 +576,12 @@ enum vpd_cts_support {
 };
 
 #define VPD_VDO_MAX_VBUS(vdo) (((vdo) >> 15) & 0x3)
-#define VPD_VDO_CURRENT(vdo)  (((vdo) >> 14) & 1)
+#define VPD_VDO_CURRENT(vdo) (((vdo) >> 14) & 1)
 #define VPD_VDO_VBUS_IMP(vdo) (((vdo) >> 7) & 0x3f)
-#define VPD_VDO_GND_IMP(vdo)  (((vdo) >> 1) & 0x3f)
-#define VPD_VDO_CTS(vdo)      ((vdo) & 1)
-#define VPD_VBUS_IMP(mo)      ((mo + 1) >> 1)
-#define VPD_GND_IMP(mo)       (mo)
+#define VPD_VDO_GND_IMP(vdo) (((vdo) >> 1) & 0x3f)
+#define VPD_VDO_CTS(vdo) ((vdo)&1)
+#define VPD_VBUS_IMP(mo) ((mo + 1) >> 1)
+#define VPD_GND_IMP(mo) (mo)
 
 /*
  * ############################################################################
@@ -625,11 +635,10 @@ enum idh_ptype {
  * - Table 6-29 ID Header VDO PD spec 3.0 version 2.0 and
  * - Table 6-23 ID Header VDO PD spec 2.0 version 1.3.
  */
-#define IS_PD_IDH_UFP_PTYPE(ptype) (ptype == IDH_PTYPE_HUB || \
-				    ptype == IDH_PTYPE_PERIPH || \
-				    ptype == IDH_PTYPE_PSD || \
-				    ptype == IDH_PTYPE_AMA ||  \
-				    ptype == IDH_PTYPE_VPD)
+#define IS_PD_IDH_UFP_PTYPE(ptype)                              \
+	(ptype == IDH_PTYPE_HUB || ptype == IDH_PTYPE_PERIPH || \
+	 ptype == IDH_PTYPE_PSD || ptype == IDH_PTYPE_AMA ||    \
+	 ptype == IDH_PTYPE_VPD)
 
 struct id_header_vdo_rev20 {
 	uint16_t usb_vendor_id;
@@ -715,7 +724,7 @@ enum usb_rev20_ss {
 
 union passive_cable_vdo_rev20 {
 	struct {
-		enum usb_rev20_ss ss: 3;
+		enum usb_rev20_ss ss : 3;
 		uint32_t reserved0 : 1;
 		uint32_t vbus_cable : 1;
 		enum usb_vbus_cur vbus_cur : 2;
@@ -798,7 +807,7 @@ union passive_cable_vdo_rev20 {
  */
 union active_cable_vdo_rev20 {
 	struct {
-		enum usb_rev20_ss ss: 3;
+		enum usb_rev20_ss ss : 3;
 		uint32_t sop_p_p : 1;
 		uint32_t vbus_cable : 1;
 		enum usb_vbus_cur vbus_cur : 2;
@@ -866,14 +875,13 @@ union active_cable_vdo_rev20 {
  *           011b = [USB 2.0] billboard only
  *           100b..111b = Reserved, Shall Not be used
  */
-#define VDO_AMA(hw, fw, tx1d, tx2d, rx1d, rx2d, vcpwr, vcr, vbr, usbss) \
-	(((hw) & 0x7) << 28 | ((fw) & 0x7) << 24			\
-	 | (tx1d) << 11 | (tx2d) << 10 | (rx1d) << 9 | (rx2d) << 8	\
-	 | ((vcpwr) & 0x3) << 5 | (vcr) << 4 | (vbr) << 3		\
-	 | ((usbss) & 0x7))
+#define VDO_AMA(hw, fw, tx1d, tx2d, rx1d, rx2d, vcpwr, vcr, vbr, usbss)      \
+	(((hw)&0x7) << 28 | ((fw)&0x7) << 24 | (tx1d) << 11 | (tx2d) << 10 | \
+	 (rx1d) << 9 | (rx2d) << 8 | ((vcpwr)&0x3) << 5 | (vcr) << 4 |       \
+	 (vbr) << 3 | ((usbss)&0x7))
 
 #define PD_VDO_AMA_VCONN_REQ(vdo) (((vdo) >> 4) & 1)
-#define PD_VDO_AMA_VBUS_REQ(vdo)  (((vdo) >> 3) & 1)
+#define PD_VDO_AMA_VBUS_REQ(vdo) (((vdo) >> 3) & 1)
 
 enum ama_usb_ss {
 	AMA_USBSS_U2_ONLY,