Skip to content

Commit 1e61f6a

Browse files
sregregkh
authored andcommitted
usb: typec: fusb302: cache PD RX state
This patch fixes a race condition communication error, which ends up in PD hard resets when losing the race. Some systems, like the Radxa ROCK 5B are powered through USB-C without any backup power source and use a FUSB302 chip to do the PD negotiation. This means it is quite important to avoid hard resets, since that effectively kills the system's power-supply. I've found the following race condition while debugging unplanned power loss during booting the board every now and then: 1. lots of TCPM/FUSB302/PD initialization stuff 2. TCPM ends up in SNK_WAIT_CAPABILITIES (tcpm_set_pd_rx is enabled here) 3. the remote PD source does not send anything, so TCPM does a SOFT RESET 4. TCPM ends up in SNK_WAIT_CAPABILITIES for the second time (tcpm_set_pd_rx is enabled again, even though it is still on) At this point I've seen broken CRC good messages being send by the FUSB302 with a logic analyzer sniffing the CC lines. Also it looks like messages are being lost and things generally going haywire with one of the two sides doing a hard reset once a broken CRC good message was send to the bus. I think the system is running into a race condition, that the FIFOs are being cleared and/or the automatic good CRC message generation flag is being updated while a message is already arriving. Let's avoid this by caching the PD RX enabled state, as we have already processed anything in the FIFOs and are in a good state. As a side effect that this also optimizes I2C bus usage :) As far as I can tell the problem theoretically also exists when TCPM enters SNK_WAIT_CAPABILITIES the first time, but I believe this is less critical for the following reason: On devices like the ROCK 5B, which are powered through a TCPM backed USB-C port, the bootloader must have done some prior PD communication (initial communication must happen within 5 seconds after plugging the USB-C plug). This means the first time the kernel TCPM state machine reaches SNK_WAIT_CAPABILITIES, the remote side is not sending messages actively. On other devices a hard reset simply adds some extra delay and things should be good afterwards. Fixes: c034a43 ("staging: typec: Fairchild FUSB302 Type-c chip driver") Cc: stable <[email protected]> Signed-off-by: Sebastian Reichel <[email protected]> Reviewed-by: Heikki Krogerus <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent a33665f commit 1e61f6a

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

drivers/usb/typec/tcpm/fusb302.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ struct fusb302_chip {
104104
bool vconn_on;
105105
bool vbus_on;
106106
bool charge_on;
107+
bool pd_rx_on;
107108
bool vbus_present;
108109
enum typec_cc_polarity cc_polarity;
109110
enum typec_cc_status cc1;
@@ -841,6 +842,11 @@ static int tcpm_set_pd_rx(struct tcpc_dev *dev, bool on)
841842
int ret = 0;
842843

843844
mutex_lock(&chip->lock);
845+
if (chip->pd_rx_on == on) {
846+
fusb302_log(chip, "pd is already %s", str_on_off(on));
847+
goto done;
848+
}
849+
844850
ret = fusb302_pd_rx_flush(chip);
845851
if (ret < 0) {
846852
fusb302_log(chip, "cannot flush pd rx buffer, ret=%d", ret);
@@ -863,6 +869,8 @@ static int tcpm_set_pd_rx(struct tcpc_dev *dev, bool on)
863869
str_on_off(on), ret);
864870
goto done;
865871
}
872+
873+
chip->pd_rx_on = on;
866874
fusb302_log(chip, "pd := %s", str_on_off(on));
867875
done:
868876
mutex_unlock(&chip->lock);

0 commit comments

Comments
 (0)