* [PATCH v1 1/2] usb: typec: tcpm: Do not disconnect while receiving VBUS off
@ 2022-01-22 1:55 Badhri Jagan Sridharan
2022-01-22 1:55 ` [PATCH v1 2/2] usb: typec: tcpm: Do not disconnect when receiving VSAFE0V Badhri Jagan Sridharan
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Badhri Jagan Sridharan @ 2022-01-22 1:55 UTC (permalink / raw)
To: Guenter Roeck, Heikki Krogerus, Greg Kroah-Hartman
Cc: linux-usb, linux-kernel, Kyle Tso, stable, Badhri Jagan Sridharan
With some chargers, vbus might momentarily raise above VSAFE5V and fall
back to 0V before tcpm gets to read port->tcpc->get_vbus. This will
will report a VBUS off event causing TCPM to transition to
SNK_UNATTACHED where it should be waiting in either SNK_ATTACH_WAIT
or SNK_DEBOUNCED state. This patch makes TCPM avoid vbus off events
while in SNK_ATTACH_WAIT or SNK_DEBOUNCED state.
Stub from the spec:
"4.5.2.2.4.2 Exiting from AttachWait.SNK State
A Sink shall transition to Unattached.SNK when the state of both
the CC1 and CC2 pins is SNK.Open for at least tPDDebounce.
A DRP shall transition to Unattached.SRC when the state of both
the CC1 and CC2 pins is SNK.Open for at least tPDDebounce."
[23.194131] CC1: 0 -> 0, CC2: 0 -> 5 [state SNK_UNATTACHED, polarity 0, connected]
[23.201777] state change SNK_UNATTACHED -> SNK_ATTACH_WAIT [rev3 NONE_AMS]
[23.209949] pending state change SNK_ATTACH_WAIT -> SNK_DEBOUNCED @ 170 ms [rev3 NONE_AMS]
[23.300579] VBUS off
[23.300668] state change SNK_ATTACH_WAIT -> SNK_UNATTACHED [rev3 NONE_AMS]
[23.301014] VBUS VSAFE0V
[23.301111] Start toggling
Fixes: f0690a25a140b8 ("staging: typec: USB Type-C Port Manager (tcpm)")
Cc: stable@vger.kernel.org
Signed-off-by: Badhri Jagan Sridharan <badhri@google.com>
---
drivers/usb/typec/tcpm/tcpm.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
index 59d4fa2443f2..b8afe3d8c882 100644
--- a/drivers/usb/typec/tcpm/tcpm.c
+++ b/drivers/usb/typec/tcpm/tcpm.c
@@ -5156,7 +5156,8 @@ static void _tcpm_pd_vbus_off(struct tcpm_port *port)
case SNK_TRYWAIT_DEBOUNCE:
break;
case SNK_ATTACH_WAIT:
- tcpm_set_state(port, SNK_UNATTACHED, 0);
+ case SNK_DEBOUNCED:
+ /* Do nothing, as TCPM is still waiting for vbus to reaach VSAFE5V to connect */
break;
case SNK_NEGOTIATE_CAPABILITIES:
--
2.35.0.rc0.227.g00780c9af4-goog
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v1 2/2] usb: typec: tcpm: Do not disconnect when receiving VSAFE0V
2022-01-22 1:55 [PATCH v1 1/2] usb: typec: tcpm: Do not disconnect while receiving VBUS off Badhri Jagan Sridharan
@ 2022-01-22 1:55 ` Badhri Jagan Sridharan
2022-01-25 9:02 ` Heikki Krogerus
2022-01-25 17:44 ` Guenter Roeck
2022-01-25 9:01 ` [PATCH v1 1/2] usb: typec: tcpm: Do not disconnect while receiving VBUS off Heikki Krogerus
2022-01-25 17:42 ` Guenter Roeck
2 siblings, 2 replies; 6+ messages in thread
From: Badhri Jagan Sridharan @ 2022-01-22 1:55 UTC (permalink / raw)
To: Guenter Roeck, Heikki Krogerus, Greg Kroah-Hartman
Cc: linux-usb, linux-kernel, Kyle Tso, stable, Badhri Jagan Sridharan
With some chargers, vbus might momentarily raise above VSAFE5V and fall
back to 0V causing VSAFE0V to be triggered. This will
will report a VBUS off event causing TCPM to transition to
SNK_UNATTACHED state where it should be waiting in either SNK_ATTACH_WAIT
or SNK_DEBOUNCED state. This patch makes TCPM avoid VSAFE0V events
while in SNK_ATTACH_WAIT or SNK_DEBOUNCED state.
Stub from the spec:
"4.5.2.2.4.2 Exiting from AttachWait.SNK State
A Sink shall transition to Unattached.SNK when the state of both
the CC1 and CC2 pins is SNK.Open for at least tPDDebounce.
A DRP shall transition to Unattached.SRC when the state of both
the CC1 and CC2 pins is SNK.Open for at least tPDDebounce."
[23.194131] CC1: 0 -> 0, CC2: 0 -> 5 [state SNK_UNATTACHED, polarity 0, connected]
[23.201777] state change SNK_UNATTACHED -> SNK_ATTACH_WAIT [rev3 NONE_AMS]
[23.209949] pending state change SNK_ATTACH_WAIT -> SNK_DEBOUNCED @ 170 ms [rev3 NONE_AMS]
[23.300579] VBUS off
[23.300668] state change SNK_ATTACH_WAIT -> SNK_UNATTACHED [rev3 NONE_AMS]
[23.301014] VBUS VSAFE0V
[23.301111] Start toggling
Fixes: 28b43d3d746b8 ("usb: typec: tcpm: Introduce vsafe0v for vbus")
Cc: stable@vger.kernel.org
Signed-off-by: Badhri Jagan Sridharan <badhri@google.com>
---
drivers/usb/typec/tcpm/tcpm.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
index b8afe3d8c882..5fce795b69c7 100644
--- a/drivers/usb/typec/tcpm/tcpm.c
+++ b/drivers/usb/typec/tcpm/tcpm.c
@@ -5264,6 +5264,10 @@ static void _tcpm_pd_vbus_vsafe0v(struct tcpm_port *port)
case PR_SWAP_SNK_SRC_SOURCE_ON:
/* Do nothing, vsafe0v is expected during transition */
break;
+ case SNK_ATTACH_WAIT:
+ case SNK_DEBOUNCED:
+ /*Do nothing, still waiting for VSAFE5V for connect */
+ break;
default:
if (port->pwr_role == TYPEC_SINK && port->auto_vbus_discharge_enabled)
tcpm_set_state(port, SNK_UNATTACHED, 0);
--
2.35.0.rc0.227.g00780c9af4-goog
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v1 1/2] usb: typec: tcpm: Do not disconnect while receiving VBUS off
2022-01-22 1:55 [PATCH v1 1/2] usb: typec: tcpm: Do not disconnect while receiving VBUS off Badhri Jagan Sridharan
2022-01-22 1:55 ` [PATCH v1 2/2] usb: typec: tcpm: Do not disconnect when receiving VSAFE0V Badhri Jagan Sridharan
@ 2022-01-25 9:01 ` Heikki Krogerus
2022-01-25 17:42 ` Guenter Roeck
2 siblings, 0 replies; 6+ messages in thread
From: Heikki Krogerus @ 2022-01-25 9:01 UTC (permalink / raw)
To: Badhri Jagan Sridharan
Cc: Guenter Roeck, Greg Kroah-Hartman, linux-usb, linux-kernel,
Kyle Tso, stable
On Fri, Jan 21, 2022 at 05:55:19PM -0800, Badhri Jagan Sridharan wrote:
> With some chargers, vbus might momentarily raise above VSAFE5V and fall
> back to 0V before tcpm gets to read port->tcpc->get_vbus. This will
> will report a VBUS off event causing TCPM to transition to
> SNK_UNATTACHED where it should be waiting in either SNK_ATTACH_WAIT
> or SNK_DEBOUNCED state. This patch makes TCPM avoid vbus off events
> while in SNK_ATTACH_WAIT or SNK_DEBOUNCED state.
>
> Stub from the spec:
> "4.5.2.2.4.2 Exiting from AttachWait.SNK State
> A Sink shall transition to Unattached.SNK when the state of both
> the CC1 and CC2 pins is SNK.Open for at least tPDDebounce.
> A DRP shall transition to Unattached.SRC when the state of both
> the CC1 and CC2 pins is SNK.Open for at least tPDDebounce."
>
> [23.194131] CC1: 0 -> 0, CC2: 0 -> 5 [state SNK_UNATTACHED, polarity 0, connected]
> [23.201777] state change SNK_UNATTACHED -> SNK_ATTACH_WAIT [rev3 NONE_AMS]
> [23.209949] pending state change SNK_ATTACH_WAIT -> SNK_DEBOUNCED @ 170 ms [rev3 NONE_AMS]
> [23.300579] VBUS off
> [23.300668] state change SNK_ATTACH_WAIT -> SNK_UNATTACHED [rev3 NONE_AMS]
> [23.301014] VBUS VSAFE0V
> [23.301111] Start toggling
>
> Fixes: f0690a25a140b8 ("staging: typec: USB Type-C Port Manager (tcpm)")
> Cc: stable@vger.kernel.org
> Signed-off-by: Badhri Jagan Sridharan <badhri@google.com>
Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> ---
> drivers/usb/typec/tcpm/tcpm.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
> index 59d4fa2443f2..b8afe3d8c882 100644
> --- a/drivers/usb/typec/tcpm/tcpm.c
> +++ b/drivers/usb/typec/tcpm/tcpm.c
> @@ -5156,7 +5156,8 @@ static void _tcpm_pd_vbus_off(struct tcpm_port *port)
> case SNK_TRYWAIT_DEBOUNCE:
> break;
> case SNK_ATTACH_WAIT:
> - tcpm_set_state(port, SNK_UNATTACHED, 0);
> + case SNK_DEBOUNCED:
> + /* Do nothing, as TCPM is still waiting for vbus to reaach VSAFE5V to connect */
> break;
>
> case SNK_NEGOTIATE_CAPABILITIES:
> --
> 2.35.0.rc0.227.g00780c9af4-goog
--
heikki
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v1 2/2] usb: typec: tcpm: Do not disconnect when receiving VSAFE0V
2022-01-22 1:55 ` [PATCH v1 2/2] usb: typec: tcpm: Do not disconnect when receiving VSAFE0V Badhri Jagan Sridharan
@ 2022-01-25 9:02 ` Heikki Krogerus
2022-01-25 17:44 ` Guenter Roeck
1 sibling, 0 replies; 6+ messages in thread
From: Heikki Krogerus @ 2022-01-25 9:02 UTC (permalink / raw)
To: Badhri Jagan Sridharan
Cc: Guenter Roeck, Greg Kroah-Hartman, linux-usb, linux-kernel,
Kyle Tso, stable
On Fri, Jan 21, 2022 at 05:55:20PM -0800, Badhri Jagan Sridharan wrote:
> With some chargers, vbus might momentarily raise above VSAFE5V and fall
> back to 0V causing VSAFE0V to be triggered. This will
> will report a VBUS off event causing TCPM to transition to
> SNK_UNATTACHED state where it should be waiting in either SNK_ATTACH_WAIT
> or SNK_DEBOUNCED state. This patch makes TCPM avoid VSAFE0V events
> while in SNK_ATTACH_WAIT or SNK_DEBOUNCED state.
>
> Stub from the spec:
> "4.5.2.2.4.2 Exiting from AttachWait.SNK State
> A Sink shall transition to Unattached.SNK when the state of both
> the CC1 and CC2 pins is SNK.Open for at least tPDDebounce.
> A DRP shall transition to Unattached.SRC when the state of both
> the CC1 and CC2 pins is SNK.Open for at least tPDDebounce."
>
> [23.194131] CC1: 0 -> 0, CC2: 0 -> 5 [state SNK_UNATTACHED, polarity 0, connected]
> [23.201777] state change SNK_UNATTACHED -> SNK_ATTACH_WAIT [rev3 NONE_AMS]
> [23.209949] pending state change SNK_ATTACH_WAIT -> SNK_DEBOUNCED @ 170 ms [rev3 NONE_AMS]
> [23.300579] VBUS off
> [23.300668] state change SNK_ATTACH_WAIT -> SNK_UNATTACHED [rev3 NONE_AMS]
> [23.301014] VBUS VSAFE0V
> [23.301111] Start toggling
>
> Fixes: 28b43d3d746b8 ("usb: typec: tcpm: Introduce vsafe0v for vbus")
> Cc: stable@vger.kernel.org
> Signed-off-by: Badhri Jagan Sridharan <badhri@google.com>
Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> ---
> drivers/usb/typec/tcpm/tcpm.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
> index b8afe3d8c882..5fce795b69c7 100644
> --- a/drivers/usb/typec/tcpm/tcpm.c
> +++ b/drivers/usb/typec/tcpm/tcpm.c
> @@ -5264,6 +5264,10 @@ static void _tcpm_pd_vbus_vsafe0v(struct tcpm_port *port)
> case PR_SWAP_SNK_SRC_SOURCE_ON:
> /* Do nothing, vsafe0v is expected during transition */
> break;
> + case SNK_ATTACH_WAIT:
> + case SNK_DEBOUNCED:
> + /*Do nothing, still waiting for VSAFE5V for connect */
> + break;
> default:
> if (port->pwr_role == TYPEC_SINK && port->auto_vbus_discharge_enabled)
> tcpm_set_state(port, SNK_UNATTACHED, 0);
> --
> 2.35.0.rc0.227.g00780c9af4-goog
--
heikki
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v1 1/2] usb: typec: tcpm: Do not disconnect while receiving VBUS off
2022-01-22 1:55 [PATCH v1 1/2] usb: typec: tcpm: Do not disconnect while receiving VBUS off Badhri Jagan Sridharan
2022-01-22 1:55 ` [PATCH v1 2/2] usb: typec: tcpm: Do not disconnect when receiving VSAFE0V Badhri Jagan Sridharan
2022-01-25 9:01 ` [PATCH v1 1/2] usb: typec: tcpm: Do not disconnect while receiving VBUS off Heikki Krogerus
@ 2022-01-25 17:42 ` Guenter Roeck
2 siblings, 0 replies; 6+ messages in thread
From: Guenter Roeck @ 2022-01-25 17:42 UTC (permalink / raw)
To: Badhri Jagan Sridharan, Heikki Krogerus, Greg Kroah-Hartman
Cc: linux-usb, linux-kernel, Kyle Tso, stable
On 1/21/22 17:55, Badhri Jagan Sridharan wrote:
> With some chargers, vbus might momentarily raise above VSAFE5V and fall
> back to 0V before tcpm gets to read port->tcpc->get_vbus. This will
> will report a VBUS off event causing TCPM to transition to
s/will will/will/
> SNK_UNATTACHED where it should be waiting in either SNK_ATTACH_WAIT
> or SNK_DEBOUNCED state. This patch makes TCPM avoid vbus off events
> while in SNK_ATTACH_WAIT or SNK_DEBOUNCED state.
>
> Stub from the spec:
> "4.5.2.2.4.2 Exiting from AttachWait.SNK State
> A Sink shall transition to Unattached.SNK when the state of both
> the CC1 and CC2 pins is SNK.Open for at least tPDDebounce.
> A DRP shall transition to Unattached.SRC when the state of both
> the CC1 and CC2 pins is SNK.Open for at least tPDDebounce."
>
> [23.194131] CC1: 0 -> 0, CC2: 0 -> 5 [state SNK_UNATTACHED, polarity 0, connected]
> [23.201777] state change SNK_UNATTACHED -> SNK_ATTACH_WAIT [rev3 NONE_AMS]
> [23.209949] pending state change SNK_ATTACH_WAIT -> SNK_DEBOUNCED @ 170 ms [rev3 NONE_AMS]
> [23.300579] VBUS off
> [23.300668] state change SNK_ATTACH_WAIT -> SNK_UNATTACHED [rev3 NONE_AMS]
> [23.301014] VBUS VSAFE0V
> [23.301111] Start toggling
>
> Fixes: f0690a25a140b8 ("staging: typec: USB Type-C Port Manager (tcpm)")
> Cc: stable@vger.kernel.org
> Signed-off-by: Badhri Jagan Sridharan <badhri@google.com>
> ---
> drivers/usb/typec/tcpm/tcpm.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
> index 59d4fa2443f2..b8afe3d8c882 100644
> --- a/drivers/usb/typec/tcpm/tcpm.c
> +++ b/drivers/usb/typec/tcpm/tcpm.c
> @@ -5156,7 +5156,8 @@ static void _tcpm_pd_vbus_off(struct tcpm_port *port)
> case SNK_TRYWAIT_DEBOUNCE:
> break;
> case SNK_ATTACH_WAIT:
> - tcpm_set_state(port, SNK_UNATTACHED, 0);
> + case SNK_DEBOUNCED:
> + /* Do nothing, as TCPM is still waiting for vbus to reaach VSAFE5V to connect */
s/reaach/reach/
Other than that,
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> break;
>
> case SNK_NEGOTIATE_CAPABILITIES:
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v1 2/2] usb: typec: tcpm: Do not disconnect when receiving VSAFE0V
2022-01-22 1:55 ` [PATCH v1 2/2] usb: typec: tcpm: Do not disconnect when receiving VSAFE0V Badhri Jagan Sridharan
2022-01-25 9:02 ` Heikki Krogerus
@ 2022-01-25 17:44 ` Guenter Roeck
1 sibling, 0 replies; 6+ messages in thread
From: Guenter Roeck @ 2022-01-25 17:44 UTC (permalink / raw)
To: Badhri Jagan Sridharan, Heikki Krogerus, Greg Kroah-Hartman
Cc: linux-usb, linux-kernel, Kyle Tso, stable
On 1/21/22 17:55, Badhri Jagan Sridharan wrote:
> With some chargers, vbus might momentarily raise above VSAFE5V and fall
> back to 0V causing VSAFE0V to be triggered. This will
> will report a VBUS off event causing TCPM to transition to
s/will will/will/
> SNK_UNATTACHED state where it should be waiting in either SNK_ATTACH_WAIT
> or SNK_DEBOUNCED state. This patch makes TCPM avoid VSAFE0V events
> while in SNK_ATTACH_WAIT or SNK_DEBOUNCED state.
>
> Stub from the spec:
> "4.5.2.2.4.2 Exiting from AttachWait.SNK State
> A Sink shall transition to Unattached.SNK when the state of both
> the CC1 and CC2 pins is SNK.Open for at least tPDDebounce.
> A DRP shall transition to Unattached.SRC when the state of both
> the CC1 and CC2 pins is SNK.Open for at least tPDDebounce."
>
> [23.194131] CC1: 0 -> 0, CC2: 0 -> 5 [state SNK_UNATTACHED, polarity 0, connected]
> [23.201777] state change SNK_UNATTACHED -> SNK_ATTACH_WAIT [rev3 NONE_AMS]
> [23.209949] pending state change SNK_ATTACH_WAIT -> SNK_DEBOUNCED @ 170 ms [rev3 NONE_AMS]
> [23.300579] VBUS off
> [23.300668] state change SNK_ATTACH_WAIT -> SNK_UNATTACHED [rev3 NONE_AMS]
> [23.301014] VBUS VSAFE0V
> [23.301111] Start toggling
>
> Fixes: 28b43d3d746b8 ("usb: typec: tcpm: Introduce vsafe0v for vbus")
> Cc: stable@vger.kernel.org
> Signed-off-by: Badhri Jagan Sridharan <badhri@google.com>
> ---
> drivers/usb/typec/tcpm/tcpm.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
> index b8afe3d8c882..5fce795b69c7 100644
> --- a/drivers/usb/typec/tcpm/tcpm.c
> +++ b/drivers/usb/typec/tcpm/tcpm.c
> @@ -5264,6 +5264,10 @@ static void _tcpm_pd_vbus_vsafe0v(struct tcpm_port *port)
> case PR_SWAP_SNK_SRC_SOURCE_ON:
> /* Do nothing, vsafe0v is expected during transition */
> break;
> + case SNK_ATTACH_WAIT:
> + case SNK_DEBOUNCED:
> + /*Do nothing, still waiting for VSAFE5V for connect */
Space before Do
s/for connect/to connect/, maybe ?
Other than that,
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> + break;
> default:
> if (port->pwr_role == TYPEC_SINK && port->auto_vbus_discharge_enabled)
> tcpm_set_state(port, SNK_UNATTACHED, 0);
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-01-25 17:45 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-22 1:55 [PATCH v1 1/2] usb: typec: tcpm: Do not disconnect while receiving VBUS off Badhri Jagan Sridharan
2022-01-22 1:55 ` [PATCH v1 2/2] usb: typec: tcpm: Do not disconnect when receiving VSAFE0V Badhri Jagan Sridharan
2022-01-25 9:02 ` Heikki Krogerus
2022-01-25 17:44 ` Guenter Roeck
2022-01-25 9:01 ` [PATCH v1 1/2] usb: typec: tcpm: Do not disconnect while receiving VBUS off Heikki Krogerus
2022-01-25 17:42 ` Guenter Roeck
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.