From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5C0A7C32789 for ; Fri, 2 Nov 2018 13:28:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2A4C82082E for ; Fri, 2 Nov 2018 13:28:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2A4C82082E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727729AbeKBWgC (ORCPT ); Fri, 2 Nov 2018 18:36:02 -0400 Received: from mga03.intel.com ([134.134.136.65]:18950 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726026AbeKBWgC (ORCPT ); Fri, 2 Nov 2018 18:36:02 -0400 X-Amp-Result: UNSCANNABLE X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 Nov 2018 06:28:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,456,1534834800"; d="scan'208";a="104738383" Received: from kuha.fi.intel.com ([10.237.72.189]) by fmsmga001.fm.intel.com with SMTP; 02 Nov 2018 06:28:48 -0700 Received: by kuha.fi.intel.com (sSMTP sendmail emulation); Fri, 02 Nov 2018 15:28:47 +0200 Date: Fri, 2 Nov 2018 15:28:47 +0200 From: Heikki Krogerus To: Badhri Jagan Sridharan Cc: Rob Herring , Mark Rutland , Greg Kroah-Hartman , Chanwoo Choi , Andrzej Hajda , Li Jun , linux@roeck-us.net, jackp@codeaurora.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org Subject: Re: [PATCH v3 3/3] usb: typec: tcpm: charge current handling for sink during hard reset Message-ID: <20181102132847.GC6543@kuha.fi.intel.com> References: <20181001194501.58338-1-badhri@google.com> <20181001194501.58338-3-badhri@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20181001194501.58338-3-badhri@google.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Oct 01, 2018 at 12:45:01PM -0700, Badhri Jagan Sridharan wrote: > During the initial connect to a non-pd port, sink would hard reset > twice before deeming that the port partner is non-pd. TCPM sets the > the charge path to false during the hard reset. This causes unnecessary > connects/disconnects of charge path and makes port take longer to > charge from the non-pd ports. Avoid this by not setting the charge path > to false unless the partner has already identified to be pd capable. > > When partner is a pd port, set the charge path to false in > SNK_HARD_RESET_SINK_OFF. Set the current limits to default value based > of CC pull up and resume the charge path when port enters > SNK_HARD_RESET_SINK_ON. > > Signed-off-by: Badhri Jagan Sridharan Reviewed-by: Heikki Krogerus > -------- > Changes in V3: > Rebase on top of usb-next > > Changes in V2: > Based on feedback of jackp@codeaurora.org > - vsafe_5v_hard_reset flag from tcpc_config is removed > - Patch only differentiates between pd port partner and non-pd port > partner > > V1 version of the patch is here: > https://lkml.org/lkml/2018/9/14/11 > --- > drivers/usb/typec/tcpm/tcpm.c | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c > index c3ac0e46106b..c25a69922ee6 100644 > --- a/drivers/usb/typec/tcpm/tcpm.c > +++ b/drivers/usb/typec/tcpm/tcpm.c > @@ -3273,7 +3273,8 @@ static void run_state_machine(struct tcpm_port *port) > case SNK_HARD_RESET_SINK_OFF: > memset(&port->pps_data, 0, sizeof(port->pps_data)); > tcpm_set_vconn(port, false); > - tcpm_set_charge(port, false); > + if (port->pd_capable) > + tcpm_set_charge(port, false); > tcpm_set_roles(port, port->self_powered, TYPEC_SINK, > TYPEC_DEVICE); > /* > @@ -3305,6 +3306,12 @@ static void run_state_machine(struct tcpm_port *port) > * Similar, dual-mode ports in source mode should transition > * to PE_SNK_Transition_to_default. > */ > + if (port->pd_capable) { > + tcpm_set_current_limit(port, > + tcpm_get_current_limit(port), > + 5000); > + tcpm_set_charge(port, true); > + } > tcpm_set_attached_state(port, true); > tcpm_set_state(port, SNK_STARTUP, 0); > break; > -- > 2.19.0.605.g01d371f741-goog thanks, -- heikki From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v3,3/3] usb: typec: tcpm: charge current handling for sink during hard reset From: Heikki Krogerus Message-Id: <20181102132847.GC6543@kuha.fi.intel.com> Date: Fri, 2 Nov 2018 15:28:47 +0200 To: Badhri Jagan Sridharan Cc: Rob Herring , Mark Rutland , Greg Kroah-Hartman , Chanwoo Choi , Andrzej Hajda , Li Jun , linux@roeck-us.net, jackp@codeaurora.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org List-ID: T24gTW9uLCBPY3QgMDEsIDIwMTggYXQgMTI6NDU6MDFQTSAtMDcwMCwgQmFkaHJpIEphZ2FuIFNy aWRoYXJhbiB3cm90ZToKPiBEdXJpbmcgdGhlIGluaXRpYWwgY29ubmVjdCB0byBhIG5vbi1wZCBw b3J0LCBzaW5rIHdvdWxkIGhhcmQgcmVzZXQKPiB0d2ljZSBiZWZvcmUgZGVlbWluZyB0aGF0IHRo ZSBwb3J0IHBhcnRuZXIgaXMgbm9uLXBkLiBUQ1BNIHNldHMgdGhlCj4gdGhlIGNoYXJnZSBwYXRo IHRvIGZhbHNlIGR1cmluZyB0aGUgaGFyZCByZXNldC4gVGhpcyBjYXVzZXMgdW5uZWNlc3NhcnkK PiBjb25uZWN0cy9kaXNjb25uZWN0cyBvZiBjaGFyZ2UgcGF0aCBhbmQgbWFrZXMgcG9ydCB0YWtl IGxvbmdlciB0bwo+IGNoYXJnZSBmcm9tIHRoZSBub24tcGQgcG9ydHMuIEF2b2lkIHRoaXMgYnkg bm90IHNldHRpbmcgdGhlIGNoYXJnZSBwYXRoCj4gdG8gZmFsc2UgdW5sZXNzIHRoZSBwYXJ0bmVy IGhhcyBhbHJlYWR5IGlkZW50aWZpZWQgdG8gYmUgcGQgY2FwYWJsZS4KPiAKPiBXaGVuIHBhcnRu ZXIgaXMgYSBwZCBwb3J0LCBzZXQgdGhlIGNoYXJnZSBwYXRoIHRvIGZhbHNlIGluCj4gU05LX0hB UkRfUkVTRVRfU0lOS19PRkYuIFNldCB0aGUgY3VycmVudCBsaW1pdHMgdG8gZGVmYXVsdCB2YWx1 ZSBiYXNlZAo+IG9mIENDIHB1bGwgdXAgYW5kIHJlc3VtZSB0aGUgY2hhcmdlIHBhdGggd2hlbiBw b3J0IGVudGVycwo+IFNOS19IQVJEX1JFU0VUX1NJTktfT04uCj4gCj4gU2lnbmVkLW9mZi1ieTog QmFkaHJpIEphZ2FuIFNyaWRoYXJhbiA8YmFkaHJpQGdvb2dsZS5jb20+CgpSZXZpZXdlZC1ieTog SGVpa2tpIEtyb2dlcnVzIDxoZWlra2kua3JvZ2VydXNAbGludXguaW50ZWwuY29tPgoKPiAtLS0t LS0tLQo+IENoYW5nZXMgaW4gVjM6Cj4gUmViYXNlIG9uIHRvcCBvZiB1c2ItbmV4dAo+IAo+IENo YW5nZXMgaW4gVjI6Cj4gQmFzZWQgb24gZmVlZGJhY2sgb2YgamFja3BAY29kZWF1cm9yYS5vcmcK PiAtIHZzYWZlXzV2X2hhcmRfcmVzZXQgZmxhZyBmcm9tIHRjcGNfY29uZmlnIGlzIHJlbW92ZWQK PiAtIFBhdGNoIG9ubHkgZGlmZmVyZW50aWF0ZXMgYmV0d2VlbiBwZCBwb3J0IHBhcnRuZXIgYW5k IG5vbi1wZCBwb3J0Cj4gcGFydG5lcgo+IAo+IFYxIHZlcnNpb24gb2YgdGhlIHBhdGNoIGlzIGhl cmU6Cj4gaHR0cHM6Ly9sa21sLm9yZy9sa21sLzIwMTgvOS8xNC8xMQo+IC0tLQo+ICBkcml2ZXJz L3VzYi90eXBlYy90Y3BtL3RjcG0uYyB8IDkgKysrKysrKystCj4gIDEgZmlsZSBjaGFuZ2VkLCA4 IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy91 c2IvdHlwZWMvdGNwbS90Y3BtLmMgYi9kcml2ZXJzL3VzYi90eXBlYy90Y3BtL3RjcG0uYwo+IGlu ZGV4IGMzYWMwZTQ2MTA2Yi4uYzI1YTY5OTIyZWU2IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvdXNi L3R5cGVjL3RjcG0vdGNwbS5jCj4gKysrIGIvZHJpdmVycy91c2IvdHlwZWMvdGNwbS90Y3BtLmMK PiBAQCAtMzI3Myw3ICszMjczLDggQEAgc3RhdGljIHZvaWQgcnVuX3N0YXRlX21hY2hpbmUoc3Ry dWN0IHRjcG1fcG9ydCAqcG9ydCkKPiAgCWNhc2UgU05LX0hBUkRfUkVTRVRfU0lOS19PRkY6Cj4g IAkJbWVtc2V0KCZwb3J0LT5wcHNfZGF0YSwgMCwgc2l6ZW9mKHBvcnQtPnBwc19kYXRhKSk7Cj4g IAkJdGNwbV9zZXRfdmNvbm4ocG9ydCwgZmFsc2UpOwo+IC0JCXRjcG1fc2V0X2NoYXJnZShwb3J0 LCBmYWxzZSk7Cj4gKwkJaWYgKHBvcnQtPnBkX2NhcGFibGUpCj4gKwkJCXRjcG1fc2V0X2NoYXJn ZShwb3J0LCBmYWxzZSk7Cj4gIAkJdGNwbV9zZXRfcm9sZXMocG9ydCwgcG9ydC0+c2VsZl9wb3dl cmVkLCBUWVBFQ19TSU5LLAo+ICAJCQkgICAgICAgVFlQRUNfREVWSUNFKTsKPiAgCQkvKgo+IEBA IC0zMzA1LDYgKzMzMDYsMTIgQEAgc3RhdGljIHZvaWQgcnVuX3N0YXRlX21hY2hpbmUoc3RydWN0 IHRjcG1fcG9ydCAqcG9ydCkKPiAgCQkgKiBTaW1pbGFyLCBkdWFsLW1vZGUgcG9ydHMgaW4gc291 cmNlIG1vZGUgc2hvdWxkIHRyYW5zaXRpb24KPiAgCQkgKiB0byBQRV9TTktfVHJhbnNpdGlvbl90 b19kZWZhdWx0Lgo+ICAJCSAqLwo+ICsJCWlmIChwb3J0LT5wZF9jYXBhYmxlKSB7Cj4gKwkJCXRj cG1fc2V0X2N1cnJlbnRfbGltaXQocG9ydCwKPiArCQkJCQkgICAgICAgdGNwbV9nZXRfY3VycmVu dF9saW1pdChwb3J0KSwKPiArCQkJCQkgICAgICAgNTAwMCk7Cj4gKwkJCXRjcG1fc2V0X2NoYXJn ZShwb3J0LCB0cnVlKTsKPiArCQl9Cj4gIAkJdGNwbV9zZXRfYXR0YWNoZWRfc3RhdGUocG9ydCwg dHJ1ZSk7Cj4gIAkJdGNwbV9zZXRfc3RhdGUocG9ydCwgU05LX1NUQVJUVVAsIDApOwo+ICAJCWJy ZWFrOwo+IC0tIAo+IDIuMTkuMC42MDUuZzAxZDM3MWY3NDEtZ29vZwoKdGhhbmtzLAo=