From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Prashanth K <quic_prashk@quicinc.com>
Cc: AngeloGioacchino Del Regno
<angelogioacchino.delregno@collabora.com>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Matthias Brugger <matthias.bgg@gmail.com>,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: usb: common: usb-conn-gpio: Prevent bailing out if initial role is none
Date: Tue, 25 Jul 2023 17:34:03 +0200 [thread overview]
Message-ID: <2023072517-revocable-squiggly-de1c@gregkh> (raw)
In-Reply-To: <1688638258-23806-1-git-send-email-quic_prashk@quicinc.com>
On Thu, Jul 06, 2023 at 03:40:58PM +0530, Prashanth K wrote:
> Currently if we bootup a device without cable connected, then
> usb-conn-gpio won't call set_role() since last_role is same as
> current role. This happens because during probe last_role gets
> initialised to zero.
>
> To avoid this, add a new flag initial_det in usb_conn_info,
> which is used to prevent bailing out during init detection.
>
> Fixes: 4602f3bff266 ("usb: common: add USB GPIO based connection detection driver")
> Signed-off-by: Prashanth K <quic_prashk@quicinc.com>
> ---
> 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..46290ff 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_det;
What does "initial_det" mean? Please document this better.
> };
>
> /*
> @@ -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_det && info->last_role == role) {
> dev_warn(info->dev, "repeated role: %s\n", usb_role_string(role));
> return;
> }
>
> + info->initial_det = 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_det = true;
What is protecting this from changing right after you test for it?
thanks,
greg k-h
next prev parent reply other threads:[~2023-07-25 15:34 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-06 10:10 usb: common: usb-conn-gpio: Prevent bailing out if initial role is none Prashanth K
2023-07-25 15:34 ` Greg Kroah-Hartman [this message]
2023-07-26 9:55 ` Prashanth K
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2023072517-revocable-squiggly-de1c@gregkh \
--to=gregkh@linuxfoundation.org \
--cc=angelogioacchino.delregno@collabora.com \
--cc=heikki.krogerus@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=matthias.bgg@gmail.com \
--cc=quic_prashk@quicinc.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox