]provisioning] Allow to mix in SKU specific success text

When wating for successful post personalization restart in some cases
the text printed on the device console is not static and depends on
data generted during personalization.

Modify ft_ext() prototype to accept the response structure and to
return a String Option which the host would mix in with the constant
success string when defining the expected console output.

Tested with an updated Cros image which generates dev seed report.

Signed-off-by: Vadim Bendebury <[email protected]>
(cherry picked from commit 0f19189)

Author: vbendeb-lang

sw/device/silicon_creator/manuf/extensions/BUILD.bazel

@@ -25,6 +25,7 @@ rust_library(
     srcs = ["default_ft_ext_lib.rs"],
     crate_name = "ft_ext_lib",
     deps = [
+        "@//sw/host/provisioning/util_lib",
         "@crate_index//:anyhow",
         "@crate_index//:arrayvec",
     ],

sw/device/silicon_creator/manuf/extensions/README.md

@@ -50,7 +50,7 @@ respectively:
 
 Additionally, the FT provisioning test harness provides an hook function to call
 during the certificate endorsement operation:
-`pub fn ft_ext(endorsed_cert_concat: ArrayVec<u8, 4096>) -> Result<ArrayVec<u8, 4096>>`
+`pub fn ft_ext(_response: &PersonalizeResponse) -> Result<Option<String>>`
 
 The default functions provided in this example external Bazel repo do nothing.
 However, this provides a mechanism for SKU owners / customers to develop

sw/device/silicon_creator/manuf/extensions/default_ft_ext_lib.rs

@@ -3,8 +3,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use anyhow::Result;
-use arrayvec::ArrayVec;
+use util_lib::response::PersonalizeResponse;
 
-pub fn ft_ext(endorsed_cert_concat: ArrayVec<u8, 5120>) -> Result<ArrayVec<u8, 5120>> {
-    Ok(endorsed_cert_concat)
+pub fn ft_ext(_response: &PersonalizeResponse) -> Result<Option<String>> {
+    Ok(None)
 }

sw/host/provisioning/ft_lib/src/lib.rs

@@ -491,7 +491,6 @@ fn provision_certificates(
 
     // Execute extension hook.
     let t0 = Instant::now();
-    endorsed_cert_concat = ft_ext(endorsed_cert_concat)?;
     response.stats.log_elapsed_time("perso-ft-ext", t0);
 
     // Authenticate WAS HMAC.
@@ -673,13 +672,17 @@ pub fn check_slot_b_boot_up(
 
     let error_code_msg = r"BFV:.*\r\n";
 
-    let anchor_text = if let Some(owner_anchor) = &owner_fw_success_string {
-        format!(
-            r"(?s)({}|{}|{})",
-            rom_ext_failure_msg, error_code_msg, owner_anchor
-        )
-    } else {
-        format!(r"(?s)({}|{})", rom_ext_failure_msg, error_code_msg)
+    // Optional text requried by certain SKUs.
+    let owner_ext_string = ft_ext(response)?;
+
+    // Compile the full regex anchor including possible error messages and
+    // expected owner FW messages.
+    let errors_text = format!(r"{}|{}", rom_ext_failure_msg, error_code_msg);
+    let anchor_text = match (owner_ext_string.clone(), owner_fw_success_string.clone()) {
+        (Some(x), Some(y)) => format!(r"(?s)({errors_text}|{x}.*{y})"),
+        (Some(x), None) => format!(r"(?s)({errors_text}|{x})"),
+        (None, Some(y)) => format!(r"(?s)({errors_text}|{y})"),
+        (None, None) => format!(r"(?s)({errors_text})"),
     };
 
     let result =
@@ -696,6 +699,7 @@ pub fn check_slot_b_boot_up(
         }
         Err(e) => {
             if owner_fw_success_string.is_none()
+                && owner_ext_string.is_none()
                 && matches!(
                     e.downcast_ref::<ConsoleError>(),
                     Some(ConsoleError::TimedOut)