From patchwork Mon Apr 16 06:54:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Li X-Patchwork-Id: 10342299 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id F19EE60365 for ; Mon, 16 Apr 2018 07:10:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DA5A9285B7 for ; Mon, 16 Apr 2018 07:10:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 54DE328565; Mon, 16 Apr 2018 07:10:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 72C1A28574 for ; Mon, 16 Apr 2018 07:10:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751942AbeDPHKV (ORCPT ); Mon, 16 Apr 2018 03:10:21 -0400 Received: from mail-eopbgr10045.outbound.protection.outlook.com ([40.107.1.45]:65440 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750716AbeDPHKU (ORCPT ); Mon, 16 Apr 2018 03:10:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=7rwaFea7Muh1SmkV6FqmgRwXnHj7LjdL8e8MCSnP2Y4=; b=E+msbQeXE2liztGVMNOpKINfJg8RwIdyVcB08geAP2cKtWnuAV5Hj5doGsQX3N+cXFsXmhI8OHWNDAH1ndEObHWAEYDA2zH/ofSXm+EM72QkwMVMKeaUUvFAyhPcJ1SI1fU4cpn6ziIWPTmnPmzdRUSsettnMghoW918IEp+4d0= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=jun.li@nxp.com; Received: from b47624-OptiPlex-7040.ap.freescale.net (92.121.68.129) by AM0PR0402MB3907.eurprd04.prod.outlook.com (2603:10a6:208:f::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.675.9; Mon, 16 Apr 2018 07:10:13 +0000 From: Li Jun To: gregkh@linuxfoundation.org, robh+dt@kernel.org, heikki.krogerus@linux.intel.com, hdegoede@redhat.com Cc: linux@roeck-us.net, rmfrfs@gmail.com, yueyao.zhu@gmail.com, linux-usb@vger.kernel.org, linux-imx@nxp.com Subject: [PATCH v5 1/5] usb: typec: tcpm: pdo matching optimization Date: Mon, 16 Apr 2018 14:54:33 +0800 Message-Id: <1523861677-16893-2-git-send-email-jun.li@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1523861677-16893-1-git-send-email-jun.li@nxp.com> References: <1523861677-16893-1-git-send-email-jun.li@nxp.com> MIME-Version: 1.0 X-Originating-IP: [92.121.68.129] X-ClientProxiedBy: HK2P15301CA0001.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::11) To AM0PR0402MB3907.eurprd04.prod.outlook.com (2603:10a6:208:f::27) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603328)(7153060)(7193020); SRVR:AM0PR0402MB3907; X-Microsoft-Exchange-Diagnostics: 1; AM0PR0402MB3907; 3:gzbzPgmcCoZpJeOf7bzq0j7RdX49xrA0kMbvtPSOjWQw4wvDvd0zGaidB04EAEdE1X2qz3UvbiPnqa5V1qaaUukc9pIAI/KeGPr/aXN10h4Md2me6gWeK1uhTFf/pEKau0WNFliK4Y8G6h+rJkvDGSwO0GdHTYzkgY7mBeipvI1GML/mhermMEtOjLpe3Cg59IpfNv2W0ngemyoDFB/YXOllJMX61rIlAPcMg8OeGU0fMPMwzs81xGwGM0XkOu8u; 25:tgI6k2ZyxbA8uPuhoNI6B3N2rvBrc3ENLFJ2AnMTrS54G9TbZb0cnYFPCVoa3sIaB087PAWVtsefe6wyhZNrUTgMBblAM1tvGugDkSZPqomx8Mq29C1DcAhDGnvkMS4t/cuaMVL3aSCYIPl9xiM+qglp0By8XhkoFtY8JZaFS0W9NKq7ify5vtMAMmrtC9r9UrPiqJHk7nAP4IBxKhssuB0Mh0LgKucx+qZc5NJ/fMR7ebId2AW+eRinvfrf2TE4CK9GhOaHG5kB990iMtbbR2KaQbXd2I2ToDuIFj/tFqPx03qldu6XvMc3WdB/I8M/7iwUjgeo08/0v4I34EAWdw==; 31:yZz4uG4ipMh8YnNaZccQeDqfkt0zbVJIbCaQyxe3NMCEucej00t6+j5M/J4366yxVsdDGYQheHInVVd4zLNpJcgHE3QMrYnbvZRMwXV8yGteqgAaJhsLYN6UUitKYIW9IcAzqiH9agQQgFLJYsNYOcb09BuOZgFylKiYcWPrNDFZHEfS04GSecN8asXo/NzACBDlvTk+Yr6oe7GQvNLD5gMVPVmnxQqbvTuwFXIC0uU= X-MS-TrafficTypeDiagnostic: AM0PR0402MB3907: X-Microsoft-Exchange-Diagnostics: 1; AM0PR0402MB3907; 20:zC6bJiwUywIidxUBk/PPyBbqQBWFiyAA4ZtNX4hWUkurT113Z9ucO5kV9deARFJLfaMI90kP+EmLVGnkwZk7R812o1mbepUlSGQN2r6u8CSv3N+5zX7VLS2zhSRlKg1W2WSl1tvrv0fCbt3180SJP8o7vdx9ypol/kXSYawJU+NYp1H7aEz5YK9xr/DyhsG7eGNya33vqL0o9Tarv88uEzXa93jDOKMnOa0RNWwZCwytdMD0eoBBrCiQdyUSgaLzRkCuJopJ0fHcpDIJ3NcB54CyoE2HICbX14tSm2/ObdeGm2nKWEaPw53lEqrZMDzP9cKlSyF8JaVr3GI2BevBXe80nmIJk7bdLj4OM5hZa18v8Gw3WLW7lx1+yP5mz9EWlLjvj8S5I/Dk6PTsg8eHZ3uHcNF1UNOBFIH6LBHy/9lCBvE2wYbHkRHXhyy64zhcA0YKmCQD1xTHrsUdGcRKZfGQzb6thi8vZLQLeXk1KKHcqqDJs0RPCg3JdVv/5Yb9; 4:h4hX/6s9vLRypYpII7jNjQ2HR1am4x9C0AAPDFIeyAo2aSiWuDteasQsPQ569vfRrMRqns1b5F2OUEezMLUy64aJ9ucymS2YHbQO3zOopFOujvR9Aziy5NkJZX1nQPZhu36t+aP5SFqD+4ojY6H13NSnArpw3MwWf3/okqT7SWIN1AcxQhRFn2s4wxpV6Yc7BgUieTIMiDGvbJGCCmr8wg7hfh7TpNvlEBA/fy3BvvMoSzUnuqZA7o/Ye2il7YRM7hYDBTHtqxp+033AQiM52KqzxrqZqQ+OncSF7f2X5czHHgm5uwdcBxoR+Ie46r9I X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231232)(944501327)(52105095)(93006095)(93001095)(10201501046)(3002001)(6055026)(6041310)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:AM0PR0402MB3907; BCL:0; PCL:0; RULEID:; SRVR:AM0PR0402MB3907; X-Forefront-PRVS: 0644578634 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(376002)(346002)(39380400002)(366004)(396003)(199004)(189003)(52116002)(7736002)(11346002)(51416003)(316002)(305945005)(2906002)(478600001)(16586007)(26005)(76176011)(6666003)(86362001)(59450400001)(575784001)(105586002)(6506007)(106356001)(25786009)(386003)(6486002)(97736004)(66066001)(47776003)(486006)(6116002)(16526019)(3846002)(6512007)(186003)(53936002)(5660300001)(36756003)(476003)(2616005)(50226002)(68736007)(48376002)(50466002)(446003)(4326008)(8936002)(81156014)(956004)(8676002)(81166006)(39060400002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR0402MB3907; H:b47624-OptiPlex-7040.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR0402MB3907; 23:gnQRz120UGbSyBrcJuey0S2aD6dX/QCaxQF70Vg?= =?us-ascii?Q?ZX2TpurhW7js1OEUmWn6rh8QSMWfQkcKAuzrh1Qx7AMQGbHpNbo+iSFKZkpz?= =?us-ascii?Q?I6GUoa/T7T8EChXnwN+hRGQTmRg7Qf7wi9hZjnWyA9+VlqDiHTDiLoZ4IlDZ?= =?us-ascii?Q?enDnbB1YHk39MGcTzKEtDkSZtx88ISX8++qzUwl5bQtYcV+L2wEMGplLRpGk?= =?us-ascii?Q?7kmtiHrFnOE0ZGcdSQZ+zYNoIM1hgJr2vlgheMsMaqjmepwBuHrshWS8vp8h?= =?us-ascii?Q?m0HXn8atk5a+qnHbxWSIRbFLnjq18r53AzZKyKQ2yeFGoDjXXGPHSpkwo8za?= =?us-ascii?Q?ksR2PIbAutyzK5o8kVASlkUYOMCp+3HOSG++hWjK54uzos7uxoVFu8cwdvhk?= =?us-ascii?Q?6Eyb/OkzKWZwua1TK1mNw5uBJT0+8uHV2o4ddncA/A8Ju7YnM9Sb5He3uHJx?= =?us-ascii?Q?BYtAb468KbiNl56H09U4WxpOzGBsNUIEIpRYHoJyj5Ahwa5AstCh59WJl4Ak?= =?us-ascii?Q?BxiH9KAYvt63VJ6CuXZUs9wZFK2TIVgv0iI71BcTXjEjjTETU6MElCREDdyz?= =?us-ascii?Q?ba57kbgXVjmSvMNme044lR6AYmZKrKJoWYqzNWglMWac2s4hpOS7lteBAyQW?= =?us-ascii?Q?RCjVY7KzNWek0fL39jfbySbtCxM41G6S2PDWAgOD77U0uAf5xW3EyUk0nghT?= =?us-ascii?Q?jK5exjtMGWkS/MFLpX/wcZ8HxqPCMJ6QG/v1i8wFaV4FiI9IJs4VbYgW2WsP?= =?us-ascii?Q?CyN86ZbGHQ/8SRU7qt1HTBkSpXIfJKq4XPn4HCOpww1nm4hSau+V4FT4lOye?= =?us-ascii?Q?lXEkGXxXPD8UHEsQ8y1KFOXWJmiaLjjtcXS9JXqD0MpYw0qgEiGUQOTvyIHO?= =?us-ascii?Q?cvbtsz3qCGEH3tnPMw/W3yntbVXMK5VekGMqz453SL38yk98UjgH/3aaMdKq?= =?us-ascii?Q?NtOrhGkoANvRi48F/eV5aFo19gMgrOtXHg/l0uc3ysuwU5nDHhemC7G/nsqt?= =?us-ascii?Q?DTDolrflwAW+4KxUJV9nslk9Ub8JUNoo9qiF0eLxVi4FR1YzI65Ddik5ZrRB?= =?us-ascii?Q?eN5gk9ksLdi2E1bPQcnDI4uBkv6paaAWdmLW4pF04U+PRKdFpXJ185y7t3gE?= =?us-ascii?Q?6n4HK6CNNspXU/bqDmAjk9+C+MtZirpbzsKVQTSZS4DHZCSYcFRa3htj7Xeh?= =?us-ascii?Q?V0QuMkcCeMcN/B/Jp6hser3eLibpBDz+G4GLYbgeOZ9xEU35g3UTQRQ1vmw?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Antispam-Message-Info: KU6ixGMWndUSvwOU40TC4auOv4FQnnLSvE1lMPWKypL9TQoPQgf53ainSE38eQSMdSlrDnaVR2FtMalO5kSlqcoZApYNFnOHatm9rNxNpNvbrVtqMXD8pw89iKoWHn/DB2/u61iEGkbZ8jivyL2jhHQhcGSEEBQWeaEn3sDRimkG1qIf22JMKWYF0Hxs/TV1 X-Microsoft-Exchange-Diagnostics: 1; AM0PR0402MB3907; 6:4hy7TOSm1GJdWWrP5nB6WYbhAIR0AUmKVpclrNkXmTikJNGElLb6oq9Jm0sgEZnkOmZY5Ge7r6+DeiLSnptg/OFoSiUoGqFgwhLv1S+s0xuEYheKnoc9b44waLAj/cZBgmVwkTLvEpqV1rSVzQ7CkqvTEjkl4jzh2YaGTA95yeOPfs2PWw62X0KBnpMY5Y+QwvWqDZjLJADPzColcnfH7aa310X5fI1PUD1yBSkBij/dhlG5Ha+ylw1842Yu53cKbAyXseC8OWZcZCHlaKunfF7X4VLkxvkWrSJCM8oOuxkRXpXkyfKu2HGog0cNj+qqd4FLKlSuohh5c9HtJAKaJvQiJeUsHvpSL53Npy38g9V+5Z0uS83AcEsYXy6LwpGOBskEmhIAyI+lemf5Dq1iJ9i9s7RjU2lh8/ODrlo48yMzyr0Yba4qjWVp8368TOweif2vdvsiLufcBFppOcWLsg==; 5:E5xx9CO2pX8iSN8BMlpcqZvmLKP/JvLCUgQwXug4/x+njjYDc0i7BipGA4H8rwW+bKNJpWKGjQDOuQYYjuq5YmJgWfHQQ2hcpsXsMgcN6qEwCcD6Q63v1utr94rrS7rqt73U8qToqPeD7BjT5x6Pb34hJe5UdbEXZiTkYSmcoqg=; 24:+5YhOo6jNXFBX8VYtTugqCIOzjb7xwwbxKyGyyzd6gM+SozzxA9QbNEaInKSn6xGYMyCRT8AyRdZ3KvGcP13tf6q6A6vz4jg4+S65SpUYB4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM0PR0402MB3907; 7:SVkHR5DidO4fgLCJTgd4xEheFlc4kQ9ng8Y9do//5fCWqnf4NaB5+5COMgQ7KVu0AjixmsZPDGl7rxOfO0LQjTI/KjeaxI7K101b70FQ//JtNEfmn13nga2QWWgUvvWmXd4jAYJQsanp5/kpT96KRTLteBrm/WnqGy20Oqm/v8ctG8Sxnhzdl8YnjZKemXoyV9o28jGUiAueG7+OI0TOQFXhPVKdzhClRl2gUzQbUZYcrEEucnUF1zl8sfH4EVjS X-MS-Office365-Filtering-Correlation-Id: 682c6a3e-ab4f-4bf9-ca03-08d5a3691b58 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Apr 2018 07:10:13.1771 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 682c6a3e-ab4f-4bf9-ca03-08d5a3691b58 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0402MB3907 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch is a combination of commit 57e6f0d7b804 ("typec: tcpm: Only request matching pdos") and source pdo selection optimization based on it, instead of only compare between the same pdo type of sink and source, we should check source pdo voltage range is within the voltage range of one sink pdo. Reviewed-by: Hans de Goede Signed-off-by: Li Jun Acked-by: Heikki Krogerus Acked-by: Guenter Roeck --- drivers/usb/typec/tcpm.c | 105 ++++++++++++++++++++++++++++++----------------- 1 file changed, 67 insertions(+), 38 deletions(-) diff --git a/drivers/usb/typec/tcpm.c b/drivers/usb/typec/tcpm.c index 677d121..048b953 100644 --- a/drivers/usb/typec/tcpm.c +++ b/drivers/usb/typec/tcpm.c @@ -1772,39 +1772,63 @@ static int tcpm_pd_check_request(struct tcpm_port *port) return 0; } -static int tcpm_pd_select_pdo(struct tcpm_port *port) +#define min_power(x, y) min(pdo_max_power(x), pdo_max_power(y)) +#define min_current(x, y) min(pdo_max_current(x), pdo_max_current(y)) + +static int tcpm_pd_select_pdo(struct tcpm_port *port, int *sink_pdo, + int *src_pdo) { - unsigned int i, max_mw = 0, max_mv = 0; + unsigned int i, j, max_src_mv = 0, min_src_mv = 0, max_mw = 0, + max_mv = 0, src_mw = 0, src_ma = 0, max_snk_mv = 0, + min_snk_mv = 0; int ret = -EINVAL; /* - * Select the source PDO providing the most power while staying within - * the board's voltage limits. Prefer PDO providing exp + * Select the source PDO providing the most power which has a + * matchig sink cap. */ for (i = 0; i < port->nr_source_caps; i++) { u32 pdo = port->source_caps[i]; enum pd_pdo_type type = pdo_type(pdo); - unsigned int mv, ma, mw; - if (type == PDO_TYPE_FIXED) - mv = pdo_fixed_voltage(pdo); - else - mv = pdo_min_voltage(pdo); + if (type == PDO_TYPE_FIXED) { + max_src_mv = pdo_fixed_voltage(pdo); + min_src_mv = max_src_mv; + } else { + max_src_mv = pdo_max_voltage(pdo); + min_src_mv = pdo_min_voltage(pdo); + } if (type == PDO_TYPE_BATT) { - mw = pdo_max_power(pdo); + src_mw = pdo_max_power(pdo); } else { - ma = min(pdo_max_current(pdo), - port->max_snk_ma); - mw = ma * mv / 1000; + src_ma = pdo_max_current(pdo); + src_mw = src_ma * min_src_mv / 1000; } - /* Perfer higher voltages if available */ - if ((mw > max_mw || (mw == max_mw && mv > max_mv)) && - mv <= port->max_snk_mv) { - ret = i; - max_mw = mw; - max_mv = mv; + for (j = 0; j < port->nr_snk_pdo; j++) { + pdo = port->snk_pdo[j]; + + if (pdo_type(pdo) == PDO_TYPE_FIXED) { + min_snk_mv = pdo_fixed_voltage(pdo); + max_snk_mv = pdo_fixed_voltage(pdo); + } else { + min_snk_mv = pdo_min_voltage(pdo); + max_snk_mv = pdo_max_voltage(pdo); + } + + if (max_src_mv <= max_snk_mv && + min_src_mv >= min_snk_mv) { + /* Prefer higher voltages if available */ + if ((src_mw == max_mw && min_src_mv > max_mv) || + src_mw > max_mw) { + *src_pdo = i; + *sink_pdo = j; + max_mw = src_mw; + max_mv = min_src_mv; + ret = 0; + } + } } } @@ -1816,13 +1840,16 @@ static int tcpm_pd_build_request(struct tcpm_port *port, u32 *rdo) unsigned int mv, ma, mw, flags; unsigned int max_ma, max_mw; enum pd_pdo_type type; - int index; - u32 pdo; + int src_pdo_index, snk_pdo_index; + u32 pdo, matching_snk_pdo; + int ret; - index = tcpm_pd_select_pdo(port); - if (index < 0) - return -EINVAL; - pdo = port->source_caps[index]; + ret = tcpm_pd_select_pdo(port, &snk_pdo_index, &src_pdo_index); + if (ret < 0) + return ret; + + pdo = port->source_caps[src_pdo_index]; + matching_snk_pdo = port->snk_pdo[snk_pdo_index]; type = pdo_type(pdo); if (type == PDO_TYPE_FIXED) @@ -1830,26 +1857,28 @@ static int tcpm_pd_build_request(struct tcpm_port *port, u32 *rdo) else mv = pdo_min_voltage(pdo); - /* Select maximum available current within the board's power limit */ + /* Select maximum available current within the sink pdo's limit */ if (type == PDO_TYPE_BATT) { - mw = pdo_max_power(pdo); - ma = 1000 * min(mw, port->max_snk_mw) / mv; + mw = min_power(pdo, matching_snk_pdo); + ma = 1000 * mw / mv; } else { - ma = min(pdo_max_current(pdo), - 1000 * port->max_snk_mw / mv); + ma = min_current(pdo, matching_snk_pdo); + mw = ma * mv / 1000; } - ma = min(ma, port->max_snk_ma); flags = RDO_USB_COMM | RDO_NO_SUSPEND; /* Set mismatch bit if offered power is less than operating power */ - mw = ma * mv / 1000; max_ma = ma; max_mw = mw; if (mw < port->operating_snk_mw) { flags |= RDO_CAP_MISMATCH; - max_mw = port->operating_snk_mw; - max_ma = max_mw * 1000 / mv; + if (type == PDO_TYPE_BATT && + (pdo_max_power(matching_snk_pdo) > pdo_max_power(pdo))) + max_mw = pdo_max_power(matching_snk_pdo); + else if (pdo_max_current(matching_snk_pdo) > + pdo_max_current(pdo)) + max_ma = pdo_max_current(matching_snk_pdo); } tcpm_log(port, "cc=%d cc1=%d cc2=%d vbus=%d vconn=%s polarity=%d", @@ -1858,16 +1887,16 @@ static int tcpm_pd_build_request(struct tcpm_port *port, u32 *rdo) port->polarity); if (type == PDO_TYPE_BATT) { - *rdo = RDO_BATT(index + 1, mw, max_mw, flags); + *rdo = RDO_BATT(src_pdo_index + 1, mw, max_mw, flags); tcpm_log(port, "Requesting PDO %d: %u mV, %u mW%s", - index, mv, mw, + src_pdo_index, mv, mw, flags & RDO_CAP_MISMATCH ? " [mismatch]" : ""); } else { - *rdo = RDO_FIXED(index + 1, ma, max_ma, flags); + *rdo = RDO_FIXED(src_pdo_index + 1, ma, max_ma, flags); tcpm_log(port, "Requesting PDO %d: %u mV, %u mA%s", - index, mv, ma, + src_pdo_index, mv, ma, flags & RDO_CAP_MISMATCH ? " [mismatch]" : ""); }