From: Yauhen Kharuzhy <jekhor@gmail.com>
To: Hans de Goede <hdegoede@redhat.com>
Cc: linux-kernel@vger.kernel.org,
Chanwoo Choi <cw00.choi@samsung.com>,
MyungJoo Ham <myungjoo.ham@samsung.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: Re: [PATCH] extcon-intel-cht-wc: Don't reset USB data connection at probe
Date: Fri, 9 Aug 2019 18:11:16 +0300 [thread overview]
Message-ID: <20190809151116.GD30248@jeknote.loshitsa1.net> (raw)
In-Reply-To: <fbe20a5f-0f64-cadf-2c1e-88a468d54a07@redhat.com>
On Fri, Aug 09, 2019 at 01:06:01PM +0200, Hans de Goede wrote:
> Hi,
>
> On 8/9/19 12:01 AM, Yauhen Kharuzhy wrote:
> > Intel Cherry Trail Whiskey Cove extcon driver connect USB data lines to
> > PMIC at driver probing for further charger detection. This causes reset of
> > USB data sessions and removing all devices from bus. If system was
> > booted from Live CD or USB dongle, this makes system unusable.
> >
> > Check if USB ID pin is floating and re-route data lines in this case
> > only, don't touch otherwise.
> >
> > Signed-off-by: Yauhen Kharuzhy <jekhor@gmail.com>
> > ---
> > drivers/extcon/extcon-intel-cht-wc.c | 16 ++++++++++++++--
> > 1 file changed, 14 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/extcon/extcon-intel-cht-wc.c b/drivers/extcon/extcon-intel-cht-wc.c
> > index 9d32150e68db..3ae573e93e6e 100644
> > --- a/drivers/extcon/extcon-intel-cht-wc.c
> > +++ b/drivers/extcon/extcon-intel-cht-wc.c
> > @@ -338,6 +338,7 @@ static int cht_wc_extcon_probe(struct platform_device *pdev)
> > struct intel_soc_pmic *pmic = dev_get_drvdata(pdev->dev.parent);
> > struct cht_wc_extcon_data *ext;
> > unsigned long mask = ~(CHT_WC_PWRSRC_VBUS | CHT_WC_PWRSRC_USBID_MASK);
> > + int pwrsrc_sts, id;
> > int irq, ret;
> > irq = platform_get_irq(pdev, 0);
> > @@ -387,8 +388,19 @@ static int cht_wc_extcon_probe(struct platform_device *pdev)
> > goto disable_sw_control;
> > }
> > - /* Route D+ and D- to PMIC for initial charger detection */
> > - cht_wc_extcon_set_phymux(ext, MUX_SEL_PMIC);
> > + ret = regmap_read(ext->regmap, CHT_WC_PWRSRC_STS, &pwrsrc_sts);
> > + if (ret) {
> > + dev_err(ext->dev, "Error reading pwrsrc status: %d\n", ret);
> > + goto disable_sw_control;
> > + }
> > +
> > + id = cht_wc_extcon_get_id(ext, pwrsrc_sts);
> > +
> > + /* If no USB host or device connected, route D+ and D- to PMIC for
> > + * initial charger detection
> > + */
> > + if (id == INTEL_USB_ID_FLOAT)
> > + cht_wc_extcon_set_phymux(ext, MUX_SEL_PMIC);
>
> The check here should be != INTEL_USB_ID_GND, when we are connected as
> device we are charging from the host we are connected to and the port
> we are connected to may be a CDP (charging downstream port) instead of
> a SDP (standard downstream port) allowing us to charge at 1.5A instead
> of 0.5A, also != INTEL_USB_ID_GND matches the condition used in
> cht_wc_extcon_pwrsrc_event to determine if we should continue with
> charger detection there.
Actually it should be checked as ((id != INTEL_USB_ID_GND) && (id !=
INTEL_USB_RID_A)), to not interrupt connection if ACA used and our host
is OTG A device (for example, if LiveCD boots from USB flash inserted
into an ACA USB hub).
>
> Like your other patch I will try to give this one a test-run tomorrow.
>
> Regards,
>
> Hans
>
>
> > /* Get initial state */
> > cht_wc_extcon_pwrsrc_event(ext);
> >
--
Yauhen Kharuzhy
next prev parent reply other threads:[~2019-08-09 15:10 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-08 22:01 [PATCH] extcon-intel-cht-wc: Don't reset USB data connection at probe Yauhen Kharuzhy
2019-08-09 11:06 ` Hans de Goede
2019-08-09 15:11 ` Yauhen Kharuzhy [this message]
2019-08-12 17:18 ` Hans de Goede
2019-09-16 19:12 ` Yauhen Kharuzhy
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=20190809151116.GD30248@jeknote.loshitsa1.net \
--to=jekhor@gmail.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=cw00.choi@samsung.com \
--cc=hdegoede@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=myungjoo.ham@samsung.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;
as well as URLs for NNTP newsgroup(s).