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, 72 insertions, 60 deletions

diff --git a/zephyr/subsys/ap_pwrseq/signal_vw.c b/zephyr/subsys/ap_pwrseq/signal_vw.c
index de2756c137..0e9e4affff 100644
--- a/zephyr/subsys/ap_pwrseq/signal_vw.c
+++ b/zephyr/subsys/ap_pwrseq/signal_vw.c
@@ -1,4 +1,4 @@
-/* Copyright 2022 The Chromium OS Authors. All rights reserved.
+/* Copyright 2022 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -9,40 +9,47 @@
 
 #include "signal_vw.h"
 
-#define MY_COMPAT	intel_ap_pwrseq_vw
+#define MY_COMPAT intel_ap_pwrseq_vw
 
 #if HAS_VW_SIGNALS
 
+/*
+ * A callback must be registered on the ESPI device (for the
+ * bus events that are required to be handled) that calls
+ * power_signal_espi_cb().
+ *
+ * This registration is done in a common ESPI initialisation module so
+ * that there is no possibility of missing events.
+ */
+
 LOG_MODULE_DECLARE(ap_pwrseq, CONFIG_AP_PWRSEQ_LOG_LEVEL);
 
-#define INIT_ESPI_SIGNAL(id)					\
-{								\
-	.espi_signal = DT_STRING_UPPER_TOKEN(id, virtual_wire),	\
-	.signal = PWR_SIGNAL_ENUM(id),				\
-	.invert = DT_PROP(id, vw_invert),			\
-},
+#define INIT_ESPI_SIGNAL(id)                                            \
+	{                                                               \
+		.espi_signal = DT_STRING_UPPER_TOKEN(id, virtual_wire), \
+		.signal = PWR_SIGNAL_ENUM(id),                          \
+		.invert = DT_PROP(id, vw_invert),                       \
+	},
 
 /*
  * Struct containing the eSPI virtual wire config.
  */
 struct vw_config {
-	uint8_t espi_signal;	/* associated VW signal */
-	uint8_t signal;		/* power signal */
-	bool invert;		/* Invert the signal value */
+	uint8_t espi_signal; /* associated VW signal */
+	uint8_t signal; /* power signal */
+	bool invert; /* Invert the signal value */
 };
 
-const static struct vw_config vw_config[] = {
-DT_FOREACH_STATUS_OKAY(MY_COMPAT, INIT_ESPI_SIGNAL)
-};
+const static struct vw_config vw_config[] = { DT_FOREACH_STATUS_OKAY(
+	MY_COMPAT, INIT_ESPI_SIGNAL) };
 
 /*
  * Current signal value.
  */
 static atomic_t signal_data;
 /*
- * Mask of valid signals. If the bus is reset, this is cleared,
- * and when a signal is updated the associated bit is set to indicate
- * the signal is valid.
+ * Mask of valid signals. A signal is considered valid once an
+ * initial value has been received for it.
  */
 static atomic_t signal_valid;
 
@@ -50,36 +57,63 @@ static atomic_t signal_valid;
 
 BUILD_ASSERT(ARRAY_SIZE(vw_config) <= (sizeof(atomic_t) * 8));
 
-static void espi_handler(const struct device *dev,
-			 struct espi_callback *cb,
-			 struct espi_event event)
+/*
+ * Set the value of the VW signal, and optionally
+ * call the power signal interrupt handling.
+ */
+static void vw_set(int index, int data, bool notify)
+{
+	bool value = vw_config[index].invert ? !data : !!data;
+
+	atomic_set_bit_to(&signal_data, index, value);
+	atomic_set_bit(&signal_valid, index);
+	if (notify) {
+		power_signal_interrupt(vw_config[index].signal, value);
+	}
+}
+
+/*
+ * Update all the VW signals.
+ */
+static void vw_update_all(bool notify)
+{
+	for (int i = 0; i < ARRAY_SIZE(vw_config); i++) {
+		uint8_t vw_value;
+
+		if (espi_receive_vwire(espi_dev, vw_config[i].espi_signal,
+				       &vw_value) == 0) {
+			vw_set(i, vw_value, notify);
+		}
+	}
+}
+
+void power_signal_espi_cb(const struct device *dev, struct espi_callback *cb,
+			  struct espi_event event)
 {
-	LOG_DBG("ESPI event type 0x%x %d:%d", event.evt_type,
-		event.evt_details, event.evt_data);
+	LOG_DBG("ESPI event type 0x%x %d:%d", event.evt_type, event.evt_details,
+		event.evt_data);
 	switch (event.evt_type) {
 	default:
-		__ASSERT(0, "ESPI unknown event type: %d",
-			 event.evt_type);
+		__ASSERT(0, "ESPI unknown event type: %d", event.evt_type);
 		break;
 
-	case ESPI_BUS_RESET:
-		/*
-		 * Clear the signal valid mask.
-		 */
-		atomic_clear(&signal_valid);
+	case ESPI_BUS_EVENT_CHANNEL_READY:
+		/* Virtual wire channel status change */
+		if (event.evt_details == ESPI_CHANNEL_VWIRE) {
+			if (event.evt_data) {
+				/* If now ready, update all the signals */
+				vw_update_all(true);
+			} else {
+				/* If not ready, invalidate the signals */
+				atomic_clear(&signal_valid);
+			}
+		}
 		break;
 
 	case ESPI_BUS_EVENT_VWIRE_RECEIVED:
 		for (int i = 0; i < ARRAY_SIZE(vw_config); i++) {
 			if (event.evt_details == vw_config[i].espi_signal) {
-				bool value = vw_config[i].invert
-						? !event.evt_data
-						: !!event.evt_data;
-
-				atomic_set_bit_to(&signal_data, i, value);
-				atomic_set_bit(&signal_valid, i);
-				power_signal_interrupt(vw_config[i].signal,
-						       value);
+				vw_set(i, event.evt_data, true);
 			}
 		}
 		break;
@@ -97,34 +131,12 @@ int power_signal_vw_get(enum pwr_sig_vw vw)
 
 void power_signal_vw_init(void)
 {
-	static struct espi_callback espi_cb;
-
-	/* Assumes ESPI device is already configured. */
-
-	/* Configure handler for eSPI events */
-	espi_init_callback(&espi_cb, espi_handler,
-			   ESPI_BUS_RESET |
-			   ESPI_BUS_EVENT_VWIRE_RECEIVED);
-	espi_add_callback(espi_dev, &espi_cb);
 	/*
 	 * Check whether the bus is ready, and if so,
 	 * initialise the current values of the signals.
 	 */
 	if (espi_get_channel_status(espi_dev, ESPI_CHANNEL_VWIRE)) {
-		for (int i = 0; i < ARRAY_SIZE(vw_config); i++) {
-			uint8_t vw_value;
-
-			if (espi_receive_vwire(espi_dev,
-					   vw_config[i].espi_signal,
-					   &vw_value) == 0) {
-				atomic_set_bit_to(&signal_data, i,
-					vw_config[i].invert
-						? !vw_value
-						: !!vw_value);
-				atomic_set_bit(&signal_valid, i);
-
-			}
-		}
+		vw_update_all(false);
 	}
 }