Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp2446031ybl; Mon, 20 Jan 2020 03:09:07 -0800 (PST) X-Google-Smtp-Source: APXvYqzlrfYPb2DHCSPS+DBPEH/zfw8iVrqq3TCDeyXaPtK11RQqtUcp3ltuJsx9bAGPTrX6M8rY X-Received: by 2002:a9d:600e:: with SMTP id h14mr15148365otj.113.1579518547612; Mon, 20 Jan 2020 03:09:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579518547; cv=none; d=google.com; s=arc-20160816; b=Gyx5nfcyhE+TUQkvHHIj27NSBeIOUayt4Ivd5QpMG905aj5HTV4gl5q/4clSjr+OHo LwvsNlE8DLQa4ulDPRIDLoFoZ2rjUrg0xPgoZn6nDirXvtTkQQBurnUCiklo8Vkp01Sr luTN6FGsbqpu6MiTP8SkXvb3byv92468Amm9uN8JjSJOFS2+mTU+eB9RLIRWwcWEM9zR 2DPR2pRYJ3NS+vvqJumDPfMy8FKqOjlyQWZ8XmSJ/D8EWjMcP6tgnt2zKra8AVPBQEI2 ts1xF0BoXL/CG+MyNbKEciGT6vYd9MaP6GdiX1FYrCO0XY5sOv7QCPYExwVgw7RR2/gz 4gxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:content-disposition :mime-version:references:message-id:subject:cc:to:from:date; bh=lO6eGPOHAYTGJiG3Hu+lZb24VpKQXQ/vDb4wcvoO/U0=; b=mSBqU06ovTbY18+3kzwyFHiv7ICODJjdjeXmjdkHw+VeXn3SyfUKXGtk6n77BqPyO5 VhCRhYlK5P9Bmmv6pACe2ezpCHchB2Lnlgw3iZgIDOxM5a2lORwRs2ZVLjP+qdzE/jFd RX0kK7Yy4KTAwnPryW9DOeVWY8W4s7a6JNlG0vGYgRN/kUCNFbhjOnr+onk1koN0Pvt4 tIlfYv6e5l3E7ddgQ2sWHYsFjJqgVaBGUIIWNOLTfDtNG4j2xeG8g4+SArDdw9d+5KSK FZheRRmUd+rmhKGwX5Caxdh6hOUU5wO1wY5fG3ZiC0LhJTsGsNWWiwJIvzG7RxDzuaFr 6xgw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g14si19124208otj.10.2020.01.20.03.08.56; Mon, 20 Jan 2020 03:09:07 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727092AbgATLHf (ORCPT + 99 others); Mon, 20 Jan 2020 06:07:35 -0500 Received: from mga07.intel.com ([134.134.136.100]:48060 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726148AbgATLHe (ORCPT ); Mon, 20 Jan 2020 06:07:34 -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 orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Jan 2020 03:07:34 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,341,1574150400"; d="scan'208";a="274942210" Received: from kuha.fi.intel.com ([10.237.72.53]) by fmsmga001.fm.intel.com with SMTP; 20 Jan 2020 03:07:31 -0800 Received: by kuha.fi.intel.com (sSMTP sendmail emulation); Mon, 20 Jan 2020 13:07:30 +0200 Date: Mon, 20 Jan 2020 13:07:30 +0200 From: Heikki Krogerus To: Thomas Hebb Cc: linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Guenter Roeck , linux-usb@vger.kernel.org Subject: Re: [PATCH] usb: typec: fix "op-sink-microwatt" defaults that were in mW Message-ID: <20200120110730.GB32175@kuha.fi.intel.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Thomas, On Mon, Jan 20, 2020 at 02:53:16AM -0800, Thomas Hebb wrote: > commit 8f6244055bd3 ("usb: typec: fusb302: Always provide fwnode for the > port") and commit 4c912bff46cc ("usb: typec: wcove: Provide fwnode for > the port") converted a legacy TCPM platdata structure to a more generic > format. However, one field, denoting required sink power, was specified > in mW in the old format but uW in the new format. The migration failed > to account for this, meaning that the values are now 1000x too small. > > Correct the issue by converting the values to uW. > > Signed-off-by: Thomas Hebb Thanks for catching this. You should split this in two, one patch for each driver, and those should have proper "Fixes:" tags. I think those should also go to the stable trees, so you'll also need the stable tag (Cc: stable@vger.kernel.org). > --- > > drivers/usb/typec/tcpm/fusb302.c | 2 +- > drivers/usb/typec/tcpm/wcove.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/usb/typec/tcpm/fusb302.c b/drivers/usb/typec/tcpm/fusb302.c > index ed8655c6af8c..b498960ff72b 100644 > --- a/drivers/usb/typec/tcpm/fusb302.c > +++ b/drivers/usb/typec/tcpm/fusb302.c > @@ -1666,7 +1666,7 @@ static const struct property_entry port_props[] = { > PROPERTY_ENTRY_STRING("try-power-role", "sink"), > PROPERTY_ENTRY_U32_ARRAY("source-pdos", src_pdo), > PROPERTY_ENTRY_U32_ARRAY("sink-pdos", snk_pdo), > - PROPERTY_ENTRY_U32("op-sink-microwatt", 2500), > + PROPERTY_ENTRY_U32("op-sink-microwatt", 2500000), > { } > }; > > diff --git a/drivers/usb/typec/tcpm/wcove.c b/drivers/usb/typec/tcpm/wcove.c > index edc271da14f4..9b745f432c91 100644 > --- a/drivers/usb/typec/tcpm/wcove.c > +++ b/drivers/usb/typec/tcpm/wcove.c > @@ -597,7 +597,7 @@ static const struct property_entry wcove_props[] = { > PROPERTY_ENTRY_STRING("try-power-role", "sink"), > PROPERTY_ENTRY_U32_ARRAY("source-pdos", src_pdo), > PROPERTY_ENTRY_U32_ARRAY("sink-pdos", snk_pdo), > - PROPERTY_ENTRY_U32("op-sink-microwatt", 15000), > + PROPERTY_ENTRY_U32("op-sink-microwatt", 15000000), > { } > }; > > -- > 2.24.1 thanks, -- heikki