From patchwork Tue Aug 25 10:16:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qiwu Huang X-Patchwork-Id: 256934 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=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT 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 BA546C433E3 for ; Tue, 25 Aug 2020 10:18:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 947122068F for ; Tue, 25 Aug 2020 10:18:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="C3lnL1Or" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729793AbgHYKSe (ORCPT ); Tue, 25 Aug 2020 06:18:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49896 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729514AbgHYKS0 (ORCPT ); Tue, 25 Aug 2020 06:18:26 -0400 Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D36CC061755; Tue, 25 Aug 2020 03:18:26 -0700 (PDT) Received: by mail-pf1-x42f.google.com with SMTP id u128so6967805pfb.6; Tue, 25 Aug 2020 03:18:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=abce8nytRXIsJmVCs+R7mlyjniT5KpaodlzSXtD9Q08=; b=C3lnL1OrxTNuHW5mTA6pj7CUWq7RpEB4Qll4778RLOundnCNAx0S0qokKlhPK+T2Ex VsrjF9IkDnu/GnURURHExUI6BKYX9wQHjCMiTFdMpQuRxpdEi+fIHOEyFH7HbJ4Uh7/a VzAG0UbwLMgACy/xXLo0OIwntOHJRiWySXPnHOTCPG4Mcdpd9zNlMoqMpKl9S2YIwYVD KaRTbuERPxnL8gXrNa+PCk0rUEfGn8wEo56L2IjhqXjYU72d+uXIX39O2pCAknbw1jTb ayDdZInNuSdYXlgt5ljk67gTRsmLl2+aCLKVLuUheugEoFvxHhIU9Hz7THEgGAHQwXrg 4Lgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=abce8nytRXIsJmVCs+R7mlyjniT5KpaodlzSXtD9Q08=; b=fky+fhyW2kDXgoRclIheUpqCcfTe9XL+rOxCNonP1JK5ZSreXPT6umglGMo5lONbIh jXzFnN2R0DouN0DTagi7jY5udnu2A8VcunyzKlX+3Up2FU0yk8kUbRk5Ynb8KEtA8jGO nM6q1dP48F2cHWp5B+iS9+iv9Jfpy8qe40z4PZOATI6XSeJjQB4Z7bwC2mvwBNDvBjTa bIikvsCfwSnHJOpAVtPptjyXzShLuXAOh6EVJiPWyDf+d2J6Fl18A4R8ioRwCcJkgdC9 0tYWRLRkXUiBSExn9/5lQ5fp9d6NEvhoOw+tbPSjZ3u1U9QQ7LBxG+cbreO1M+Dznk0t bRLg== X-Gm-Message-State: AOAM5326AyM6Gk1+Mym54GPooW9rfuy6k3MJ+klVDLtRfLiwc7CEXnWF rnzhr209cF7kaSiBzhRpMuM= X-Google-Smtp-Source: ABdhPJwKf+gYfy8HTNuLF0IitXG96hEG+ZUHPAjWk2HT1yFLXOyUg9DLPWG9At+ocO37mO2icz2yyg== X-Received: by 2002:a62:33c2:: with SMTP id z185mr7019582pfz.242.1598350705565; Tue, 25 Aug 2020 03:18:25 -0700 (PDT) Received: from xiaomi.mioffice.cn ([43.224.245.179]) by smtp.gmail.com with ESMTPSA id 19sm1788911pjk.28.2020.08.25.03.18.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 03:18:24 -0700 (PDT) From: Qiwu Huang To: sre@kernel.org Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, gregkh@linuxfoundation.org, Qiwu Huang Subject: [PATCH v10 1/4] power: supply: core: add quick charge type property Date: Tue, 25 Aug 2020 18:16:14 +0800 Message-Id: X-Mailer: git-send-email 2.28.0 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org From: Qiwu Huang Reports the kind of quick charge type based on different adapter power. Signed-off-by: Qiwu Huang --- Documentation/ABI/testing/sysfs-class-power | 21 ++++++ drivers/power/supply/power_supply_sysfs.c | 1 + drivers/power/supply/qcom_smbb.c | 81 ++++++++++++++++++++- include/linux/power_supply.h | 14 ++++ 4 files changed, 116 insertions(+), 1 deletion(-) diff --git a/Documentation/ABI/testing/sysfs-class-power b/Documentation/ABI/testing/sysfs-class-power index 40213c73bc9c..a6ec1c45adee 100644 --- a/Documentation/ABI/testing/sysfs-class-power +++ b/Documentation/ABI/testing/sysfs-class-power @@ -709,3 +709,24 @@ Description: Access: Read Valid values: 1-31 + +What: /sys/class/power_supply//quick_charge_type +Date: Jul 2020 +Contact: Fei Jiang + Description: + Reports the kind of quick charge type based on different adapter power. + Different quick charge type represent different charging power. + QUICK_CHARGE_NORMAL : Charging Power <= 10W + QUICK_CHARGE_FAST : 10W < Charging Power <= 20W + QUICK_CHARGE_FLASH : 20W < Charging Power <= 30W + QUICK_CHARGE_TURBE : 30W < Charging Power <= 50W + QUICK_CHARGE_SUPER : Charging Power > 50W + + Access: Read-Only + Valid values: + 0: QUICK_CHARGE_NORMAL, + 1: QUICK_CHARGE_FAST, + 2: QUICK_CHARGE_FLASH, + 3: QUICK_CHARGE_TURBE, + 4: QUICK_CHARGE_SUPER. + diff --git a/drivers/power/supply/power_supply_sysfs.c b/drivers/power/supply/power_supply_sysfs.c index 3d383086018c..67f568c88c0b 100644 --- a/drivers/power/supply/power_supply_sysfs.c +++ b/drivers/power/supply/power_supply_sysfs.c @@ -210,6 +210,7 @@ static struct power_supply_attr power_supply_attrs[] = { POWER_SUPPLY_ATTR(MODEL_NAME), POWER_SUPPLY_ATTR(MANUFACTURER), POWER_SUPPLY_ATTR(SERIAL_NUMBER), + POWER_SUPPLY_ATTR(QUICK_CHARGE_TYPE), }; static struct attribute * diff --git a/drivers/power/supply/qcom_smbb.c b/drivers/power/supply/qcom_smbb.c index c890e1cec720..21ddfa39f655 100644 --- a/drivers/power/supply/qcom_smbb.c +++ b/drivers/power/supply/qcom_smbb.c @@ -90,6 +90,12 @@ #define STATUS_CHG_FAST BIT(7) /* Fast charging */ #define STATUS_CHG_GONE BIT(8) /* No charger is connected */ +#define IMAX_NORMAL 2000000 +#define IMAX_FAST 4000000 +#define IMAX_FLASH 6000000 +#define IMAX_TURBE 10000000 +#define IMAX_SUPER 12000000 + enum smbb_attr { ATTR_BAT_ISAFE, ATTR_BAT_IMAX, @@ -111,6 +117,7 @@ struct smbb_charger { bool dc_disabled; bool jeita_ext_temp; + bool pd_verifed; unsigned long status; struct mutex statlock; @@ -485,6 +492,58 @@ static const struct smbb_irq { { "dc-valid", smbb_dc_valid_handler }, }; +struct quick_charge { + enum power_supply_type adap_type; + enum power_supply_quick_charge_type adap_cap; +}; + +static struct quick_charge adapter_cap[10] = { + { POWER_SUPPLY_TYPE_USB, QUICK_CHARGE_NORMAL }, + { POWER_SUPPLY_TYPE_USB_DCP, QUICK_CHARGE_NORMAL }, + { POWER_SUPPLY_TYPE_USB_CDP, QUICK_CHARGE_NORMAL }, + { POWER_SUPPLY_TYPE_USB_ACA, QUICK_CHARGE_NORMAL }, + { POWER_SUPPLY_TYPE_USB_FLOAT, QUICK_CHARGE_NORMAL }, + { POWER_SUPPLY_TYPE_USB_PD, QUICK_CHARGE_FAST }, + { POWER_SUPPLY_TYPE_USB_HVDCP, QUICK_CHARGE_FAST }, + { POWER_SUPPLY_TYPE_USB_HVDCP_3, QUICK_CHARGE_FAST }, + { POWER_SUPPLY_TYPE_USB_HVDCP_3P5, QUICK_CHARGE_FAST }, + {0, 0}, +}; + +static int get_quick_charge_type(struct smbb_charger *chg) +{ + union power_supply_propval prop = {0, }; + int charger_type, rc; + int i = 0; + + rc = power_supply_get_property(chg->bat_psy, + POWER_SUPPLY_PROP_STATUS, &prop); + if (rc < 0) + return rc; + if (prop.intval == POWER_SUPPLY_STATUS_DISCHARGING) + return 0; + + rc = power_supply_get_property(chg->usb_psy, + POWER_SUPPLY_PROP_USB_TYPE, &prop); + if (rc < 0) + return rc; + charger_type = prop.intval; + + /* when pd adapter is authenticated successfully */ + if ((charger_type == POWER_SUPPLY_TYPE_USB_PD) && chg->pd_verifed) { + return QUICK_CHARGE_TURBE; + } + + while (adapter_cap[i].adap_type != 0) { + if (charger_type == adapter_cap[i].adap_type) { + return adapter_cap[i].adap_cap; + } + i++; + } + + return 0; +} + static int smbb_usbin_get_property(struct power_supply *psy, enum power_supply_property psp, union power_supply_propval *val) @@ -505,6 +564,9 @@ static int smbb_usbin_get_property(struct power_supply *psy, case POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT_MAX: val->intval = 2500000; break; + case POWER_SUPPLY_PROP_QUICK_CHARGE_TYPE: + val->intval = get_quick_charge_type(chg); + break; default: rc = -EINVAL; break; @@ -662,11 +724,27 @@ static int smbb_battery_set_property(struct power_supply *psy, const union power_supply_propval *val) { struct smbb_charger *chg = power_supply_get_drvdata(psy); + int charger_type, bat_imax; int rc; switch (psp) { case POWER_SUPPLY_PROP_CURRENT_MAX: - rc = smbb_charger_attr_write(chg, ATTR_BAT_IMAX, val->intval); + charger_type = get_quick_charge_type(chg); + if (charger_type == QUICK_CHARGE_NORMAL) + bat_imax = IMAX_NORMAL; + else if (charger_type == QUICK_CHARGE_FAST) + bat_imax = IMAX_FAST; + else if (charger_type == QUICK_CHARGE_FLASH) + bat_imax = IMAX_FLASH; + else if (charger_type == QUICK_CHARGE_TURBE) + bat_imax = IMAX_TURBE; + else if (charger_type == QUICK_CHARGE_SUPER) + bat_imax = IMAX_SUPER; + else + bat_imax = IMAX_NORMAL; + + bat_imax = min(val->intval, bat_imax); + rc = smbb_charger_attr_write(chg, ATTR_BAT_IMAX, bat_imax); break; case POWER_SUPPLY_PROP_VOLTAGE_MAX: rc = smbb_charger_attr_write(chg, ATTR_BAT_VMAX, val->intval); @@ -695,6 +773,7 @@ static enum power_supply_property smbb_charger_properties[] = { POWER_SUPPLY_PROP_ONLINE, POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT, POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT_MAX, + POWER_SUPPLY_PROP_QUICK_CHARGE_TYPE, }; static enum power_supply_property smbb_battery_properties[] = { diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index 97cc4b85bf61..24b31b7e88a0 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -171,6 +171,7 @@ enum power_supply_property { POWER_SUPPLY_PROP_MODEL_NAME, POWER_SUPPLY_PROP_MANUFACTURER, POWER_SUPPLY_PROP_SERIAL_NUMBER, + POWER_SUPPLY_PROP_QUICK_CHARGE_TYPE, }; enum power_supply_type { @@ -186,6 +187,10 @@ enum power_supply_type { POWER_SUPPLY_TYPE_USB_PD, /* Power Delivery Port */ POWER_SUPPLY_TYPE_USB_PD_DRP, /* PD Dual Role Port */ POWER_SUPPLY_TYPE_APPLE_BRICK_ID, /* Apple Charging Method */ + POWER_SUPPLY_TYPE_USB_HVDCP, /* High Voltage DCP */ + POWER_SUPPLY_TYPE_USB_HVDCP_3, /* Efficient High Voltage DCP */ + POWER_SUPPLY_TYPE_USB_HVDCP_3P5, /* Efficient High Voltage DCP */ + POWER_SUPPLY_TYPE_USB_FLOAT, /* Floating charger */ }; enum power_supply_usb_type { @@ -201,6 +206,15 @@ enum power_supply_usb_type { POWER_SUPPLY_USB_TYPE_APPLE_BRICK_ID, /* Apple Charging Method */ }; +enum power_supply_quick_charge_type { + QUICK_CHARGE_NORMAL = 0, /* Charging Power <= 10W */ + QUICK_CHARGE_FAST, /* 10W < Charging Power <= 20W */ + QUICK_CHARGE_FLASH, /* 20W < Charging Power <= 30W */ + QUICK_CHARGE_TURBE, /* 30W < Charging Power <= 50W */ + QUICK_CHARGE_SUPER, /* Charging Power > 50W */ + QUICK_CHARGE_MAX, +}; + enum power_supply_notifier_events { PSY_EVENT_PROP_CHANGED, };