Merge remote-tracking branch cros/main into firmware-nissa-15217.B-mainfirmware-nissa-15217.126.B-main

Generated by: ./util/update_release_branch.py --zephyr --board nissa firmware-
nissa-15217.B-main

Relevant changes:

git log --oneline dce247e979..0849542c72 -- zephyr/program/nissa
util/getversion.sh

0849542c72 zephyr: add sleep property for keyboard factory test
5825d894b9 nissa: disable PLATFORM_EC_TCPC_INTERRUPT
25a400690f yavikso: Update fan table version 3
9263f14536 zephyr: remove shi node and add references to shi0
b40c6970d3 Craask: Charger limit for 65w adapter
6fd2d3ea6c zephyr: add comments for tcpc driver
00986ffb1c zephyr: move usbc interrupt handler to shim
2508094b14 yaviks: reduce RW image size (64KB)
55b6aaf52f yaviks: enable keyboard factory test
4786d1eac6 nissa: Add ocpc init function to Nissa boards
2ae1083638 zephyr: cros_kb: set KSI/KSO kbs mode by pinctrl driver
d415f4665a yaviks: Fix OCPC Vsys overshooting
93f9d42a7c zephyr: config: drop few more redundant options

BRANCH=None
BUG=b:254148652 b:260762509 b:265220075 b:268273712 b:265763662
BUG=b:253557900 b:254148652 b:269212593 b:267404783 b:262352202
TEST=`make -j buildall`

Force-Relevant-Builds: all
Change-Id: I195dd82af114180b611f9afd1465a69f7f43d417
Signed-off-by: Peter Marheine <pmarheine@chromium.org>

1 files changed, 36 insertions, 3 deletions

diff --git a/test/usb_pe_drp_old.c b/test/usb_pe_drp_old.c
index 4ea07c1ec9..c352760d1d 100644
--- a/test/usb_pe_drp_old.c
+++ b/test/usb_pe_drp_old.c
@@ -83,11 +83,40 @@ void pd_set_error_recovery(int port)
 {
 }
 
+/* Skip discovery (and the corresponding DRS and VCS sequences) by default. A
+ * test may enable this to allow those sequences to run.
+ */
+static bool discovery_enabled;
+
+__override bool port_discovery_dr_swap_policy(int port, enum pd_data_role dr,
+					      bool dr_swap_flag)
+{
+	if (!discovery_enabled)
+		return false;
+
+	if (dr_swap_flag && dr == PD_ROLE_UFP)
+		return true;
+
+	return false;
+}
+
+__override bool port_discovery_vconn_swap_policy(int port, bool vconn_swap_flag)
+{
+	if (!discovery_enabled)
+		return false;
+
+	if (IS_ENABLED(CONFIG_USBC_VCONN) && vconn_swap_flag &&
+	    !tc_is_vconn_src(port) && tc_check_vconn_swap(port))
+		return true;
+
+	return false;
+}
+
 test_static void setup_source(void)
 {
 	/* Start PE. */
 	task_wait_event(10 * MSEC);
-	pe_set_flag(PORT0, PE_FLAGS_VDM_SETUP_DONE);
+	pd_disable_discovery(PORT0);
 	pe_set_flag(PORT0, PE_FLAGS_EXPLICIT_CONTRACT);
 	/* As long as we're hacking our way to ready, clear any DPM requests */
 	pe_clr_dpm_requests(PORT0);
@@ -103,7 +132,7 @@ test_static void setup_sink(void)
 	task_wait_event(10 * MSEC);
 	pd_comm_enable(PORT0, 1);
 	task_wait_event(10 * MSEC);
-	pe_set_flag(PORT0, PE_FLAGS_VDM_SETUP_DONE);
+	pd_disable_discovery(PORT0);
 	pe_set_flag(PORT0, PE_FLAGS_EXPLICIT_CONTRACT);
 	/* As long as we're hacking our way to ready, clear any DPM requests */
 	pe_clr_dpm_requests(PORT0);
@@ -131,7 +160,7 @@ static int test_pe_frs(void)
 	 * background tasks (ex. discovery) aren't running.
 	 */
 	tc_prs_src_snk_assert_rd(PORT0);
-	pe_set_flag(PORT0, PE_FLAGS_VDM_SETUP_DONE);
+	pd_disable_discovery(PORT0);
 	pe_set_flag(PORT0, PE_FLAGS_EXPLICIT_CONTRACT);
 	pe_clr_dpm_requests(PORT0);
 	set_state_pe(PORT0, PE_SNK_READY);
@@ -332,6 +361,8 @@ test_static int test_prl_is_busy(enum pd_power_role pr)
 {
 	int ready_state;
 
+	discovery_enabled = true;
+
 	if (pr == PD_ROLE_SOURCE)
 		ready_state = PE_SRC_READY;
 	else
@@ -363,6 +394,8 @@ test_static int test_prl_is_busy(enum pd_power_role pr)
 	 */
 	TEST_ASSERT(get_state_pe(PORT0) != ready_state);
 
+	discovery_enabled = false;
+
 	return EC_SUCCESS;
 }