diff options
| author | Eric Yilun Lin <yllin@chromium.org> | 2022-04-20 14:52:28 +0800 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-04-29 07:14:05 +0000 |
| commit | 03a693bc88da45da12bdb5d28392fd8f4c168c93 (patch) | |
| tree | 5102507723c5a3a127b0869e86604ac163052771 /driver/tcpm/rt1718s.c | |
| parent | dba77e6e122cb0b6dd6a5561a6130574c06d9c19 (diff) | |
| download | chrome-ec-03a693bc88da45da12bdb5d28392fd8f4c168c93.tar.gz | |
rt1718s: fix re-entry FRS state
RT1718S FRS RX interrupt may re-raise sometimes even if
there's only one RX signal on CC lines. We filtered the
second FRS RX in case of breaking the state machine since
the state machine had entered the FRS AMS already.
Also, ensure that the FRS AMS states are entered only when the FRS
is enabled. Sometimes the FRS Rx interrupt will raise when
FRS is disabled.
BUG=b:223086905
TEST=success to 5V sink-to-source FRS on kingler
BRANCH=none
Change-Id: I12de944849041bcb42a9d35c981fafb35f9f6bd8
Signed-off-by: Eric Yilun Lin <yllin@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3593761
Tested-by: Eric Yilun Lin <yllin@google.com>
Reviewed-by: Ting Shen <phoenixshen@chromium.org>
Commit-Queue: Eric Yilun Lin <yllin@google.com>
Diffstat (limited to 'driver/tcpm/rt1718s.c')
| -rw-r--r-- | driver/tcpm/rt1718s.c | 34 |
1 files changed, 27 insertions, 7 deletions
diff --git a/driver/tcpm/rt1718s.c b/driver/tcpm/rt1718s.c index 175f471fe5..cd32f85da4 100644 --- a/driver/tcpm/rt1718s.c +++ b/driver/tcpm/rt1718s.c @@ -409,18 +409,38 @@ void rt1718s_vendor_defined_alert(int port) if (rv) return; - if ((int1 & RT1718S_RT_INT1_INT_RX_FRS)) { - atomic_or(&frs_flag[port], FLAG_FRS_RX_SIGNALLED); - /* notify TCPM we got FRS signal */ - pd_got_frs_signal(port); + if ((int1 & RT1718S_RT_INT1_INT_RX_FRS) && + frs_flag[port] & FLAG_FRS_ENABLED) { + /* + * 1. Sometimes we get Rx signalled even if the + * FRS is disabled, so filter it. + * 2. Only call pd_got_frs_signal when this is the first + * Rx interrupt for this FRS swap, and the FRS is + * enabled. The Rx interrupt may re-send when the + * sink voltage is 5V, and this will make us re-entry + * the FRS states. + * 3. When a FRS hub detached, RT1718S will + * raise FRS RX alert as well. In this case, + * we are unable to audit the errors in time, + * we will still enter the FRS AMS, but it will + * fail eventually, and back to CC open state. + */ + if (!(frs_flag[port] & FLAG_FRS_RX_SIGNALLED)) { + atomic_or(&frs_flag[port], + FLAG_FRS_RX_SIGNALLED); + /* notify TCPM we got FRS signal */ + pd_got_frs_signal(port); + } } if ((int1 & RT1718S_RT_INT1_INT_VBUS_FRS_LOW)) { /* - * VBUS_FRS_LOW alert could be sent multiple times, - * filter it here. + * Only process if have had rx signalled. + * VBUS_FRS_LOW alert could be raised multiple times + * if VBUS 5V is glitched. */ - if (!(frs_flag[port] & FLAG_FRS_VBUS_VALID_FALL)) { + if ((frs_flag[port] & FLAG_FRS_RX_SIGNALLED) && + !(frs_flag[port] & FLAG_FRS_VBUS_VALID_FALL)) { atomic_or(&frs_flag[port], FLAG_FRS_VBUS_VALID_FALL); /* |