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, 94 insertions, 74 deletions

diff --git a/driver/fingerprint/fpc/libfp/fpc_private.h b/driver/fingerprint/fpc/libfp/fpc_private.h
index bd9ff711b6..19ac3b7a13 100644
--- a/driver/fingerprint/fpc/libfp/fpc_private.h
+++ b/driver/fingerprint/fpc/libfp/fpc_private.h
@@ -1,4 +1,4 @@
-/* Copyright 2018 The Chromium OS Authors. All rights reserved.
+/* Copyright 2018 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -10,83 +10,103 @@
 
 /* External error codes from FPC's sensor library */
 enum fpc_error_code_external {
-	FPC_ERROR_NONE                        = 0,
-	FPC_ERROR_NOT_FOUND                   = 1,
-	FPC_ERROR_CAN_BE_USED_2               = 2,
-	FPC_ERROR_CAN_BE_USED_3               = 3,
-	FPC_ERROR_CAN_BE_USED_4               = 4,
-	FPC_ERROR_PAL                         = 5,
-	FPC_ERROR_IO                          = 6,
-	FPC_ERROR_CANCELLED                   = 7,
-	FPC_ERROR_UNKNOWN                     = 8,
-	FPC_ERROR_MEMORY                      = 9,
-	FPC_ERROR_PARAMETER                   = 10,
-	FPC_ERROR_TEST_FAILED                 = 11,
-	FPC_ERROR_TIMEDOUT                    = 12,
-	FPC_ERROR_SENSOR                      = 13,
-	FPC_ERROR_SPI                         = 14,
-	FPC_ERROR_NOT_SUPPORTED               = 15,
-	FPC_ERROR_OTP                         = 16,
-	FPC_ERROR_STATE                       = 17,
-	FPC_ERROR_PN                          = 18,
-	FPC_ERROR_DEAD_PIXELS                 = 19,
-	FPC_ERROR_TEMPLATE_CORRUPTED          = 20,
-	FPC_ERROR_CRC                         = 21,
-	FPC_ERROR_STORAGE                     = 22, /**< Errors related to storage                  **/
-	FPC_ERROR_MAXIMUM_REACHED             = 23, /**< The allowed maximum has been reached       **/
-	FPC_ERROR_MINIMUM_NOT_REACHED         = 24, /**< The required minimum was not reached       **/
-	FPC_ERROR_SENSOR_LOW_COVERAGE         = 25, /**< Minimum sensor coverage was not reached    **/
-	FPC_ERROR_SENSOR_LOW_QUALITY          = 26, /**< Sensor image is considered low quality     **/
-	FPC_ERROR_SENSOR_FINGER_NOT_STABLE    = 27, /**< Finger was not stable during image capture **/
+	FPC_ERROR_NONE = 0,
+	FPC_ERROR_NOT_FOUND = 1,
+	FPC_ERROR_CAN_BE_USED_2 = 2,
+	FPC_ERROR_CAN_BE_USED_3 = 3,
+	FPC_ERROR_CAN_BE_USED_4 = 4,
+	FPC_ERROR_PAL = 5,
+	FPC_ERROR_IO = 6,
+	FPC_ERROR_CANCELLED = 7,
+	FPC_ERROR_UNKNOWN = 8,
+	FPC_ERROR_MEMORY = 9,
+	FPC_ERROR_PARAMETER = 10,
+	FPC_ERROR_TEST_FAILED = 11,
+	FPC_ERROR_TIMEDOUT = 12,
+	FPC_ERROR_SENSOR = 13,
+	FPC_ERROR_SPI = 14,
+	FPC_ERROR_NOT_SUPPORTED = 15,
+	FPC_ERROR_OTP = 16,
+	FPC_ERROR_STATE = 17,
+	FPC_ERROR_PN = 18,
+	FPC_ERROR_DEAD_PIXELS = 19,
+	FPC_ERROR_TEMPLATE_CORRUPTED = 20,
+	FPC_ERROR_CRC = 21,
+	FPC_ERROR_STORAGE = 22, /**< Errors related to storage **/
+	FPC_ERROR_MAXIMUM_REACHED = 23, /**< The allowed maximum has been
+					   reached       **/
+	FPC_ERROR_MINIMUM_NOT_REACHED = 24, /**< The required minimum was not
+					       reached       **/
+	FPC_ERROR_SENSOR_LOW_COVERAGE = 25, /**< Minimum sensor coverage was not
+					       reached    **/
+	FPC_ERROR_SENSOR_LOW_QUALITY = 26, /**< Sensor image is considered low
+					      quality     **/
+	FPC_ERROR_SENSOR_FINGER_NOT_STABLE = 27, /**< Finger was not stable
+						    during image capture **/
 };
 
 /* Internal error codes from FPC's sensor library */
 enum fpc_error_code_internal {
-	FPC_ERROR_INTERNAL_0  = 0,  /* Indicates that no internal code was set.                         */
-	FPC_ERROR_INTERNAL_1  = 1,  /* Not supported by sensor.                                         */
-	FPC_ERROR_INTERNAL_2  = 2,  /* Sensor got a NULL response (from other module).                  */
-	FPC_ERROR_INTERNAL_3  = 3,  /* Runtime config not supported by firmware.                        */
-	FPC_ERROR_INTERNAL_4  = 4,  /* CAC has not been created.                                        */
-	FPC_ERROR_INTERNAL_5  = 5,  /* CAC returned an error to the sensor.                             */
-	FPC_ERROR_INTERNAL_6  = 6,  /* CAC fasttap image capture failed.                                */
-	FPC_ERROR_INTERNAL_7  = 7,  /* CAC fasttap image capture failed.                                */
-	FPC_ERROR_INTERNAL_8  = 8,  /* CAC Simple image capture failed.                                 */
-	FPC_ERROR_INTERNAL_9  = 9,  /* CAC custom image capture failed.                                 */
-	FPC_ERROR_INTERNAL_10 = 10, /* CAC MQT image capture failed.                                    */
-	FPC_ERROR_INTERNAL_11 = 11, /* CAC PN image capture failed.                                     */
-	FPC_ERROR_INTERNAL_12 = 12, /* Reading CAC context size.                                        */
-	FPC_ERROR_INTERNAL_13 = 13, /* Reading CAC context size.                                        */
-	FPC_ERROR_INTERNAL_14 = 14, /* Sensor context invalid.                                          */
-	FPC_ERROR_INTERNAL_15 = 15, /* Buffer reference is invalid.                                     */
-	FPC_ERROR_INTERNAL_16 = 16, /* Buffer size reference is invalid.                                */
-	FPC_ERROR_INTERNAL_17 = 17, /* Image data reference is invalid.                                 */
-	FPC_ERROR_INTERNAL_18 = 18, /* Capture type specified is invalid.                               */
-	FPC_ERROR_INTERNAL_19 = 19, /* Capture config specified is invalid.                             */
-	FPC_ERROR_INTERNAL_20 = 20, /* Sensor type in hw desc could not be extracted.                   */
-	FPC_ERROR_INTERNAL_21 = 21, /* Failed to create BNC component.                                  */
-	FPC_ERROR_INTERNAL_22 = 22, /* BN calibration failed.                                           */
-	FPC_ERROR_INTERNAL_23 = 23, /* BN memory allocation failed.                                     */
-	FPC_ERROR_INTERNAL_24 = 24, /* Companion type in hw desc could not be extracted.                */
-	FPC_ERROR_INTERNAL_25 = 25, /* Coating type in hw desc could not be extracted.                  */
-	FPC_ERROR_INTERNAL_26 = 26, /* Sensor mode type is invalid.                                     */
-	FPC_ERROR_INTERNAL_27 = 27, /* Wrong Sensor state in OTP read.                                  */
-	FPC_ERROR_INTERNAL_28 = 28, /* Mismatch of register size in overlay vs rrs.                     */
-	FPC_ERROR_INTERNAL_29 = 29, /* Checkerboard capture failed.                                     */
-	FPC_ERROR_INTERNAL_30 = 30, /* Error converting to fpc_image in dp calibration.                 */
-	FPC_ERROR_INTERNAL_31 = 31, /* Failed to capture reset pixel image.                             */
-	FPC_ERROR_INTERNAL_32 = 32, /* API level not support in dp calibration.                         */
-	FPC_ERROR_INTERNAL_33 = 33, /* The image data in parameter is invalid.                          */
-	FPC_ERROR_INTERNAL_34 = 34, /* PAL delay function has failed.                                   */
-	FPC_ERROR_INTERNAL_35 = 35, /* AFD sensor commad did not complete.                              */
-	FPC_ERROR_INTERNAL_36 = 36, /* AFD wrong runlevel detected after calibration.                   */
-	FPC_ERROR_INTERNAL_37 = 37, /* Wrong rrs size.                                                  */
-	FPC_ERROR_INTERNAL_38 = 38, /* There was a finger on the sensor when calibrating finger detect. */
-	FPC_ERROR_INTERNAL_39 = 39, /* The calculated calibration value is larger than max.             */
-	FPC_ERROR_INTERNAL_40 = 40, /* The sensor fifo always underflows                                */
-	FPC_ERROR_INTERNAL_41 = 41, /* The oscillator calibration resulted in a too high or low value   */
-	FPC_ERROR_INTERNAL_42 = 42, /* Sensor driver was opened with NULL configuration                 */
-	FPC_ERROR_INTERNAL_43 = 43, /* Sensor driver as opened with NULL hw descriptor                  */
-	FPC_ERROR_INTERNAL_44 = 44, /* Error occured during image drive test                            */
+	FPC_ERROR_INTERNAL_0 = 0, /* Indicates that no internal code was set. */
+	FPC_ERROR_INTERNAL_1 = 1, /* Not supported by sensor. */
+	FPC_ERROR_INTERNAL_2 = 2, /* Sensor got a NULL response (from other
+				     module).                  */
+	FPC_ERROR_INTERNAL_3 = 3, /* Runtime config not supported by firmware.
+				   */
+	FPC_ERROR_INTERNAL_4 = 4, /* CAC has not been created. */
+	FPC_ERROR_INTERNAL_5 = 5, /* CAC returned an error to the sensor. */
+	FPC_ERROR_INTERNAL_6 = 6, /* CAC fasttap image capture failed. */
+	FPC_ERROR_INTERNAL_7 = 7, /* CAC fasttap image capture failed. */
+	FPC_ERROR_INTERNAL_8 = 8, /* CAC Simple image capture failed. */
+	FPC_ERROR_INTERNAL_9 = 9, /* CAC custom image capture failed. */
+	FPC_ERROR_INTERNAL_10 = 10, /* CAC MQT image capture failed. */
+	FPC_ERROR_INTERNAL_11 = 11, /* CAC PN image capture failed. */
+	FPC_ERROR_INTERNAL_12 = 12, /* Reading CAC context size. */
+	FPC_ERROR_INTERNAL_13 = 13, /* Reading CAC context size. */
+	FPC_ERROR_INTERNAL_14 = 14, /* Sensor context invalid. */
+	FPC_ERROR_INTERNAL_15 = 15, /* Buffer reference is invalid. */
+	FPC_ERROR_INTERNAL_16 = 16, /* Buffer size reference is invalid. */
+	FPC_ERROR_INTERNAL_17 = 17, /* Image data reference is invalid. */
+	FPC_ERROR_INTERNAL_18 = 18, /* Capture type specified is invalid. */
+	FPC_ERROR_INTERNAL_19 = 19, /* Capture config specified is invalid. */
+	FPC_ERROR_INTERNAL_20 = 20, /* Sensor type in hw desc could not be
+				       extracted.                   */
+	FPC_ERROR_INTERNAL_21 = 21, /* Failed to create BNC component. */
+	FPC_ERROR_INTERNAL_22 = 22, /* BN calibration failed. */
+	FPC_ERROR_INTERNAL_23 = 23, /* BN memory allocation failed. */
+	FPC_ERROR_INTERNAL_24 = 24, /* Companion type in hw desc could not be
+				       extracted.                */
+	FPC_ERROR_INTERNAL_25 = 25, /* Coating type in hw desc could not be
+				       extracted.                  */
+	FPC_ERROR_INTERNAL_26 = 26, /* Sensor mode type is invalid. */
+	FPC_ERROR_INTERNAL_27 = 27, /* Wrong Sensor state in OTP read. */
+	FPC_ERROR_INTERNAL_28 = 28, /* Mismatch of register size in overlay vs
+				       rrs.                     */
+	FPC_ERROR_INTERNAL_29 = 29, /* Checkerboard capture failed. */
+	FPC_ERROR_INTERNAL_30 = 30, /* Error converting to fpc_image in dp
+				       calibration.                 */
+	FPC_ERROR_INTERNAL_31 = 31, /* Failed to capture reset pixel image. */
+	FPC_ERROR_INTERNAL_32 = 32, /* API level not support in dp calibration.
+				     */
+	FPC_ERROR_INTERNAL_33 = 33, /* The image data in parameter is invalid.
+				     */
+	FPC_ERROR_INTERNAL_34 = 34, /* PAL delay function has failed. */
+	FPC_ERROR_INTERNAL_35 = 35, /* AFD sensor commad did not complete. */
+	FPC_ERROR_INTERNAL_36 = 36, /* AFD wrong runlevel detected after
+				       calibration.                   */
+	FPC_ERROR_INTERNAL_37 = 37, /* Wrong rrs size. */
+	FPC_ERROR_INTERNAL_38 = 38, /* There was a finger on the sensor when
+				       calibrating finger detect. */
+	FPC_ERROR_INTERNAL_39 = 39, /* The calculated calibration value is
+				       larger than max.             */
+	FPC_ERROR_INTERNAL_40 = 40, /* The sensor fifo always underflows */
+	FPC_ERROR_INTERNAL_41 = 41, /* The oscillator calibration resulted in a
+				       too high or low value   */
+	FPC_ERROR_INTERNAL_42 = 42, /* Sensor driver was opened with NULL
+				       configuration                 */
+	FPC_ERROR_INTERNAL_43 = 43, /* Sensor driver as opened with NULL hw
+				       descriptor                  */
+	FPC_ERROR_INTERNAL_44 = 44, /* Error occured during image drive test */
 };
 
 /* FPC specific initialization function to fill their context */