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=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 691AFC48BE6 for ; Wed, 16 Jun 2021 13:41:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4E0FE61241 for ; Wed, 16 Jun 2021 13:41:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232772AbhFPNnM (ORCPT ); Wed, 16 Jun 2021 09:43:12 -0400 Received: from mga11.intel.com ([192.55.52.93]:6739 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233162AbhFPNnI (ORCPT ); Wed, 16 Jun 2021 09:43:08 -0400 IronPort-SDR: cdU14Jz4ghW37p3YToV4VZ6GisTpFme2FHdyaZnZtrUiXn4Wy2093K/aXaJcDV8SkwqQmRREzE EQmp2IvMVgNg== X-IronPort-AV: E=McAfee;i="6200,9189,10016"; a="203154409" X-IronPort-AV: E=Sophos;i="5.83,278,1616482800"; d="scan'208";a="203154409" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jun 2021 06:40:42 -0700 IronPort-SDR: Lt07RJrdxe5oOrfZmM+ZpHT4AIw0XB/Z9/g/TyrMb9KXvSXMSRmUpNkEjbqEWfdRgR1Xmgw7lu mCQBv1C0BtBw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,278,1616482800"; d="scan'208";a="554809828" Received: from kuha.fi.intel.com ([10.237.72.162]) by fmsmga001.fm.intel.com with SMTP; 16 Jun 2021 06:40:39 -0700 Received: by kuha.fi.intel.com (sSMTP sendmail emulation); Wed, 16 Jun 2021 16:40:39 +0300 Date: Wed, 16 Jun 2021 16:40:38 +0300 From: Heikki Krogerus To: Badhri Jagan Sridharan Cc: Guenter Roeck , Greg Kroah-Hartman , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Kyle Tso , stable@vger.kernel.org Subject: Re: [PATCH v1] usb: typec: tcpci: Fix up sink disconnect thresholds for PD Message-ID: References: <20210615174323.1160132-1-badhri@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210615174323.1160132-1-badhri@google.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jun 15, 2021 at 10:43:23AM -0700, Badhri Jagan Sridharan wrote: > "Table 4-3 VBUS Sink Characteristics" of "Type-C Cable and Connector > Specification" defines the disconnect voltage thresholds of various > configurations. This change fixes the disconnect threshold voltage > calculation based on vSinkPD_min and vSinkDisconnectPD as defined > by the table. > > Fixes: e1a97bf80a022 ("usb: typec: tcpci: Implement Auto discharge disconnect callbacks") > Signed-off-by: Badhri Jagan Sridharan Acked-by: Heikki Krogerus > --- > drivers/usb/typec/tcpm/tcpci.c | 18 ++++++++++++------ > 1 file changed, 12 insertions(+), 6 deletions(-) > > diff --git a/drivers/usb/typec/tcpm/tcpci.c b/drivers/usb/typec/tcpm/tcpci.c > index 22862345d1ab..9858716698df 100644 > --- a/drivers/usb/typec/tcpm/tcpci.c > +++ b/drivers/usb/typec/tcpm/tcpci.c > @@ -21,8 +21,12 @@ > #define PD_RETRY_COUNT_DEFAULT 3 > #define PD_RETRY_COUNT_3_0_OR_HIGHER 2 > #define AUTO_DISCHARGE_DEFAULT_THRESHOLD_MV 3500 > -#define AUTO_DISCHARGE_PD_HEADROOM_MV 850 > -#define AUTO_DISCHARGE_PPS_HEADROOM_MV 1250 > +#define VSINKPD_MIN_IR_DROP_MV 750 > +#define VSRC_NEW_MIN_PERCENT 95 > +#define VSRC_VALID_MIN_MV 500 > +#define VPPS_NEW_MIN_PERCENT 95 > +#define VPPS_VALID_MIN_MV 100 > +#define VSINKDISCONNECT_PD_MIN_PERCENT 90 > > #define tcpc_presenting_rd(reg, cc) \ > (!(TCPC_ROLE_CTRL_DRP & (reg)) && \ > @@ -351,11 +355,13 @@ static int tcpci_set_auto_vbus_discharge_threshold(struct tcpc_dev *dev, enum ty > threshold = AUTO_DISCHARGE_DEFAULT_THRESHOLD_MV; > } else if (mode == TYPEC_PWR_MODE_PD) { > if (pps_active) > - threshold = (95 * requested_vbus_voltage_mv / 100) - > - AUTO_DISCHARGE_PD_HEADROOM_MV; > + threshold = ((VPPS_NEW_MIN_PERCENT * requested_vbus_voltage_mv / 100) - > + VSINKPD_MIN_IR_DROP_MV - VPPS_VALID_MIN_MV) * > + VSINKDISCONNECT_PD_MIN_PERCENT / 100; > else > - threshold = (95 * requested_vbus_voltage_mv / 100) - > - AUTO_DISCHARGE_PPS_HEADROOM_MV; > + threshold = ((VSRC_NEW_MIN_PERCENT * requested_vbus_voltage_mv / 100) - > + VSINKPD_MIN_IR_DROP_MV - VSRC_VALID_MIN_MV) * > + VSINKDISCONNECT_PD_MIN_PERCENT / 100; > } else { > /* 3.5V for non-pd sink */ > threshold = AUTO_DISCHARGE_DEFAULT_THRESHOLD_MV; > -- > 2.32.0.272.g935e593368-goog -- heikki