2020-12-03 03:22:26

by Badhri Jagan Sridharan

Subject: [PATCH v1] usb: typec: tcpm: Clear send_discover in tcpm_check_send_discover

tcpm_check_send_discover does not clear the send_discover flag
when any of the following conditions are not met.
1. data_role is TYPEC_HOST
2. link is pd_capable

Discovery indentity would anyways not be attempted during
the current session anymore when the above conditions are not
met. Hence clear the send_discover flag here to prevent
tcpm_enable_frs_work from rescheduling indefinetly.

Signed-off-by: Badhri Jagan Sridharan <[email protected]>
---
drivers/usb/typec/tcpm/tcpm.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
index 3bbc1f10af49..012135ade7b1 100644
--- a/drivers/usb/typec/tcpm/tcpm.c
+++ b/drivers/usb/typec/tcpm/tcpm.c
@@ -3035,10 +3035,9 @@ static inline enum tcpm_state unattached_state(struct tcpm_port *port)
static void tcpm_check_send_discover(struct tcpm_port *port)
{
if (port->data_role == TYPEC_HOST && port->send_discover &&
- port->pd_capable) {
+ port->pd_capable)
tcpm_send_vdm(port, USB_SID_PD, CMD_DISCOVER_IDENT, NULL, 0);
- port->send_discover = false;
- }
+ port->send_discover = false;
}

static void tcpm_swap_complete(struct tcpm_port *port, int result)
--
2.29.2.576.ga3fc446d84-goog

2020-12-07 15:59:26

by Guenter Roeck

Subject: Re: [PATCH v1] usb: typec: tcpm: Clear send_discover in tcpm_check_send_discover

On Wed, Dec 02, 2020 at 07:19:08PM -0800, Badhri Jagan Sridharan wrote:
> tcpm_check_send_discover does not clear the send_discover flag
> when any of the following conditions are not met.
> 1. data_role is TYPEC_HOST
> 2. link is pd_capable
>
> Discovery indentity would anyways not be attempted during
> the current session anymore when the above conditions are not
> met. Hence clear the send_discover flag here to prevent
> tcpm_enable_frs_work from rescheduling indefinetly.
>
> Signed-off-by: Badhri Jagan Sridharan <[email protected]>

Reviewed-by: Guenter Roeck <[email protected]>

> ---
> drivers/usb/typec/tcpm/tcpm.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
> index 3bbc1f10af49..012135ade7b1 100644
> --- a/drivers/usb/typec/tcpm/tcpm.c
> +++ b/drivers/usb/typec/tcpm/tcpm.c
> @@ -3035,10 +3035,9 @@ static inline enum tcpm_state unattached_state(struct tcpm_port *port)
> static void tcpm_check_send_discover(struct tcpm_port *port)
> {
> if (port->data_role == TYPEC_HOST && port->send_discover &&
> - port->pd_capable) {
> + port->pd_capable)
> tcpm_send_vdm(port, USB_SID_PD, CMD_DISCOVER_IDENT, NULL, 0);
> - port->send_discover = false;
> - }
> + port->send_discover = false;
> }
>
> static void tcpm_swap_complete(struct tcpm_port *port, int result)
> --
> 2.29.2.576.ga3fc446d84-goog
>

2020-12-08 09:46:01

by Heikki Krogerus

Subject: Re: [PATCH v1] usb: typec: tcpm: Clear send_discover in tcpm_check_send_discover

On Wed, Dec 02, 2020 at 07:19:08PM -0800, Badhri Jagan Sridharan wrote:
> tcpm_check_send_discover does not clear the send_discover flag
> when any of the following conditions are not met.
> 1. data_role is TYPEC_HOST
> 2. link is pd_capable
>
> Discovery indentity would anyways not be attempted during
> the current session anymore when the above conditions are not
> met. Hence clear the send_discover flag here to prevent
> tcpm_enable_frs_work from rescheduling indefinetly.
>
> Signed-off-by: Badhri Jagan Sridharan <[email protected]>

Acked-by: Heikki Krogerus <[email protected]>

> ---
> drivers/usb/typec/tcpm/tcpm.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
> index 3bbc1f10af49..012135ade7b1 100644
> --- a/drivers/usb/typec/tcpm/tcpm.c
> +++ b/drivers/usb/typec/tcpm/tcpm.c
> @@ -3035,10 +3035,9 @@ static inline enum tcpm_state unattached_state(struct tcpm_port *port)
> static void tcpm_check_send_discover(struct tcpm_port *port)
> {
> if (port->data_role == TYPEC_HOST && port->send_discover &&
> - port->pd_capable) {
> + port->pd_capable)
> tcpm_send_vdm(port, USB_SID_PD, CMD_DISCOVER_IDENT, NULL, 0);
> - port->send_discover = false;
> - }
> + port->send_discover = false;
> }
>
> static void tcpm_swap_complete(struct tcpm_port *port, int result)
> --
> 2.29.2.576.ga3fc446d84-goog

--
heikki