From b8e8fd1a2757338a3b502f40e9aca442e5959f2e Mon Sep 17 00:00:00 2001 From: Denis Brockus Date: Thu, 20 Aug 2020 12:27:32 -0600 Subject: TCPMv2: Do not send GetSnkCap if FRS is not enabled GetSnkCap is only needed for FastRoleSwap BUG=none BRANCH=none TEST=PR_Swap DUT-DUT testing Signed-off-by: Denis Brockus Change-Id: I51973dfbfbfe855d1027c3b1cec35a2ba06a7b65 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2367283 Tested-by: Denis Brockus Reviewed-by: Diana Z Commit-Queue: Denis Brockus --- common/usbc/usb_pe_drp_sm.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/common/usbc/usb_pe_drp_sm.c b/common/usbc/usb_pe_drp_sm.c index eb3c3ea7b0..9863a87fba 100644 --- a/common/usbc/usb_pe_drp_sm.c +++ b/common/usbc/usb_pe_drp_sm.c @@ -2574,8 +2574,17 @@ static void pe_snk_select_capability_run(int port) /* * Setup to get Device Policy Manager to * request Sink Capabilities for possible FRS + * + * TODO(b:165822172) This should be called for + * FRS and non-FRS but there is a problem + * currently with the GetSnkCap functionality + * that is stopping PRS from working. The + * bug mentioned is to fix this path and + * re-enable for all. */ - pe_dpm_request(port, DPM_REQUEST_GET_SNK_CAPS); + if (IS_ENABLED(CONFIG_USB_PD_FRS)) + pe_dpm_request(port, + DPM_REQUEST_GET_SNK_CAPS); return; } /* -- cgit v1.2.1