On Tue, Aug 01, 2023 at 02:33:52PM +0530, Prashanth K wrote:
> Currently if we bootup a device without cable connected, then
> usb-conn-gpio won't call set_role() because last_role is same
> as current role. This happens since last_role gets initialised
> to zero during the probe.
>
> To avoid this, add a new flag initial_detection into struct
> usb_conn_info, which prevents bailing out during initial
> detection.
>
> Cc: <stable@xxxxxxxxxxxxxxx> # 5.4
> Fixes: 4602f3bff266 ("usb: common: add USB GPIO based connection detection driver")
> Signed-off-by: Prashanth K <quic_prashk@xxxxxxxxxxx>
FWIW:
Reviewed-by: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx>
> ---
> v3: Added cc tag as suggested by the patch-bot.
> v2: Updated the bool name to initial_detection.
>
> drivers/usb/common/usb-conn-gpio.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/common/usb-conn-gpio.c b/drivers/usb/common/usb-conn-gpio.c
> index 766005d..501e8bc9 100644
> --- a/drivers/usb/common/usb-conn-gpio.c
> +++ b/drivers/usb/common/usb-conn-gpio.c
> @@ -42,6 +42,7 @@ struct usb_conn_info {
>
> struct power_supply_desc desc;
> struct power_supply *charger;
> + bool initial_detection;
> };
>
> /*
> @@ -86,11 +87,13 @@ static void usb_conn_detect_cable(struct work_struct *work)
> dev_dbg(info->dev, "role %s -> %s, gpios: id %d, vbus %d\n",
> usb_role_string(info->last_role), usb_role_string(role), id, vbus);
>
> - if (info->last_role == role) {
> + if (!info->initial_detection && info->last_role == role) {
> dev_warn(info->dev, "repeated role: %s\n", usb_role_string(role));
> return;
> }
>
> + info->initial_detection = false;
> +
> if (info->last_role == USB_ROLE_HOST && info->vbus)
> regulator_disable(info->vbus);
>
> @@ -258,6 +261,7 @@ static int usb_conn_probe(struct platform_device *pdev)
> device_set_wakeup_capable(&pdev->dev, true);
>
> /* Perform initial detection */
> + info->initial_detection = true;
> usb_conn_queue_dwork(info, 0);
>
> return 0;
> --
> 2.7.4
thanks,
--
heikki
