From patchwork Tue Aug 25 06:37:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qiwu Huang X-Patchwork-Id: 11734995 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3155B1731 for ; Tue, 25 Aug 2020 06:40:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0F7242071E for ; Tue, 25 Aug 2020 06:40:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NtuL2p2K" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729068AbgHYGkd (ORCPT ); Tue, 25 Aug 2020 02:40:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43980 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729115AbgHYGkL (ORCPT ); Tue, 25 Aug 2020 02:40:11 -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 8A6D3C061755; Mon, 24 Aug 2020 23:40:10 -0700 (PDT) Received: by mail-pf1-x42f.google.com with SMTP id m8so6545626pfh.3; Mon, 24 Aug 2020 23:40:10 -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=XNDqjiCIpaut0CuIzazPI/rMTPorZ+MEGeDrCF91VIE=; b=NtuL2p2KE/CpmwmHf88kJRdffEWZIUi4VnFkyBFT8zY7prtU/OX4jdfAa6KZIr70N1 nleJjF/TxFt3Q5w9te6tLtKVXrWsfm9EHwBVHYk5lPtjxr/DDLDBUeO2ePhLBm+f2hOT dwNQ5cekSgzy5yx1vIXrSfnEQNd7h5Amt9Jh4gwbDaMqDaYPDln9BFIa5VSAhqxUX3QZ wv7eCzwQv8YkmaLIqrElEnJpwPilzQwLhDc+qldEvkocm3OgrcaNjJleTIPwVhHwFoQw pyqTF7aU4BmYxwpq3uvrCxStZPk8MNwqNhAPF++lGfT5wJot3sDkpGoytiTeTWunDY34 RNRA== 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=XNDqjiCIpaut0CuIzazPI/rMTPorZ+MEGeDrCF91VIE=; b=mnNdc6lrtRVszQdRryZsqbzvh2c0c7KB2jumrPnLz0e1O8ZNHwjHvDJptEKuw9NB7+ UFMrQq8MWA3wPdwjRxd+UkW16zv/0rbYqVyV9kU8dOH2pkVkvMocf6XJaywxwJy4OtRQ WUNm/K671GY8wzjONAQJiQlbsM5qa7AGjJwlCVkuXXbHp+Py72hI0Z8LXN/PskrPLXxO KEnJ6miK5eKNY/ah7BXZJGZY9Z5JXblx0nHHCKdHHXPKkjjkkC0RqbkLlY9XwS0amZ/I tHZHfou51PoVtGur0+qP7Dlzf44K2qru+iHXeb0PP3VEXy2w8T3la9vDC5hQSiZ9lnvN uMlQ== X-Gm-Message-State: AOAM530nE04k0KLkKmMxLMd4U5ZyQU1jW1oz7qSXx/yfSW9gluKd7X5m CmTEguOwZLJkgncu0+4kjzs= X-Google-Smtp-Source: ABdhPJyM54lcg3Rsd1ETWjHfIX9hhYqCP+hw3wQAELo7eJhrwYF5hZrKMG6XwB4/uhEH5wAeAQrB9g== X-Received: by 2002:a17:902:b402:: with SMTP id x2mr6258877plr.97.1598337609782; Mon, 24 Aug 2020 23:40:09 -0700 (PDT) Received: from xiaomi.mioffice.cn ([43.224.245.179]) by smtp.gmail.com with ESMTPSA id z2sm14197283pfq.46.2020.08.24.23.40.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Aug 2020 23:40:09 -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 v9 1/4] power: supply: core: add quick charge type property Date: Tue, 25 Aug 2020 14:37:56 +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 Reported-by: kernel test robot Reported-by: kernel test robot --- Documentation/ABI/testing/sysfs-class-power | 21 ++++++ drivers/power/supply/power_supply_sysfs.c | 1 + drivers/power/supply/qcom_smbb.c | 79 +++++++++++++++++++++ include/linux/power_supply.h | 14 ++++ 4 files changed, 115 insertions(+) diff --git a/Documentation/ABI/testing/sysfs-class-power b/Documentation/ABI/testing/sysfs-class-power index 216d61a22f1e..dd3773dcf16a 100644 --- a/Documentation/ABI/testing/sysfs-class-power +++ b/Documentation/ABI/testing/sysfs-class-power @@ -708,3 +708,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 bc79560229b5..9554d7907373 100644 --- a/drivers/power/supply/power_supply_sysfs.c +++ b/drivers/power/supply/power_supply_sysfs.c @@ -206,6 +206,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..7dbb385531ca 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,10 +724,26 @@ 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: + 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; + + val->intval = min(val->intval, bat_imax) rc = smbb_charger_attr_write(chg, ATTR_BAT_IMAX, val->intval); break; case POWER_SUPPLY_PROP_VOLTAGE_MAX: @@ -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 ac1345a48ad0..bd99658c05be 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -167,6 +167,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 { @@ -182,6 +183,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 { @@ -197,6 +202,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, }; From patchwork Tue Aug 25 06:37:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qiwu Huang X-Patchwork-Id: 11734987 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6D5E3913 for ; Tue, 25 Aug 2020 06:40:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3F6CE20782 for ; Tue, 25 Aug 2020 06:40:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="tuosopsE" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729136AbgHYGkQ (ORCPT ); Tue, 25 Aug 2020 02:40:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729133AbgHYGkM (ORCPT ); Tue, 25 Aug 2020 02:40:12 -0400 Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A1E49C061574; Mon, 24 Aug 2020 23:40:12 -0700 (PDT) Received: by mail-pf1-x42d.google.com with SMTP id 17so6530554pfw.9; Mon, 24 Aug 2020 23:40:12 -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=ricGGIi0rSFfCMhWo07vOBDDcXPDfivbO4AsrdYg3Sk=; b=tuosopsExS5cuVwTcyuPWEqBaG9Q42/P7sTCtZrtTHD/wFAS7iQtxXwA0se6WVDyrV 3bmMs2rRoddsaioTa5pYwRGT6HJWnVdC8zVXt05fJ2/8WY+VvUM4OznqoBrCJYgUp+H5 BvVrZNErh81sV8yEaDqU66TPSLDqtSHOc/qi4nFYoXLsf5fTeNp4zexwPQGvBXsP5bdR +Bs1HawvHR3wkxTYoqJh0GimyBFlrb6vXdZzVs1Tx5QBlH45azMgqj9eV394Qw49RRXq v8/veAvxp1Bh/CJhqYKsIZYtdNl+/Yo44qC11dpEvi7xlfTzk9dB42PmHfT8MXPwGABX DNCg== 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=ricGGIi0rSFfCMhWo07vOBDDcXPDfivbO4AsrdYg3Sk=; b=EPs/4GwigtwSwtky3afENceTavPl+wUxRNG6GlHeb8Jv9OGn1+tEUiqEbxDAOcslVP L+BZ12QNwxcaUQ18ozzZFDhjbGxrYdc1XXyhHPeYvqb4ZXZZZExSF5Ix+QCIof+gOFzb gBddpC0yfaeuLTyCJVlwHx/jsa632U+Q8FLwn5XBXUnf7B4npCMnwKHAeY0vNvXRJ6zb lKsrCsokwsUiruQnjDR+w7xWoGcLL73cwlRXwa7+ByWME870JKQRMuGr2SvLqwdYlwau mQ5adDClDO9DJ122YoOb0//hpKsVzYf532EWWmlk8o5J0qs/yUxVjzphqITCdiRVG48E hFAg== X-Gm-Message-State: AOAM532LghqtS2AZodeCNY3K1c8lqvaZrHZ4pPtMYTruqZp1Aj+GNOHz WF9DrIIaMnTih7CtYncNYDQ= X-Google-Smtp-Source: ABdhPJxETsPue40ear0GRI+w3n1T4ossZuS7y666yM7tY0cK8N4BmF/OzQ6Qm3HtuE/De0NzF/F0EA== X-Received: by 2002:a63:342:: with SMTP id 63mr6011789pgd.134.1598337612218; Mon, 24 Aug 2020 23:40:12 -0700 (PDT) Received: from xiaomi.mioffice.cn ([43.224.245.179]) by smtp.gmail.com with ESMTPSA id z2sm14197283pfq.46.2020.08.24.23.40.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Aug 2020 23:40:11 -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 v9 2/4] power: supply: core: add wireless charger adapter type property Date: Tue, 25 Aug 2020 14:37:57 +0800 Message-Id: <2c3cd38e180af5b375ece088d5a3ec2519b39b9a.1598337073.git.huangqiwu@xiaomi.com> 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 what type of wireless adapter connection is currently active for the supply. for example it can show if ADAPTER_PD capable source is attached. Signed-off-by: Qiwu Huang --- Documentation/ABI/testing/sysfs-class-power | 28 +++++++++++++++++++++ drivers/power/supply/power_supply_sysfs.c | 1 + include/linux/power_supply.h | 19 ++++++++++++++ 3 files changed, 48 insertions(+) diff --git a/Documentation/ABI/testing/sysfs-class-power b/Documentation/ABI/testing/sysfs-class-power index dd3773dcf16a..03ab449fae8a 100644 --- a/Documentation/ABI/testing/sysfs-class-power +++ b/Documentation/ABI/testing/sysfs-class-power @@ -729,3 +729,31 @@ Contact: Fei Jiang 3: QUICK_CHARGE_TURBE, 4: QUICK_CHARGE_SUPER. +===== Wireless Charger Properties ===== +What: /sys/class/power_supply//tx_adapter +Date: Jul 2020 +Contact: Fei Jiang +Description: + Reports the type of wireless adapter connection is currently active for + the supply, for example it can show if ADAPTER_PD capable source + is attached. Expect common wireless adapter type, also increase by + some vendor private adapter type(ex. ADAPTER_PD_40W). + + Access: Read-Only + Valid values: + 0: ADAPTER_NONE, + 1: ADAPTER_SDP, + 2: ADAPTER_DCP, + 3: ADAPTER_CDP, + 4: ADAPTER_OCP, + 5: ADAPTER_QC2, + 6: ADAPTER_QC3, + 7: ADAPTER_PD, + 8: ADAPTER_AUTH_FAILED, + 9: ADAPTER_PRIVATE_QC3, + 10: ADAPTER_PRIVATE_PD, + 11: ADAPTER_CAR_POWER, + 12: ADAPTER_PRIVATE_PD_40W, + 13: ADAPTER_VOICE_BOX, + 14: ADAPTER_PRIVATE_PD_50W. + diff --git a/drivers/power/supply/power_supply_sysfs.c b/drivers/power/supply/power_supply_sysfs.c index 9554d7907373..f2458e21d02b 100644 --- a/drivers/power/supply/power_supply_sysfs.c +++ b/drivers/power/supply/power_supply_sysfs.c @@ -207,6 +207,7 @@ static struct power_supply_attr power_supply_attrs[] = { POWER_SUPPLY_ATTR(MANUFACTURER), POWER_SUPPLY_ATTR(SERIAL_NUMBER), POWER_SUPPLY_ATTR(QUICK_CHARGE_TYPE), + POWER_SUPPLY_ATTR(TX_ADAPTER), }; static struct attribute * diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index bd99658c05be..00254e096a4a 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -168,6 +168,7 @@ enum power_supply_property { POWER_SUPPLY_PROP_MANUFACTURER, POWER_SUPPLY_PROP_SERIAL_NUMBER, POWER_SUPPLY_PROP_QUICK_CHARGE_TYPE, + POWER_SUPPLY_PROP_TX_ADAPTER, }; enum power_supply_type { @@ -211,6 +212,24 @@ enum power_supply_quick_charge_type { QUICK_CHARGE_MAX, }; +enum power_supply_tx_adapter_type { + ADAPTER_NONE = 0, /* Nothing Attached */ + ADAPTER_SDP, /* Standard Downstream Port */ + ADAPTER_CDP, /* Charging Downstream Port */ + ADAPTER_DCP, /* Dedicated Charging Port */ + ADAPTER_OCP, /* Other Charging Port */ + ADAPTER_QC2, /* Qualcomm Charge 2.0 */ + ADAPTER_QC3, /* Qualcomm Charge 3.0 */ + ADAPTER_PD, /* Power Delivery Port */ + ADAPTER_AUTH_FAILED, /* Authenticated Failed Adapter */ + ADAPTER_PRIVATE_QC3, /* Qualcomm Charge 3.0 with Private Protocol */ + ADAPTER_PRIVATE_PD, /* PD Adapter with Private Protocol */ + ADAPTER_CAR_POWER, /* Wireless Car Charger */ + ADAPTER_PRIVATE_PD_40W, /* 40W PD Adapter with Private Protocol */ + ADAPTER_VOICE_BOX, /* Voice Box which Support Wireless Charger */ + ADAPTER_PRIVATE_PD_50W, /* 50W PD Adapter with Private Protocol */ +}; + enum power_supply_notifier_events { PSY_EVENT_PROP_CHANGED, }; From patchwork Tue Aug 25 06:37:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qiwu Huang X-Patchwork-Id: 11734993 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7ECC31731 for ; Tue, 25 Aug 2020 06:40:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5C2342071E for ; Tue, 25 Aug 2020 06:40:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="USyUfQrp" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729111AbgHYGk1 (ORCPT ); Tue, 25 Aug 2020 02:40:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43994 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729068AbgHYGkP (ORCPT ); Tue, 25 Aug 2020 02:40:15 -0400 Received: from mail-pg1-x532.google.com (mail-pg1-x532.google.com [IPv6:2607:f8b0:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1E7AFC061755; Mon, 24 Aug 2020 23:40:15 -0700 (PDT) Received: by mail-pg1-x532.google.com with SMTP id 31so3880944pgy.13; Mon, 24 Aug 2020 23:40:15 -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=Vq8VrvDZDnyF2Zh3awLs7OB7VEuN+RNqZyCqVxEY1Zo=; b=USyUfQrpK/4m4wnRxHSiWWvGFAdJ05ICWKl1iSCqImXNEUVDkch//fXKVgJvQvNpbP GS3apgwV4zJ2oSj3/0DGA9ejo+UGCWiGl8JOHB/vIK3Crdgv1UMHLI2c4u4UilZ4K6NM cRkaUX4d9SMPxjKugPkzz7YJ776n/ucCtJbzR4msTvuCBMGg5WY280i0Q/hEY1e9Vl2e NfNDoQ+adgcFCr1j33DGNxYjG2Drx7oibS5WppD1/HgSfW+N/ul7CG7/4BLr69/4lq9x CvbdxhjXwoZoMm7b/9bUGiFowoGrsz0r/D3AEaqx9y513ttIqnxFmgrH/7How42KIU76 Ma6Q== 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=Vq8VrvDZDnyF2Zh3awLs7OB7VEuN+RNqZyCqVxEY1Zo=; b=j9M+sKQqbJSf4wpzuY52ZI1VXTHIYpKQUd5Y8eOIKobPHaL55c62s4zon1lstulEZY iUwMljrWOZg4BIb5c5xIpYw8paCmmTFhVgMqW5qpiS+oEzzK8RDI8X5djJsQ0p2ivkBg 5nCRRsDk4Rix4S4RLen2slT5A/cKhYgKhafqpSqnHZ0Gr1eUd4z7tNDJvzgn1AbEHPOf I6u57uS1t+yJbrwvsI2FHKU0V4lybWAbEHjlfYdUiZJ2iourSinZ5iLlMB5CXgXuaIDB p0/Z8DxZmQiiwFqDPvO/2WUXbvZszg6x/PrceeDjJorucCMk9h97TFMdt6y/3Jyb3xq7 yO7w== X-Gm-Message-State: AOAM530ZyiMlI4gBK3At/7HuymOERM5Q5bQ4k7fKC3Fe/QA96WJSyklM eObS+kG9/aWh9FzJWcMCm+A= X-Google-Smtp-Source: ABdhPJwh3w6aT2s8Mb7x5LK+JRQGTlSNdqj0BOax533TddvgCV4+7RcIX/gbZ3Uj9KzdFUwvmVbQMQ== X-Received: by 2002:a65:6882:: with SMTP id e2mr5941334pgt.290.1598337614586; Mon, 24 Aug 2020 23:40:14 -0700 (PDT) Received: from xiaomi.mioffice.cn ([43.224.245.179]) by smtp.gmail.com with ESMTPSA id z2sm14197283pfq.46.2020.08.24.23.40.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Aug 2020 23:40:14 -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 v9 3/4] power: supply: core: add wireless signal strength property Date: Tue, 25 Aug 2020 14:37:58 +0800 Message-Id: <7b38a519d85ad526cee8d25a00ad8de1a98fb04f.1598337073.git.huangqiwu@xiaomi.com> 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 wireless signal strength. The value show degree of coupling between tx and rx. Signed-off-by: Qiwu Huang --- Documentation/ABI/testing/sysfs-class-power | 22 +++++++++++++++++++++ drivers/power/supply/power_supply_sysfs.c | 1 + include/linux/power_supply.h | 1 + 3 files changed, 24 insertions(+) diff --git a/Documentation/ABI/testing/sysfs-class-power b/Documentation/ABI/testing/sysfs-class-power index 03ab449fae8a..4459b720feb2 100644 --- a/Documentation/ABI/testing/sysfs-class-power +++ b/Documentation/ABI/testing/sysfs-class-power @@ -757,3 +757,25 @@ Description: 13: ADAPTER_VOICE_BOX, 14: ADAPTER_PRIVATE_PD_50W. +What: /sys/class/power_supply//signal_strength +Date: Jul 2020 +Contact: Fei Jiang +Description: + In PING phase, RX transmits a signal strength packet as the + first communication packet to instruct the base to keep power + signal on.The value reports wireless signal strength and show + degree of coupling. + + The Qi Wireless Power Transfer System is published by the + Wireless Power Consortium.The ping phase is the necessary stage + for matching transmitter and receiver. In this phase,the Power + Transmitter executes a Digital Ping, and listens for a response. + If the Power Transmitter discovers a Power Receiver, the Power + Transmitter may extend the Digital Ping,i.e. maintain the Power + Signal at the level of the Digital Ping. This causes the system + to proceed to the identification & configuration phase. If the + Power Transmitter does not extend the Digital Ping, the system + shall revert to the selection phase. + + Access: Read-Only + Valid values: 0 - 100 diff --git a/drivers/power/supply/power_supply_sysfs.c b/drivers/power/supply/power_supply_sysfs.c index f2458e21d02b..e420a453095e 100644 --- a/drivers/power/supply/power_supply_sysfs.c +++ b/drivers/power/supply/power_supply_sysfs.c @@ -208,6 +208,7 @@ static struct power_supply_attr power_supply_attrs[] = { POWER_SUPPLY_ATTR(SERIAL_NUMBER), POWER_SUPPLY_ATTR(QUICK_CHARGE_TYPE), POWER_SUPPLY_ATTR(TX_ADAPTER), + POWER_SUPPLY_ATTR(SIGNAL_STRENGTH), }; static struct attribute * diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index 00254e096a4a..747338118fa1 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -169,6 +169,7 @@ enum power_supply_property { POWER_SUPPLY_PROP_SERIAL_NUMBER, POWER_SUPPLY_PROP_QUICK_CHARGE_TYPE, POWER_SUPPLY_PROP_TX_ADAPTER, + POWER_SUPPLY_PROP_SIGNAL_STRENGTH, }; enum power_supply_type { From patchwork Tue Aug 25 06:37:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qiwu Huang X-Patchwork-Id: 11734989 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 130FC913 for ; Tue, 25 Aug 2020 06:40:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E5E0C2075F for ; Tue, 25 Aug 2020 06:40:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WPjjoCq+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729133AbgHYGkU (ORCPT ); Tue, 25 Aug 2020 02:40:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44002 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729143AbgHYGkR (ORCPT ); Tue, 25 Aug 2020 02:40:17 -0400 Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com [IPv6:2607:f8b0:4864:20::542]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C45BC061574; Mon, 24 Aug 2020 23:40:17 -0700 (PDT) Received: by mail-pg1-x542.google.com with SMTP id l191so4026660pgd.5; Mon, 24 Aug 2020 23:40:17 -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=oPTjuwCthUmMjgvx3f4uFfhVGWQpGsk/v4Ea0sfsyl0=; b=WPjjoCq+eG/jacxw0fg2TjSSg+WH2qd9qtOh8QHCFrnYLd3PAxB9gGVpOGIj7++dxP HwS3D4HBpmVEypbh7z1GKn03/lmjFGPFRj5U1DTGZM1lDP4szKeMJkLiHR59EFPZEiug Tzgfl5QfBqr/936EBhajsGoBWIJkFKmo3cTDcKMFKjpM6mPQZZlD7wvTQrFD0U0jHLI0 lyj8TqGBghmq5CjleenqJgsHIO7pIbXjgbgF88LcnNOcPIj5IxHtwBgvxQP0CBeu3FNy D8biLNpmjUwYJ85GXI84Atz+TxzUxIfFMHstOWhBevRYoaF8r05x1DhRN0DRngM5QtHx 6fWg== 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=oPTjuwCthUmMjgvx3f4uFfhVGWQpGsk/v4Ea0sfsyl0=; b=KMMRw56Ji1WildJY/FVu1agLOqGRMp9LNibO6YbyRGdtyqV1aswGqtyRNyBSrbKZ8h xy2znbbRR1yn7FQMHWT6garh2O3DR6jSA7nWiA0RjrWJEKOvEPsfYTKmlEagUCzHojIS fw/dVl5zpHKWxx+xZQ2QxFKWIe/BN5LIZSed2ReezAGzVMHZVatMoQCCHxzD8+l+YAQV Qyzxy5L6Xtiityg8sQ2f9anfZTXJc3VnSxT22F6LZGXMSujornM5BF0mD2QI9Ni9DTQH CY1qMGpx4vlEVmGODg6TiSgRx7LiRSvC9OM653aM1oNpzpdGaLLEKSv2dQZRHAIdGNiL 6PtQ== X-Gm-Message-State: AOAM530vEHbdaP9UiB6nFpoOcFBm9ZNfSHF1pc2X7pt6bpCV6JJ3w3SO aNdJ4eXgDGG/4tb3Jf9rWCh5FxFalmBPbw== X-Google-Smtp-Source: ABdhPJyaq/aiNW3XYF9jYLOs4N4aihEAEXilSmW5U5Zqa+46msSb8mpneLfXg8ij+FdWScxpvDBLaw== X-Received: by 2002:a17:902:7202:: with SMTP id ba2mr6317259plb.4.1598337617019; Mon, 24 Aug 2020 23:40:17 -0700 (PDT) Received: from xiaomi.mioffice.cn ([43.224.245.179]) by smtp.gmail.com with ESMTPSA id z2sm14197283pfq.46.2020.08.24.23.40.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Aug 2020 23:40:16 -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 v9 4/4] power: supply: core: property to control reverse charge Date: Tue, 25 Aug 2020 14:37:59 +0800 Message-Id: <34d9921bc92f99c9ee680b4b090173c9c08c6e09.1598337073.git.huangqiwu@xiaomi.com> 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 Interface to control wireless reverse charge. Signed-off-by: Qiwu Huang --- Documentation/ABI/testing/sysfs-class-power | 14 ++++++++++++++ drivers/power/supply/power_supply_sysfs.c | 1 + include/linux/power_supply.h | 1 + 3 files changed, 16 insertions(+) diff --git a/Documentation/ABI/testing/sysfs-class-power b/Documentation/ABI/testing/sysfs-class-power index 4459b720feb2..8840fdf483a7 100644 --- a/Documentation/ABI/testing/sysfs-class-power +++ b/Documentation/ABI/testing/sysfs-class-power @@ -779,3 +779,17 @@ Description: Access: Read-Only Valid values: 0 - 100 + +What: /sys/class/power_supply//reverse_chg_mode +Date: Jul 2020 +Contact: Fei Jiang +Description: + Some devices support wireless reverse charge function which + charge other devices.The property provider interface to + enable/disable wireless reverse charge.If enabled, start TX + mode and detect RX. Disabled when timeout or manual setting. + + Access: Read, Write + Valid values: + - 1: enabled + - 0: disabled diff --git a/drivers/power/supply/power_supply_sysfs.c b/drivers/power/supply/power_supply_sysfs.c index e420a453095e..81916b6b6ccf 100644 --- a/drivers/power/supply/power_supply_sysfs.c +++ b/drivers/power/supply/power_supply_sysfs.c @@ -209,6 +209,7 @@ static struct power_supply_attr power_supply_attrs[] = { POWER_SUPPLY_ATTR(QUICK_CHARGE_TYPE), POWER_SUPPLY_ATTR(TX_ADAPTER), POWER_SUPPLY_ATTR(SIGNAL_STRENGTH), + POWER_SUPPLY_ATTR(REVERSE_CHG_MODE), }; static struct attribute * diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index 747338118fa1..988d3f05ea1c 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -170,6 +170,7 @@ enum power_supply_property { POWER_SUPPLY_PROP_QUICK_CHARGE_TYPE, POWER_SUPPLY_PROP_TX_ADAPTER, POWER_SUPPLY_PROP_SIGNAL_STRENGTH, + POWER_SUPPLY_PROP_REVERSE_CHG_MODE, }; enum power_supply_type {