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

diff --git a/include/i8042_protocol.h b/include/i8042_protocol.h
index 7e554fc03e..23f500da17 100644
--- a/include/i8042_protocol.h
+++ b/include/i8042_protocol.h
@@ -1,8 +1,12 @@
-/* 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.
  *
- * i8042 keyboard protocol constants
+ * i8042 keyboard protocol constants.
+ *
+ * See the IBM PS/2 Hardware Interface Technical Reference Manual
+ *
+ * https://archive.org/details/ps-2-hardware-interface-technical-reference-ocr/PS2HardwareInterfaceTechnicalReference-OCR/page/n371/mode/1up
  */
 
 #ifndef __CROS_EC_I8042_PROTOCOL_H
@@ -10,83 +14,52 @@
 
 /* Some commands appear more than once.  Why? */
 
-/* port 0x60 */
-#define I8042_CMD_MOUSE_1_1     0xe6
-#define I8042_CMD_MOUSE_2_1     0xe7
-#define I8042_CMD_MOUSE_RES     0xe8
-#define I8042_CMD_OK_GETID      0xe8
-#define I8042_CMD_GET_MOUSE     0xe9
-#define I8042_CMD_EX_ENABLE     0xea
-#define I8042_CMD_EX_SETLEDS    0xeb
-#define I8042_CMD_SETLEDS       0xed
-#define I8042_CMD_DIAG_ECHO     0xee
-#define I8042_CMD_GSCANSET      0xf0
-#define I8042_CMD_SSCANSET      0xf0
-#define I8042_CMD_GETID         0xf2
-#define I8042_CMD_SETREP        0xf3
-#define I8042_CMD_ENABLE        0xf4
-#define I8042_CMD_RESET_DIS     0xf5
-#define I8042_CMD_RESET_DEF     0xf6
-#define I8042_CMD_ALL_TYPEM     0xf7
-#define I8042_CMD_SETALL_MB     0xf8
-#define I8042_CMD_SETALL_MBR    0xfa
-#define I8042_CMD_SET_A_KEY_T   0xfb
-#define I8042_CMD_SET_A_KEY_MR  0xfc
-#define I8042_CMD_SET_A_KEY_M   0xfd
-#define I8042_CMD_RESET         0xff
-#define I8042_CMD_RESEND        0xfe
-
 /* port 0x64 */
-#define I8042_READ_CMD_BYTE     0x20
-#define I8042_READ_CTL_RAM      0x21
-#define I8042_READ_CTL_RAM_END  0x3f
-#define I8042_WRITE_CMD_BYTE    0x60  /* expect a byte on port 0x60 */
-#define I8042_WRITE_CTL_RAM     0x61
+#define I8042_READ_CMD_BYTE 0x20
+#define I8042_READ_CTL_RAM 0x21
+#define I8042_READ_CTL_RAM_END 0x3f
+#define I8042_WRITE_CMD_BYTE 0x60 /* expect a byte on port 0x60 */
+#define I8042_WRITE_CTL_RAM 0x61
 #define I8042_WRITE_CTL_RAM_END 0x7f
-#define I8042_ROUTE_AUX0        0x90
-#define I8042_ROUTE_AUX1        0x91
-#define I8042_ROUTE_AUX2        0x92
-#define I8042_ROUTE_AUX3        0x93
-#define I8042_ENA_PASSWORD      0xa6
-#define I8042_DIS_MOUSE         0xa7
-#define I8042_ENA_MOUSE         0xa8
-#define I8042_TEST_MOUSE        0xa9
-#define I8042_RESET_SELF_TEST   0xaa
-#define I8042_TEST_KB_PORT      0xab
-#define I8042_DIS_KB            0xad
-#define I8042_ENA_KB            0xae
-#define I8042_READ_OUTPUT_PORT  0xd0
+#define I8042_ROUTE_AUX0 0x90
+#define I8042_ROUTE_AUX1 0x91
+#define I8042_ROUTE_AUX2 0x92
+#define I8042_ROUTE_AUX3 0x93
+#define I8042_ENA_PASSWORD 0xa6
+#define I8042_DIS_MOUSE 0xa7
+#define I8042_ENA_MOUSE 0xa8
+#define I8042_TEST_MOUSE 0xa9
+#define I8042_TEST_MOUSE_NO_ERROR 0x00
+#define I8042_TEST_MOUSE_CLK_STUCK_LOW 0x01
+#define I8042_TEST_MOUSE_CLK_STUCK_HIGH 0x02
+#define I8042_TEST_MOUSE_DATA_STUCK_LOW 0x03
+#define I8042_TEST_MOUSE_DATA_STUCK_HIGH 0x04
+#define I8042_RESET_SELF_TEST 0xaa
+#define I8042_TEST_KB_PORT 0xab
+#define I8042_DIS_KB 0xad
+#define I8042_ENA_KB 0xae
+#define I8042_READ_OUTPUT_PORT 0xd0
 #define I8042_WRITE_OUTPUT_PORT 0xd1
-#define I8042_ECHO_MOUSE        0xd3  /* expect a byte on port 0x60 */
-#define I8042_SEND_TO_MOUSE     0xd4  /* expect a byte on port 0x60 */
-#define I8042_DISABLE_A20       0xdd
-#define I8042_ENABLE_A20        0xdf
-#define I8042_PULSE_START       0xf0
-#define I8042_SYSTEM_RESET      0xfe
-#define I8042_PULSE_END         0xff
+#define I8042_ECHO_MOUSE 0xd3 /* expect a byte on port 0x60 */
+#define I8042_SEND_TO_MOUSE 0xd4 /* expect a byte on port 0x60 */
+#define I8042_DISABLE_A20 0xdd
+#define I8042_ENABLE_A20 0xdf
+#define I8042_PULSE_START 0xf0
+#define I8042_SYSTEM_RESET 0xfe
+#define I8042_PULSE_END 0xff
 
 /* port 0x60 return value */
-#define I8042_RET_EMUL0         0xe0
-#define I8042_RET_EMUL1         0xe1
-#define I8042_RET_ECHO          0xee
-#define I8042_RET_RELEASE       0xf0
-#define I8042_RET_HANJA         0xf1
-#define I8042_RET_HANGEUL       0xf2
-#define I8042_RET_ACK           0xfa
-#define I8042_RET_TEST_FAIL     0xfc
-#define I8042_RET_INTERNAL_FAIL 0xfd
-#define I8042_RET_NAK           0xfe
-#define I8042_RET_ERR           0xff
+#define I8042_RET_NAK 0xfe
 
 /* port 64 - command byte bits */
-#define I8042_XLATE             BIT(6)
-#define I8042_AUX_DIS           BIT(5)
-#define I8042_KBD_DIS           BIT(4)
-#define I8042_SYS_FLAG          BIT(2)
-#define I8042_ENIRQ12           BIT(1)
-#define I8042_ENIRQ1            BIT(0)
+#define I8042_XLATE BIT(6)
+#define I8042_AUX_DIS BIT(5)
+#define I8042_KBD_DIS BIT(4)
+#define I8042_SYS_FLAG BIT(2)
+#define I8042_ENIRQ12 BIT(1)
+#define I8042_ENIRQ1 BIT(0)
 
 /* Status Flags */
-#define I8042_AUX_DATA		BIT(5)
+#define I8042_AUX_DATA BIT(5)
 
 #endif /* __CROS_EC_I8042_PROTOCOL_H */