From nobody Fri Jun 12 12:44:29 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A44F736405F; Fri, 15 May 2026 05:50:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778824257; cv=none; b=k/40flXrfj/UqbZKHKbsZ42awPmoDlp8PMU3fE5mQP0Pg9G+y2nGI7jVQvJ1mkCRjwUOBz9+YiS9MJNyq19dVccS5gaYiUIIbhIdigkcHqz5J7Ue/s03Ud4IbxW1HoU3CxAtEQgklw3KoecBd1RQyR/0l7vCb0X8EUr4+z3MMHc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778824257; c=relaxed/simple; bh=lbXRCb+6WgnhUMlP2gJtywCmwUB9hvTGhwgtFvJ9Hi8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=r+SNje1SaXvKbSkjYFhVAMsOjtuFJgV3N/h0JXek1KP7D8FDN+hX1UD7wa1t7pSkLieeRiPxo6PeDYX3yjPqEcQJeVCvjsK/aBwqC+Y8saF0snUAOawUU0GmYVUBDN4aMdNc0w9/CawZAHgyTBXD8ixJR74TA8Popzuuqd9XYLs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ffp7H76O; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ffp7H76O" Received: by smtp.kernel.org (Postfix) with ESMTPS id 5C696C2BCC7; Fri, 15 May 2026 05:50:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778824257; bh=lbXRCb+6WgnhUMlP2gJtywCmwUB9hvTGhwgtFvJ9Hi8=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=ffp7H76ODBCb2WaErbPAghtSz7YTm8jZSjYDSF4yhMEKvJZ5zh9bq/Ue4ZrvxG+fG zYUvQfnM93QMnBKFsC0n06sQfGIX6y09NkL7JTiSOACnMTylOOqytM/c/5hsP5EUMB b8pmROoKQtDXv03UJhRXtUjQWw2wcoma7HcqzS4/HysGryZ2MKOo4WaOJTSozGz6My 7Zg0kA2IkheEr+Xxgx3FN78Od3wFz1rRZOKzbsjgL2YQCC+YCJoyLbCIaVoas4mTj0 bnzB/gvie4iUU9EUVnkdKFniTI6ODLim7MeKebTepGtK8e1xe734yQ254Nkb6q4nnc bP4yVXHFYYmCQ== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4B1C1CD343F; Fri, 15 May 2026 05:50:57 +0000 (UTC) From: Amit Sunil Dhamne via B4 Relay Date: Fri, 15 May 2026 05:48:39 +0000 Subject: [PATCH 1/3] power: Add power_supply_get_battery_all() to fetch battery psy handles Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260515-batt-status-v1-1-fed6b7d8cea7@google.com> References: <20260515-batt-status-v1-0-fed6b7d8cea7@google.com> In-Reply-To: <20260515-batt-status-v1-0-fed6b7d8cea7@google.com> To: Sebastian Reichel , Badhri Jagan Sridharan , Heikki Krogerus , Greg Kroah-Hartman , Hans de Goede , Krzysztof Kozlowski , Marek Szyprowski , Sebastian Krzyszkowiak , Purism Kernel Team Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, =?utf-8?q?Andr=C3=A9_Draszik?= , Tudor Ambarus , Peter Griffin , RD Babiera , Kyle Tso , Amit Sunil Dhamne X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1778824256; l=5048; i=amitsd@google.com; s=20241031; h=from:subject:message-id; bh=dFElzGvQasU7y5gAnjIepqrRB4ceeHil0GBlXrTuj7Q=; b=vQGrPaC36jMAjEK6RXyLkLAdq4BlXijz8krNqyDCGC+gu4Rg5eY9Kzj390Xv25deDtaiKrGo4 85xONKnKRd5BYcU0x+khDqfGLGToG3x6jR4l5p4wQ2C/6MRWs2HU4D2 X-Developer-Key: i=amitsd@google.com; a=ed25519; pk=wD+XZSST4dmnNZf62/lqJpLm7fiyT8iv462zmQ3H6bI= X-Endpoint-Received: by B4 Relay for amitsd@google.com/20241031 with auth_id=262 X-Original-From: Amit Sunil Dhamne Reply-To: amitsd@google.com From: Amit Sunil Dhamne Add power_supply_get_battery_all() to allow drivers to obtain a list of registered battery type power supply references in the system. Signed-off-by: Amit Sunil Dhamne --- drivers/power/supply/power_supply_core.c | 122 +++++++++++++++++++++++++++= ++++ include/linux/power_supply.h | 9 +++ 2 files changed, 131 insertions(+) diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/suppl= y/power_supply_core.c index a446d3d086fc..697645426fb1 100644 --- a/drivers/power/supply/power_supply_core.c +++ b/drivers/power/supply/power_supply_core.c @@ -482,6 +482,128 @@ struct power_supply *power_supply_get_by_name(const c= har *name) } EXPORT_SYMBOL_GPL(power_supply_get_by_name); =20 +static int __power_supply_get_num_battery(struct power_supply *epsy, void = *data) +{ + int *count =3D data; + + if (epsy->desc->type =3D=3D POWER_SUPPLY_TYPE_BATTERY) + (*count)++; + + return 0; +} + +static int power_supply_get_num_battery(struct device *dev) +{ + int ret, count =3D 0; + + ret =3D power_supply_for_each_psy(&count, __power_supply_get_num_battery); + + dev_dbg(dev, "%s: count: %d ret %d\n", __func__, count, ret); + + if (ret) + return ret; + + return count; +} + +struct psy_get_supplies_data { + int cnt; + int size; + struct power_supply **psys; +}; + +static int __power_supply_populate_battery_array(struct power_supply *epsy, + void *_data) +{ + struct psy_get_supplies_data *data =3D _data; + + if (epsy->desc->type =3D=3D POWER_SUPPLY_TYPE_BATTERY) { + if (data->size <=3D data->cnt) + return -EOVERFLOW; + + get_device(&epsy->dev); + data->psys[data->cnt] =3D epsy; + atomic_inc(&epsy->use_cnt); + data->cnt++; + } + + return 0; +} + +static int power_supply_populate_battery_array(struct device *dev, int siz= e, + struct power_supply **batteries) +{ + int ret, i; + + struct psy_get_supplies_data data =3D { + .cnt =3D 0, + .size =3D size, + .psys =3D batteries, + }; + + ret =3D power_supply_for_each_psy(&data, __power_supply_populate_battery_= array); + + dev_dbg(dev, "%s Found %d batteries with array size %d ret %d\n", + __func__, data.cnt, data.size, ret); + + if (ret < 0) { + for (i =3D 0; i < data.cnt; i++) + power_supply_put(batteries[i]); + return ret; + } + + return data.cnt; +} + +/** + * power_supply_get_battery_all() - Searches for all battery type power su= pplies + * and returns their references. + * @dev: Pointer to device requesting the power supply refs. + * @psys: Pointer to an array of power supply refs that will be filled by = this + * function. + * + * This function helps drivers get handles to all battery type power suppl= ies. + * If acquiring a ref to a power supply results in error, then the search = for + * battery type power supplies will abort and the acquired power supplies = will + * be "put". + * + * Return: Indicates the number of battery type power supplies returned on + * success or the negative error code on failure. + * + * It's the responsibility of the caller to invoke power_supply_put() on t= he + * individual psy refs and free the array returned by this function using = kfree(). + */ +int __must_check power_supply_get_battery_all(struct device *dev, + struct power_supply ***psys) +{ + int ret; + + if (!psys) + return -EINVAL; + + ret =3D power_supply_get_num_battery(dev); + if (ret < 0) + return ret; + + if (!ret) { + *psys =3D NULL; + return 0; + } + + *psys =3D kzalloc_objs(**psys, ret); + if (!*psys) + return -ENOMEM; + + ret =3D power_supply_populate_battery_array(dev, ret, *psys); + if (ret <=3D 0) { + kfree(*psys); + *psys =3D NULL; + } + + return ret; +} +EXPORT_SYMBOL_GPL(power_supply_get_battery_all); + /** * power_supply_put() - Drop reference obtained with power_supply_get_by_n= ame * @psy: Reference to put diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index 7a5e4c3242a0..2467530a5740 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -806,11 +806,20 @@ extern int power_supply_reg_notifier(struct notifier_= block *nb); extern void power_supply_unreg_notifier(struct notifier_block *nb); #if IS_ENABLED(CONFIG_POWER_SUPPLY) extern struct power_supply *power_supply_get_by_name(const char *name); +extern int __must_check power_supply_get_battery_all(struct device *dev, + struct power_supply ***psys); extern void power_supply_put(struct power_supply *psy); #else static inline void power_supply_put(struct power_supply *psy) {} static inline struct power_supply *power_supply_get_by_name(const char *na= me) { return NULL; } +static inline int __must_check power_supply_get_battery_all(struct device = *dev, + struct power_supply ***psys) +{ + if (psys) + *psys =3D NULL; + return 0; +} #endif extern struct power_supply *power_supply_get_by_reference(struct fwnode_ha= ndle *fwnode, const char *property); --=20 2.54.0.563.g4f69b47b94-goog From nobody Fri Jun 12 12:44:29 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A446F364025; Fri, 15 May 2026 05:50:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778824257; cv=none; b=DahyfFS7WamA1PmnJScFkt/mUZc5Ks/kZbXNPQ6j7x7UWt3N0gt0VzoptAbRioXmhMU2di2kKOIHujiQlSSPmHrZCIVxjxd4WkKC9rDz/m+8vI2ezBRRKb7CEZCZaveWmb0mwGZaWTYgInICQA6zTlcGsLOaLpaBaMMO5d1aIlM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778824257; c=relaxed/simple; bh=cCdb5iCvd/42l2xXrMcsmngetKkm5sLxqoOtfdNssfk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=imIIaMHyhkV4ubTWpIo494LTy4jep9MIXZNG2QswYquR6gcdaiJTaL+b5gvT3z3kcN6a/vgCrEfiiqsUtWbWnxrfWWta9ienpFFpyfsk9CRdagh/loQ9ikKGDHmjEiCOQ6XTWodZ2JmARMH62oGFrCSRgd4ITersid7qVdWJC64= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=pVmtjzcE; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="pVmtjzcE" Received: by smtp.kernel.org (Postfix) with ESMTPS id 6A049C2BCC9; Fri, 15 May 2026 05:50:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778824257; bh=cCdb5iCvd/42l2xXrMcsmngetKkm5sLxqoOtfdNssfk=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=pVmtjzcE8OLffrd+siyY4tZqVPnEaSCK5s8d23bEvCFmRf9NCkFcQxNG5Ci6f6aNM EkbRXK45hxipAWh3KdctRe9Tv7Rwqh6vsqrpj88BscplTm2583y8qPFoWfDD/TIuEF i7ah3yi3FrSyqjmcwETzMG9FxbhxJ3lPssBFm2ITret7Jv7szVFQgUktEd6Njm4t6d 8Le305tY98Uqi7eqMRqtfjmZK27zEK6lPjI06JPDugO4ORvCSPoZU89zS1aW0mSaXf gMoWsi1vlvmFnxH5O4XDfmva1hZPx/xmUkic2c6hVZWWThLTUxASHBbW1QoSVBScua uo8K3aE5Nepvg== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5F2C0CD4F46; Fri, 15 May 2026 05:50:57 +0000 (UTC) From: Amit Sunil Dhamne via B4 Relay Date: Fri, 15 May 2026 05:48:40 +0000 Subject: [PATCH 2/3] usb: typec: tcpm: Add support for Battery Status response message Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260515-batt-status-v1-2-fed6b7d8cea7@google.com> References: <20260515-batt-status-v1-0-fed6b7d8cea7@google.com> In-Reply-To: <20260515-batt-status-v1-0-fed6b7d8cea7@google.com> To: Sebastian Reichel , Badhri Jagan Sridharan , Heikki Krogerus , Greg Kroah-Hartman , Hans de Goede , Krzysztof Kozlowski , Marek Szyprowski , Sebastian Krzyszkowiak , Purism Kernel Team Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, =?utf-8?q?Andr=C3=A9_Draszik?= , Tudor Ambarus , Peter Griffin , RD Babiera , Kyle Tso , Amit Sunil Dhamne X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1778824256; l=9712; i=amitsd@google.com; s=20241031; h=from:subject:message-id; bh=1K59n2Pevup2izoIUfqv/9QGzbYbeyKdP8619AxEAwM=; b=/0u//9G1AjINaqvETsJ+5PujE7gO1XTTlVU/yw2lQHN4/htY0Ai+Pnr9/cS3VHF1FTqN2i5dH /k4FzxSDoVsA3GMGtPwnyncWBhWFFE+4kIcnYYK9v6/EMU4cMv6WO+r X-Developer-Key: i=amitsd@google.com; a=ed25519; pk=wD+XZSST4dmnNZf62/lqJpLm7fiyT8iv462zmQ3H6bI= X-Endpoint-Received: by B4 Relay for amitsd@google.com/20241031 with auth_id=262 X-Original-From: Amit Sunil Dhamne Reply-To: amitsd@google.com From: Amit Sunil Dhamne Add support for responding to a Get_Battery_Status request with a Battery_Status message. The port partner shall request the status of a port's battery by providing an index in the Get_Battery_Status AMS. In case of failure to identify the battery, the port shall reply with an appropriate message indicating so. Support for Battery_Status message is required for sinks that contain battery as specified in USB PD Rev3.1 v1.8 ("Applicability of Data Messages" section). Signed-off-by: Amit Sunil Dhamne Reviewed-by: Badhri Jagan Sridharan --- drivers/usb/typec/tcpm/tcpm.c | 140 ++++++++++++++++++++++++++++++++++++++= +++- include/linux/usb/pd.h | 29 +++++++++ 2 files changed, 166 insertions(+), 3 deletions(-) diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c index dfbb94ddc98a..a1abe0a177ac 100644 --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c @@ -232,7 +232,8 @@ enum pd_msg_request { PD_MSG_DATA_SINK_CAP, PD_MSG_DATA_SOURCE_CAP, PD_MSG_DATA_REV, - PD_MSG_EXT_SINK_CAP_EXT + PD_MSG_EXT_SINK_CAP_EXT, + PD_MSG_DATA_BATT_STATUS }; =20 enum adev_actions { @@ -389,6 +390,14 @@ struct pd_timings { /* Convert microwatt to watt */ #define UW_TO_W(pow) ((pow) / 1000000) =20 +/* + * As per USB PD Spec Rev 3.18 (Sec. 6.5.13.11), the number of fixed batte= ries + * that a port can be queried is restricted to 4. + */ +#define MAX_NUM_FIXED_BATT 4 + +#define BATTERY_PROPERTY_UNKNOWN 0xffff + /* * struct pd_identifier - Contains info about PD identifiers * @vid: Vendor ID (assigned by USB-IF) @@ -683,6 +692,9 @@ struct tcpm_port { =20 struct pd_identifier pd_ident; struct sink_caps_ext_data sink_caps_ext; + struct power_supply *fixed_batt[MAX_NUM_FIXED_BATT]; + u32 fixed_batt_cnt; + u32 batt_request_id; #ifdef CONFIG_DEBUG_FS struct dentry *dentry; struct mutex logbuffer_lock; /* log buffer access lock */ @@ -1391,6 +1403,34 @@ static int tcpm_pd_send_revision(struct tcpm_port *p= ort) return tcpm_pd_transmit(port, TCPC_TX_SOP, &msg); } =20 +static void tcpm_init_fixed_batt(struct tcpm_port *port) +{ + struct power_supply **batteries; + int ret, i; + + if (port->fixed_batt_cnt > 0) + return; + + ret =3D power_supply_get_battery_all(port->dev, &batteries); + if (ret < 0) { + tcpm_log(port, "Failed to fetch batteries refs ret=3D%d", ret); + return; + } + + for (i =3D 0; i < ret; i++) { + if (!batteries[i]) + continue; + + if (port->fixed_batt_cnt < MAX_NUM_FIXED_BATT) + port->fixed_batt[port->fixed_batt_cnt++] =3D batteries[i]; + else + power_supply_put(batteries[i]); + } + + if (ret) + kfree(batteries); +} + static int tcpm_pd_send_source_caps(struct tcpm_port *port) { struct pd_message msg; @@ -1476,6 +1516,8 @@ static int tcpm_pd_send_sink_cap_ext(struct tcpm_port= *port) =20 if (!port->self_powered) data->spr_op_pdp =3D operating_snk_watt; + else + tcpm_init_fixed_batt(port); =20 /* * SPR Sink Minimum PDP indicates the minimum power required to operate @@ -1502,6 +1544,7 @@ static int tcpm_pd_send_sink_cap_ext(struct tcpm_port= *port) skedb.load_step =3D data->load_step; skedb.load_char =3D cpu_to_le16(data->load_char); skedb.compliance =3D data->compliance; + skedb.batt_info =3D port->fixed_batt_cnt; skedb.modes =3D data->modes; skedb.spr_min_pdp =3D data->spr_min_pdp; skedb.spr_op_pdp =3D data->spr_op_pdp; @@ -1520,6 +1563,74 @@ static int tcpm_pd_send_sink_cap_ext(struct tcpm_por= t *port) port->message_id, data_obj_cnt, 1 /* Denotes if ext header */)); + + return tcpm_pd_transmit(port, TCPC_TX_SOP, &msg); +} + +static int tcpm_pd_send_batt_status(struct tcpm_port *port) +{ + u16 present_charge =3D BATTERY_PROPERTY_UNKNOWN; + bool batt_present =3D false, invalid_ref =3D true; + u32 batt_id =3D port->batt_request_id; + union power_supply_propval val; + struct power_supply *batt; + u8 charging_status =3D 0; + struct pd_message msg; + u32 bsdo; + int ret; + + memset(&msg, 0, sizeof(msg)); + + if (batt_id >=3D port->fixed_batt_cnt || !port->fixed_batt[batt_id]) + goto send_status; + + invalid_ref =3D false; + batt =3D port->fixed_batt[batt_id]; + ret =3D power_supply_get_property(batt, POWER_SUPPLY_PROP_PRESENT, &val); + if (ret) + tcpm_log(port, + "Failed to fetch power_supply_prop_present ret %d", + ret); + else + batt_present =3D val.intval > 0; + + ret =3D power_supply_get_property(batt, POWER_SUPPLY_PROP_ENERGY_NOW, + &val); + + /* Battery Present Charge is reported in increments of 0.1WH */ + if (!ret) + present_charge =3D (u16)UW_TO_W(val.intval * 10); + + ret =3D power_supply_get_property(batt, POWER_SUPPLY_PROP_STATUS, &val); + if (!ret) { + switch (val.intval) { + case POWER_SUPPLY_STATUS_CHARGING: + charging_status =3D BSDO_BATTERY_INFO_CHARGING; + break; + case POWER_SUPPLY_STATUS_DISCHARGING: + charging_status =3D BSDO_BATTERY_INFO_DISCHARGING; + break; + case POWER_SUPPLY_STATUS_NOT_CHARGING: + case POWER_SUPPLY_STATUS_FULL: + charging_status =3D BSDO_BATTERY_INFO_IDLE; + break; + default: + charging_status =3D BSDO_BATTERY_INFO_RSVD; + break; + } + } + +send_status: + + bsdo =3D BSDO(present_charge, charging_status, batt_present, invalid_ref); + msg.payload[0] =3D cpu_to_le32(bsdo); + msg.header =3D PD_HEADER_LE(PD_DATA_BATT_STATUS, + port->pwr_role, + port->data_role, + port->negotiated_rev, + port->message_id, + 1); + return tcpm_pd_transmit(port, TCPC_TX_SOP, &msg); } =20 @@ -3854,6 +3965,7 @@ static void tcpm_pd_ext_msg_request(struct tcpm_port = *port, { enum pd_ext_msg_type type =3D pd_header_type_le(msg->header); unsigned int data_size =3D pd_ext_header_data_size_le(msg->ext_msg.header= ); + const struct pd_chunked_ext_message_data *ext_msg =3D &msg->ext_msg; =20 /* stopping VDM state machine if interrupted by other Messages */ if (tcpm_vdm_ams(port)) { @@ -3862,7 +3974,7 @@ static void tcpm_pd_ext_msg_request(struct tcpm_port = *port, mod_vdm_delayed_work(port, 0); } =20 - if (!(le16_to_cpu(msg->ext_msg.header) & PD_EXT_HDR_CHUNKED)) { + if (!(le16_to_cpu(ext_msg->header) & PD_EXT_HDR_CHUNKED)) { tcpm_pd_handle_msg(port, PD_MSG_CTRL_NOT_SUPP, NONE_AMS); tcpm_log(port, "Unchunked extended messages unsupported"); return; @@ -3887,9 +3999,17 @@ static void tcpm_pd_ext_msg_request(struct tcpm_port= *port, NONE_AMS, 0); } break; + case PD_EXT_GET_BATT_STATUS: + if (data_size >=3D 1) { + port->batt_request_id =3D ext_msg->data[0]; + tcpm_pd_handle_msg(port, PD_MSG_DATA_BATT_STATUS, + GETTING_BATTERY_STATUS); + } else { + tcpm_set_state(port, SOFT_RESET_SEND, 0); + } + break; case PD_EXT_SOURCE_CAP_EXT: case PD_EXT_GET_BATT_CAP: - case PD_EXT_GET_BATT_STATUS: case PD_EXT_BATT_CAP: case PD_EXT_GET_MANUFACTURER_INFO: case PD_EXT_MANUFACTURER_INFO: @@ -4100,6 +4220,14 @@ static bool tcpm_send_queued_message(struct tcpm_por= t *port) ret); tcpm_ams_finish(port); break; + case PD_MSG_DATA_BATT_STATUS: + ret =3D tcpm_pd_send_batt_status(port); + if (ret) + tcpm_log(port, + "Failed to send battery status ret=3D%d", + ret); + tcpm_ams_finish(port); + break; default: break; } @@ -8566,6 +8694,7 @@ struct tcpm_port *tcpm_register_port(struct device *d= ev, struct tcpc_dev *tcpc) typec_port_register_cable_ops(port->port_altmode, ARRAY_SIZE(port->port_a= ltmode), &tcpm_cable_ops); port->registered =3D true; + port->fixed_batt_cnt =3D 0; =20 mutex_lock(&port->lock); tcpm_init(port); @@ -8597,6 +8726,11 @@ void tcpm_unregister_port(struct tcpm_port *port) hrtimer_cancel(&port->vdm_state_machine_timer); hrtimer_cancel(&port->state_machine_timer); =20 + for (i =3D 0; i < port->fixed_batt_cnt; i++) { + if (port->fixed_batt[i]) + power_supply_put(port->fixed_batt[i]); + } + tcpm_reset_port(port); =20 tcpm_port_unregister_pd(port); diff --git a/include/linux/usb/pd.h b/include/linux/usb/pd.h index 337a5485af7c..1f126f477c30 100644 --- a/include/linux/usb/pd.h +++ b/include/linux/usb/pd.h @@ -724,4 +724,33 @@ void usb_power_delivery_unlink_device(struct usb_power= _delivery *pd, struct devi =20 #endif /* CONFIG_TYPEC */ =20 +/* Battery Status Data Object */ +#define BSDO_PRESENT_CAPACITY GENMASK(31, 16) +#define BSDO_CHG_STATUS GENMASK(11, 10) +#define BSDO_BATTERY_PRESENT BIT(9) +#define BSDO_INVALID_BATTERY_REFERENCE BIT(8) + +/* + * Battery Charge Status: Battery Charging Status Values as defined in + * "USB PD Spec Rev3.1 Ver1.8", "Table 6-46 Battery Status Data Object (BS= DO)". + */ +#define BSDO_BATTERY_INFO_CHARGING 0x0 +#define BSDO_BATTERY_INFO_DISCHARGING 0x1 +#define BSDO_BATTERY_INFO_IDLE 0x2 +#define BSDO_BATTERY_INFO_RSVD 0x3 + +/** + * BSDO() - Pack data into Battery Status Data Object format + * @batt_charge: Battery's present state of charge in 0.1WH increment + * @chg_status: Battery charge status + * @batt_present: Indicates that battery is present/attached when set else= absent when unset + * @invalid_ref: Indicates that an invalid battery reference was made in t= he Get_Battery_Status + * request + */ +#define BSDO(batt_charge, chg_status, batt_present, invalid_ref) \ + ((FIELD_PREP(BSDO_PRESENT_CAPACITY, batt_charge)) | \ + (FIELD_PREP(BSDO_CHG_STATUS, chg_status)) | \ + ((batt_present) ? BSDO_BATTERY_PRESENT : 0) | \ + ((invalid_ref) ? BSDO_INVALID_BATTERY_REFERENCE : 0)) + #endif /* __LINUX_USB_PD_H */ --=20 2.54.0.563.g4f69b47b94-goog From nobody Fri Jun 12 12:44:29 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AAF00366830; Fri, 15 May 2026 05:50:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778824257; cv=none; b=CmdVTXdTl8/kvHU8nhRZBQnWTGM6FRW5PqByN3O9ihzV/7I+eMmVNeq3WKX3XjKNTLynQ3Ryl87leCu5vJnHC/M/N04ESInqmjU+abLSisB1swVuZrF3ol5ILf0ZSNmojyNJ9+4LVzVQx6QGU1bz60t2E/H/PyXAhxNTWdmCzOE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778824257; c=relaxed/simple; bh=v0n4iL+ec7ubF7WE3r+09txUZuNOlRfNgY9pxDWbRgY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=TENKpT/1cLKj8x58UvLGzRcpaglWXQWp1qLi1KSn5KOIOskMbFpUjFscJkTehWJIc3uMx6C/6nAxijAUkam7wdW0f3lrw3E8uU1/VmPJpyFZQzDakyJ0C2rPWCbYJmlFHmbzrrfYAM1sXECZDiQ6guGQeGbQkvPxZ0MFy0VBXws= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hjC6g/ue; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hjC6g/ue" Received: by smtp.kernel.org (Postfix) with ESMTPS id 7C94DC2BCFB; Fri, 15 May 2026 05:50:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778824257; bh=v0n4iL+ec7ubF7WE3r+09txUZuNOlRfNgY9pxDWbRgY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=hjC6g/ue5VGk+RAa2i/AZCUGdEKSMNl1UoJc9IAloUNrZ2EPx98qKWurWkR2spxYB 3YBFnZDqrew8K6kX/rfmlds69+6YhcTzNZ2LoiGLomdYOktvc6O0MI3leYuDB8vTUk kS8cIuu3LhII3J5u/QPu4sWaxINSq6uw+qG1tfmkqK0m7xElyTRqHfXLMb+mgRMZlC 0D/1DWNfRsyDVszpqatmTzminHVzeVe2Y1dhI/Cg6NOQE7txSCVt5bbb+ZUPm7NqBq qh0tAv/lMOveZuv0QNnv/nEwwgbYMcYkfGL1myfNrX1BUDhonbEB0vbqZZVjeX5tCQ 7XEusK8P1+Gdg== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 73454CD4851; Fri, 15 May 2026 05:50:57 +0000 (UTC) From: Amit Sunil Dhamne via B4 Relay Date: Fri, 15 May 2026 05:48:41 +0000 Subject: [PATCH 3/3] power: supply: max17042: add handler for energy_now property Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260515-batt-status-v1-3-fed6b7d8cea7@google.com> References: <20260515-batt-status-v1-0-fed6b7d8cea7@google.com> In-Reply-To: <20260515-batt-status-v1-0-fed6b7d8cea7@google.com> To: Sebastian Reichel , Badhri Jagan Sridharan , Heikki Krogerus , Greg Kroah-Hartman , Hans de Goede , Krzysztof Kozlowski , Marek Szyprowski , Sebastian Krzyszkowiak , Purism Kernel Team Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, =?utf-8?q?Andr=C3=A9_Draszik?= , Tudor Ambarus , Peter Griffin , RD Babiera , Kyle Tso , Amit Sunil Dhamne X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1778824256; l=3946; i=amitsd@google.com; s=20241031; h=from:subject:message-id; bh=rZ4iAk16d2xmYX+iRg9d3aLsjlCGLdVUfG6+D9Nq6hY=; b=mP5j13ZK2htM+zjnJ8ThHRPxXR/MqZXaXDsFwNM3MXuPFJnxgRn6pYa1b9P0EF0FZFZ5S6+mj ATw1BO4vO+EDPgUyeEPZXs0dSzHVvnkrmOZf/gtkg+HPU+v6ig8qNHs X-Developer-Key: i=amitsd@google.com; a=ed25519; pk=wD+XZSST4dmnNZf62/lqJpLm7fiyT8iv462zmQ3H6bI= X-Endpoint-Received: by B4 Relay for amitsd@google.com/20241031 with auth_id=262 X-Original-From: Amit Sunil Dhamne Reply-To: amitsd@google.com From: Amit Sunil Dhamne Add handler to report power_supply_prop_energy_now so that users can get current SoC in uWH. Additionally, add helper functions to get avg_vcell and repcap values in uv and uah units respectively to avoid code duplication. Signed-off-by: Amit Sunil Dhamne --- drivers/power/supply/max17042_battery.c | 60 ++++++++++++++++++++++++++---= ---- 1 file changed, 47 insertions(+), 13 deletions(-) diff --git a/drivers/power/supply/max17042_battery.c b/drivers/power/supply= /max17042_battery.c index 167fb3fb3732..e16eb6985b70 100644 --- a/drivers/power/supply/max17042_battery.c +++ b/drivers/power/supply/max17042_battery.c @@ -81,6 +81,7 @@ static enum power_supply_property max17042_battery_props[= ] =3D { POWER_SUPPLY_PROP_CHARGE_NOW, POWER_SUPPLY_PROP_CHARGE_COUNTER, POWER_SUPPLY_PROP_CHARGE_TERM_CURRENT, + POWER_SUPPLY_PROP_ENERGY_NOW, POWER_SUPPLY_PROP_TEMP, POWER_SUPPLY_PROP_TEMP_ALERT_MIN, POWER_SUPPLY_PROP_TEMP_ALERT_MAX, @@ -95,6 +96,36 @@ static enum power_supply_property max17042_battery_props= [] =3D { POWER_SUPPLY_PROP_CURRENT_AVG, }; =20 +static int max17042_get_repcap_uah(struct max17042_chip *chip, u64 *rep_ca= p) +{ + u32 data; + int ret; + + ret =3D regmap_read(chip->regmap, MAX17042_RepCap, &data); + if (ret < 0) + return ret; + + *rep_cap =3D data * 5000000ll; + *rep_cap *=3D chip->task_period; + do_div(*rep_cap, MAX17042_DEFAULT_TASK_PERIOD); + do_div(*rep_cap, chip->pdata->r_sns); + + return 0; +} + +static int max17042_get_avgvcell_uv(struct max17042_chip *chip, u32 *vcell) +{ + int ret; + + ret =3D regmap_read(chip->regmap, MAX17042_AvgVCELL, vcell); + if (ret < 0) + return ret; + + *vcell =3D (*vcell * 625) / 8; + + return 0; +} + static int max17042_get_temperature(struct max17042_chip *chip, int *temp) { int ret; @@ -180,14 +211,12 @@ static int max17042_get_battery_health(struct max1704= 2_chip *chip, int *health) int temp, vavg, vbatt, ret; u32 val; =20 - ret =3D regmap_read(chip->regmap, MAX17042_AvgVCELL, &val); + ret =3D max17042_get_avgvcell_uv(chip, &val); if (ret < 0) goto health_error; =20 - /* bits [0-3] unused */ - vavg =3D val * 625 / 8; /* Convert to millivolts */ - vavg /=3D 1000; + vavg =3D val / 1000; =20 ret =3D regmap_read(chip->regmap, MAX17042_VCELL, &val); if (ret < 0) @@ -304,11 +333,10 @@ static int max17042_get_property(struct power_supply = *psy, val->intval =3D data * 625 / 8; break; case POWER_SUPPLY_PROP_VOLTAGE_AVG: - ret =3D regmap_read(map, MAX17042_AvgVCELL, &data); + ret =3D max17042_get_avgvcell_uv(chip, &data); if (ret < 0) return ret; - - val->intval =3D data * 625 / 8; + val->intval =3D data; break; case POWER_SUPPLY_PROP_VOLTAGE_OCV: ret =3D regmap_read(map, MAX17042_OCVInternal, &data); @@ -350,14 +378,9 @@ static int max17042_get_property(struct power_supply *= psy, val->intval =3D data64; break; case POWER_SUPPLY_PROP_CHARGE_NOW: - ret =3D regmap_read(map, MAX17042_RepCap, &data); + ret =3D max17042_get_repcap_uah(chip, &data64); if (ret < 0) return ret; - - data64 =3D data * 5000000ll; - data64 *=3D chip->task_period; - do_div(data64, MAX17042_DEFAULT_TASK_PERIOD); - do_div(data64, chip->pdata->r_sns); val->intval =3D data64; break; case POWER_SUPPLY_PROP_CHARGE_COUNTER: @@ -370,6 +393,17 @@ static int max17042_get_property(struct power_supply *= psy, data64 =3D div_s64(data64, MAX17042_DEFAULT_TASK_PERIOD); val->intval =3D div_s64(data64, chip->pdata->r_sns); break; + case POWER_SUPPLY_PROP_ENERGY_NOW: + ret =3D max17042_get_repcap_uah(chip, &data64); + if (ret < 0) + return ret; + + ret =3D max17042_get_avgvcell_uv(chip, &data); + if (ret < 0) + return ret; + + val->intval =3D data64 * data / 1000000; + break; case POWER_SUPPLY_PROP_TEMP: ret =3D max17042_get_temperature(chip, &val->intval); if (ret < 0) --=20 2.54.0.563.g4f69b47b94-goog