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] usb: typec: tcpm: Extend the matching rules on PPS APDO selection From: Heikki Krogerus Message-Id: <20181218120051.GC14121@kuha.fi.intel.com> Date: Tue, 18 Dec 2018 14:00:51 +0200 To: Kyle Tso Cc: linux@roeck-us.net, gregkh@linuxfoundation.org, Adam.Thomson.Opensource@diasemi.com, badhri@google.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org List-ID: T24gTW9uLCBEZWMgMTcsIDIwMTggYXQgMDk6MjI6MTNQTSArMDgwMCwgS3lsZSBUc28gd3JvdGU6 Cj4gQ3VycmVudCBtYXRjaGluZyBydWxlcyBlbnN1cmUgdGhhdCB0aGUgdm9sdGFnZSByYW5nZSBv ZiBzZWxlY3RlZCBTb3VyY2UKPiBDYXBhYmlsaXR5IGlzIGVudGlyZWx5IHdpdGhpbiB0aGUgcmFu Z2UgZGVmaW5lZCBpbiBvbmUgb2YgdGhlIFNpbmsKPiBDYXBhYmlsaXRpZXMuIFRoaXMgaXMgcmVh c29uYWJsZSBidXQgbm90IHByYWN0aWNhbCBiZWNhdXNlIFNpbmsgbWF5IG5vdAo+IHN1cHBvcnQg d2lkZSByYW5nZSBvZiB2b2x0YWdlIHdoZW4gc2lua2luZyBwb3dlciB3aGlsZSBTb3VyY2UgY291 bGQKPiBhZHZlcnRpc2UgaXRzIGNhcGFiaWxpdGllcyBpbiByZWxhdGl2ZWx5IHdpZGVyIHJhbmdl LiBGb3IgZXhhbXBsZSwgYQo+IFNvdXJjZSBQRE8gYWR2ZXJ0aXNpbmcgMy4zVi0xMVZAM0EgKDlW IFByb2cgb2YgRml4ZWQgTm9taW5hbCBWb2x0YWdlKQo+IHdpbGwgbm90IGJlIHNlbGVjdGVkIGlm IHRoZSBTaW5rIHJlcXVpcmVzIDVWLTEyVkAzQSBQUFMgcG93ZXIuIEhvd2V2ZXIsCj4gdGhlIFNp bmsgY291bGQgd29yayB3ZWxsIGlmIHRoZSByZXF1ZXN0ZWQgdm9sdGFnZSByYW5nZSBpbiBSRE9z IGlzCj4gNVYtMTFWQDNBLgo+IAo+IEN1cnJlbnRseSBhY2NlcHRlZDoKPiAJCXwtLS0tLS0tLS0g c291cmNlIC0tLS0tfAo+IAl8LS0tLS0tLS0tLS0gc2luayAtLS0tLS0tLS0tLS0tLS18Cj4gCj4g Q3VycmVudGx5IG5vdCBhY2NlcHRlZDoKPiAJCQl8LS0tLS0tLS0tIHNvdXJjZSAtLS0tLXwKPiAJ fC0tLS0tLS0tLS0tIHNpbmsgLS0tLS0tLS0tLS0tLS0tfAo+IAo+IAl8LS0tLS0tLS0tIHNvdXJj ZSAtLS0tLXwKPiAJCXwtLS0tLS0tLS0tLSBzaW5rIC0tLS0tLS0tLS0tLS0tLXwKPiAKPiAJfC0t LS0tLS0tLSBzb3VyY2UgLS0tLS0tLS0tLS0tLS0tLS18Cj4gCQl8LS0tLS0tIHNpbmsgLS0tLS0t LXwKPiAKPiBUbyBpbXByb3ZlIHRoZSB1c2FiaWxpdHksIGNoYW5nZSB0aGUgbWF0Y2hpbmcgcnVs ZXMgdG8gd2hhdCBsaXN0ZWQKPiBiZWxvdzoKPiBhLiBUaGUgU291cmNlIFBETyBpcyBzZWxlY3Rh YmxlIGlmIGFueSBwb3J0aW9uIG9mIHRoZSB2b2x0YWdlIHJhbmdlCj4gICAgb3ZlcmxhcHMgb25l IG9mIHRoZSBTaW5rIFBETydzIHZvbHRhZ2UgcmFuZ2UuCj4gYi4gVGhlIG1heGltdW0gb3BlcmF0 aW9uYWwgdm9sdGFnZSB3aWxsIGJlIHRoZSBsb3dlciBvbmUgYmV0d2VlbiB0aGUKPiAgICBzZWxl Y3RlZCBTb3VyY2UgUERPIGFuZCB0aGUgbWF0Y2hpbmcgU2luayBQRE8uCj4gYy4gVGhlIG1heGlt dW0gcG93ZXIgd2lsbCBiZSB0aGUgbWF4aW11bSBvcGVyYXRpb25hbCB2b2x0YWdlIHRpbWVzIHRo ZQo+ICAgIG1heGltdW0gY3VycmVudCBkZWZpbmVkIGluIHRoZSBzZWxlY3RlZCBTb3VyY2UgUERP Cj4gZC4gU2VsZWN0IHRoZSBTb3VyY2UgUERPIHdpdGggdGhlIGhpZ2hlc3QgbWF4aW11bSBwb3dl cgo+IAo+IFNpZ25lZC1vZmYtYnk6IEt5bGUgVHNvIDxreWxldHNvQGdvb2dsZS5jb20+CgpSZXZp ZXdlZC1ieTogSGVpa2tpIEtyb2dlcnVzIDxoZWlra2kua3JvZ2VydXNAbGludXguaW50ZWwuY29t PgoKPiAtLS0KPiBDaGFuZ2Vsb2cgc2luY2UgdjE6Cj4gLSB1cGRhdGVkIHRoZSBjb21taXQgbWVz c2FnZSBhcyBzdWdnZXN0ZWQgYnkgR3VlbnRlciBSb2VjayA8bGludXhAcm9lY2stdXMubmV0Pgo+ IAo+IENoYW5nZWxvZyBzaW5jZSB2MjoKPiAtIGZpeGVkIHRoZSBjb2Rpbmcgc3R5bGUgcHJvYmxl bXMgYXMgc3VnZ2VzdGVkIGJ5IEhlaWtraSBLcm9nZXJ1cwo+ICAgPGhlaWtraS5rcm9nZXJ1c0Bs aW51eC5pbnRlbC5jb20+Cj4gLSBDb3JyZWN0ZWQgYSB3cm9uZyB3b3JkIGluIHRoZSBjb21taXQg bWVzc2FnZSBhcyBzdWdnZXN0ZWQgYnkgQWRhbSBUaG9tc29uCj4gICA8QWRhbS5UaG9tc29uLk9w ZW5zb3VyY2VAZGlhc2VtaS5jb20+Cj4gLS0tCj4gIGRyaXZlcnMvdXNiL3R5cGVjL3RjcG0vdGNw bS5jIHwgMzUgKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0KPiAgMSBmaWxlIGNo YW5nZWQsIDIwIGluc2VydGlvbnMoKyksIDE1IGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQg YS9kcml2ZXJzL3VzYi90eXBlYy90Y3BtL3RjcG0uYyBiL2RyaXZlcnMvdXNiL3R5cGVjL3RjcG0v dGNwbS5jCj4gaW5kZXggMzYyMGVmZWUyNjg4Li40YmMyOWI1ODY2OTggMTAwNjQ0Cj4gLS0tIGEv ZHJpdmVycy91c2IvdHlwZWMvdGNwbS90Y3BtLmMKPiArKysgYi9kcml2ZXJzL3VzYi90eXBlYy90 Y3BtL3RjcG0uYwo+IEBAIC0yMjEzLDcgKzIyMTMsOCBAQCBzdGF0aWMgdW5zaWduZWQgaW50IHRj cG1fcGRfc2VsZWN0X3Bwc19hcGRvKHN0cnVjdCB0Y3BtX3BvcnQgKnBvcnQpCj4gIAl1bnNpZ25l ZCBpbnQgaSwgaiwgbWF4X213ID0gMCwgbWF4X212ID0gMDsKPiAgCXVuc2lnbmVkIGludCBtaW5f c3JjX212LCBtYXhfc3JjX212LCBzcmNfbWEsIHNyY19tdzsKPiAgCXVuc2lnbmVkIGludCBtaW5f c25rX212LCBtYXhfc25rX212Owo+IC0JdTMyIHBkbzsKPiArCXVuc2lnbmVkIGludCBtYXhfb3Bf bXY7Cj4gKwl1MzIgcGRvLCBzcmMsIHNuazsKPiAgCXVuc2lnbmVkIGludCBzcmNfcGRvID0gMCwg c25rX3BkbyA9IDA7Cj4gIAo+ICAJLyoKPiBAQCAtMjI2MywxNiArMjI2NCwxOCBAQCBzdGF0aWMg dW5zaWduZWQgaW50IHRjcG1fcGRfc2VsZWN0X3Bwc19hcGRvKHN0cnVjdCB0Y3BtX3BvcnQgKnBv cnQpCj4gIAkJCQkJY29udGludWU7Cj4gIAkJCQl9Cj4gIAo+IC0JCQkJaWYgKG1heF9zcmNfbXYg PD0gbWF4X3Nua19tdiAmJgo+IC0JCQkJICAgIG1pbl9zcmNfbXYgPj0gbWluX3Nua19tdikgewo+ ICsJCQkJaWYgKG1pbl9zcmNfbXYgPD0gbWF4X3Nua19tdiAmJgo+ICsJCQkJICAgIG1heF9zcmNf bXYgPj0gbWluX3Nua19tdikgewo+ICsJCQkJCW1heF9vcF9tdiA9IG1pbihtYXhfc3JjX212LCBt YXhfc25rX212KTsKPiArCQkJCQlzcmNfbXcgPSAobWF4X29wX212ICogc3JjX21hKSAvIDEwMDA7 Cj4gIAkJCQkJLyogUHJlZmVyIGhpZ2hlciB2b2x0YWdlcyBpZiBhdmFpbGFibGUgKi8KPiAgCQkJ CQlpZiAoKHNyY19tdyA9PSBtYXhfbXcgJiYKPiAtCQkJCQkgICAgIG1pbl9zcmNfbXYgPiBtYXhf bXYpIHx8Cj4gKwkJCQkJICAgICBtYXhfb3BfbXYgPiBtYXhfbXYpIHx8Cj4gIAkJCQkJICAgIHNy Y19tdyA+IG1heF9tdykgewo+ICAJCQkJCQlzcmNfcGRvID0gaTsKPiAgCQkJCQkJc25rX3BkbyA9 IGo7Cj4gIAkJCQkJCW1heF9tdyA9IHNyY19tdzsKPiAtCQkJCQkJbWF4X212ID0gbWF4X3NyY19t djsKPiArCQkJCQkJbWF4X212ID0gbWF4X29wX212Owo+ICAJCQkJCX0KPiAgCQkJCX0KPiAgCQkJ fQo+IEBAIC0yMjg1LDE2ICsyMjg4LDE4IEBAIHN0YXRpYyB1bnNpZ25lZCBpbnQgdGNwbV9wZF9z ZWxlY3RfcHBzX2FwZG8oc3RydWN0IHRjcG1fcG9ydCAqcG9ydCkKPiAgCX0KPiAgCj4gIAlpZiAo c3JjX3Bkbykgewo+IC0JCXBkbyA9IHBvcnQtPnNvdXJjZV9jYXBzW3NyY19wZG9dOwo+IC0KPiAt CQlwb3J0LT5wcHNfZGF0YS5taW5fdm9sdCA9IHBkb19wcHNfYXBkb19taW5fdm9sdGFnZShwZG8p Owo+IC0JCXBvcnQtPnBwc19kYXRhLm1heF92b2x0ID0gcGRvX3Bwc19hcGRvX21heF92b2x0YWdl KHBkbyk7Cj4gLQkJcG9ydC0+cHBzX2RhdGEubWF4X2N1cnIgPQo+IC0JCQltaW5fcHBzX2FwZG9f Y3VycmVudChwZG8sIHBvcnQtPnNua19wZG9bc25rX3Bkb10pOwo+IC0JCXBvcnQtPnBwc19kYXRh Lm91dF92b2x0ID0KPiAtCQkJbWluKHBkb19wcHNfYXBkb19tYXhfdm9sdGFnZShwZG8pLCBwb3J0 LT5wcHNfZGF0YS5vdXRfdm9sdCk7Cj4gLQkJcG9ydC0+cHBzX2RhdGEub3BfY3VyciA9Cj4gLQkJ CW1pbihwb3J0LT5wcHNfZGF0YS5tYXhfY3VyciwgcG9ydC0+cHBzX2RhdGEub3BfY3Vycik7Cj4g KwkJc3JjID0gcG9ydC0+c291cmNlX2NhcHNbc3JjX3Bkb107Cj4gKwkJc25rID0gcG9ydC0+c25r X3Bkb1tzbmtfcGRvXTsKPiArCj4gKwkJcG9ydC0+cHBzX2RhdGEubWluX3ZvbHQgPSBtYXgocGRv X3Bwc19hcGRvX21pbl92b2x0YWdlKHNyYyksCj4gKwkJCQkJICAgICAgcGRvX3Bwc19hcGRvX21p bl92b2x0YWdlKHNuaykpOwo+ICsJCXBvcnQtPnBwc19kYXRhLm1heF92b2x0ID0gbWluKHBkb19w cHNfYXBkb19tYXhfdm9sdGFnZShzcmMpLAo+ICsJCQkJCSAgICAgIHBkb19wcHNfYXBkb19tYXhf dm9sdGFnZShzbmspKTsKPiArCQlwb3J0LT5wcHNfZGF0YS5tYXhfY3VyciA9IG1pbl9wcHNfYXBk b19jdXJyZW50KHNyYywgc25rKTsKPiArCQlwb3J0LT5wcHNfZGF0YS5vdXRfdm9sdCA9IG1pbihw b3J0LT5wcHNfZGF0YS5tYXhfdm9sdCwKPiArCQkJCQkgICAgICBwb3J0LT5wcHNfZGF0YS5vdXRf dm9sdCk7Cj4gKwkJcG9ydC0+cHBzX2RhdGEub3BfY3VyciA9IG1pbihwb3J0LT5wcHNfZGF0YS5t YXhfY3VyciwKPiArCQkJCQkgICAgIHBvcnQtPnBwc19kYXRhLm9wX2N1cnIpOwo+ICAJfQo+ICAK PiAgCXJldHVybiBzcmNfcGRvOwo+IC0tIAo+IDIuMjAuMC40MDUuZ2JjMWJiYzZmODUtZ29vZwoK dGhhbmtzLAo= 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.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,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 B01F2C43387 for ; Tue, 18 Dec 2018 12:00:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 869D721841 for ; Tue, 18 Dec 2018 12:00:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726818AbeLRMA4 (ORCPT ); Tue, 18 Dec 2018 07:00:56 -0500 Received: from mga14.intel.com ([192.55.52.115]:5156 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726802AbeLRMAz (ORCPT ); Tue, 18 Dec 2018 07:00:55 -0500 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Dec 2018 04:00:54 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,367,1539673200"; d="scan'208";a="130920664" Received: from kuha.fi.intel.com ([10.237.72.189]) by fmsmga001.fm.intel.com with SMTP; 18 Dec 2018 04:00:52 -0800 Received: by kuha.fi.intel.com (sSMTP sendmail emulation); Tue, 18 Dec 2018 14:00:51 +0200 Date: Tue, 18 Dec 2018 14:00:51 +0200 From: Heikki Krogerus To: Kyle Tso Cc: linux@roeck-us.net, gregkh@linuxfoundation.org, Adam.Thomson.Opensource@diasemi.com, badhri@google.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v3] usb: typec: tcpm: Extend the matching rules on PPS APDO selection Message-ID: <20181218120051.GC14121@kuha.fi.intel.com> References: <20181217132213.91566-1-kyletso@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20181217132213.91566-1-kyletso@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, Dec 17, 2018 at 09:22:13PM +0800, Kyle Tso wrote: > Current matching rules ensure that the voltage range of selected Source > Capability is entirely within the range defined in one of the Sink > Capabilities. This is reasonable but not practical because Sink may not > support wide range of voltage when sinking power while Source could > advertise its capabilities in relatively wider range. For example, a > Source PDO advertising 3.3V-11V@3A (9V Prog of Fixed Nominal Voltage) > will not be selected if the Sink requires 5V-12V@3A PPS power. However, > the Sink could work well if the requested voltage range in RDOs is > 5V-11V@3A. > > Currently accepted: > |--------- source -----| > |----------- sink ---------------| > > Currently not accepted: > |--------- source -----| > |----------- sink ---------------| > > |--------- source -----| > |----------- sink ---------------| > > |--------- source -----------------| > |------ sink -------| > > To improve the usability, change the matching rules to what listed > below: > a. The Source PDO is selectable if any portion of the voltage range > overlaps one of the Sink PDO's voltage range. > b. The maximum operational voltage will be the lower one between the > selected Source PDO and the matching Sink PDO. > c. The maximum power will be the maximum operational voltage times the > maximum current defined in the selected Source PDO > d. Select the Source PDO with the highest maximum power > > Signed-off-by: Kyle Tso Reviewed-by: Heikki Krogerus > --- > Changelog since v1: > - updated the commit message as suggested by Guenter Roeck > > Changelog since v2: > - fixed the coding style problems as suggested by Heikki Krogerus > > - Corrected a wrong word in the commit message as suggested by Adam Thomson > > --- > drivers/usb/typec/tcpm/tcpm.c | 35 ++++++++++++++++++++--------------- > 1 file changed, 20 insertions(+), 15 deletions(-) > > diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c > index 3620efee2688..4bc29b586698 100644 > --- a/drivers/usb/typec/tcpm/tcpm.c > +++ b/drivers/usb/typec/tcpm/tcpm.c > @@ -2213,7 +2213,8 @@ static unsigned int tcpm_pd_select_pps_apdo(struct tcpm_port *port) > unsigned int i, j, max_mw = 0, max_mv = 0; > unsigned int min_src_mv, max_src_mv, src_ma, src_mw; > unsigned int min_snk_mv, max_snk_mv; > - u32 pdo; > + unsigned int max_op_mv; > + u32 pdo, src, snk; > unsigned int src_pdo = 0, snk_pdo = 0; > > /* > @@ -2263,16 +2264,18 @@ static unsigned int tcpm_pd_select_pps_apdo(struct tcpm_port *port) > continue; > } > > - if (max_src_mv <= max_snk_mv && > - min_src_mv >= min_snk_mv) { > + if (min_src_mv <= max_snk_mv && > + max_src_mv >= min_snk_mv) { > + max_op_mv = min(max_src_mv, max_snk_mv); > + src_mw = (max_op_mv * src_ma) / 1000; > /* Prefer higher voltages if available */ > if ((src_mw == max_mw && > - min_src_mv > max_mv) || > + max_op_mv > max_mv) || > src_mw > max_mw) { > src_pdo = i; > snk_pdo = j; > max_mw = src_mw; > - max_mv = max_src_mv; > + max_mv = max_op_mv; > } > } > } > @@ -2285,16 +2288,18 @@ static unsigned int tcpm_pd_select_pps_apdo(struct tcpm_port *port) > } > > if (src_pdo) { > - pdo = port->source_caps[src_pdo]; > - > - port->pps_data.min_volt = pdo_pps_apdo_min_voltage(pdo); > - port->pps_data.max_volt = pdo_pps_apdo_max_voltage(pdo); > - port->pps_data.max_curr = > - min_pps_apdo_current(pdo, port->snk_pdo[snk_pdo]); > - port->pps_data.out_volt = > - min(pdo_pps_apdo_max_voltage(pdo), port->pps_data.out_volt); > - port->pps_data.op_curr = > - min(port->pps_data.max_curr, port->pps_data.op_curr); > + src = port->source_caps[src_pdo]; > + snk = port->snk_pdo[snk_pdo]; > + > + port->pps_data.min_volt = max(pdo_pps_apdo_min_voltage(src), > + pdo_pps_apdo_min_voltage(snk)); > + port->pps_data.max_volt = min(pdo_pps_apdo_max_voltage(src), > + pdo_pps_apdo_max_voltage(snk)); > + port->pps_data.max_curr = min_pps_apdo_current(src, snk); > + port->pps_data.out_volt = min(port->pps_data.max_volt, > + port->pps_data.out_volt); > + port->pps_data.op_curr = min(port->pps_data.max_curr, > + port->pps_data.op_curr); > } > > return src_pdo; > -- > 2.20.0.405.gbc1bbc6f85-goog thanks, -- heikki