2 files changed, 46 insertions, 2 deletions
diff --git a/include/config.h b/include/config.h
index 27afcbfb48..b94fef6eeb 100644
--- a/include/config.h
+++ b/include/config.h
@@ -1819,6 +1819,13 @@
 #undef CONFIG_RWSIG
 
 /*
+ * When RWSIG verification is performed as a task, time to wait from signature
+ * verification to an automatic jump to RW (if AP does not request the wait to
+ * be interrupted).
+ */
+#define CONFIG_RWSIG_JUMP_TIMEOUT (1000 * MSEC)
+
+/*
  * Defines what type of futility signature type should be used.
  * RWSIG should be used for new designs.
  * Old adapters use the USBPD1 futility signature type.
diff --git a/include/rwsig.h b/include/rwsig.h
index 138751d3cc..bb70077732 100644
--- a/include/rwsig.h
+++ b/include/rwsig.h
@@ -10,9 +10,46 @@
 #include "rsa.h"
 
 #ifndef __ASSEMBLER__
+#ifdef HAS_TASK_RWSIG
+/* The functions below only make sense if RWSIG task is defined. */
 
-/* Checks RW signature. */
-void check_rw_signature(void);
+/* Current status of RW signature verification */
+enum rwsig_status {
+	RWSIG_UNKNOWN = 0, /* Unknown/not started */
+	RWSIG_IN_PROGRESS,
+	RWSIG_VALID,
+	RWSIG_INVALID,
+	RWSIG_ABORTED,
+};
+
+/* Returns current rwsig verification status. */
+enum rwsig_status rwsig_get_status(void);
+
+/*
+ * Aborts current verification, also prevents RWSIG task from automatically
+ * jumping to RW.
+ * This is used by usb_updater when a RW update is required, giving it enough
+ * time to actually perform the update.
+ */
+void rwsig_abort(void);
+
+/*
+ * Tells RWSIG task to jump to RW immediately, if the signature is correct.
+ * This is used by usb_updater when no RW update is required, to speed up
+ * boot time.
+ */
+void rwsig_continue(void);
+
+#else /* !HAS_TASK_RWSIG */
+/* These functions can only be called directly if RWSIG task is not defined. */
+
+/* Checks RW signature. Returns a boolean indicating success. */
+int rwsig_check_signature(void);
+
+/* Jumps to RW, if signature is fine, returns on error (otherwise, jumps). */
+void rwsig_jump_now(void);
+
+#endif
 
 #endif /* !__ASSEMBLER__ */