From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794049330; b=uWN0E6aTdz7rm+pc3k0ApQiJCW7y3zcqZ0AU9/xS2eqr1PgORv9+7NnzF9iyWNGC8t4e SOzMbyFkP5cjGZ4y2zalpnnX2JL9cTIiPz4ig7G06GGfgjbUIiK5D3/vWGfirB7I4Ixmd liYqMehEkkGe0PIb4WuoXqYdu6f7vKchws1PtoM7qO/u3yTTIhsWLo9ZsDIm9xpr7rkwt L4zcVBPSd5g4YimeDP+j2TrupIwlqjxNzzKyoDWQe0r4ZmMnaA4BOtzTZmRV9JHx15Nd+ wlZp88lVEIA/6231ibg/LpiSy+jykDEm8Jgp36u03wMyv6aHiQfDs0TiQw8BvwAttIA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794049330; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=efUQyihJmziRhWnjChbgyq9g1zCINpp/3YU7+qfAph0=; b=TnPD1XL6yleaV+i5WKixt0gxi7vDHncxoX1l/joYRLng4CVuTQ3ZSTWLftqfiYBroFS5 5e5fDNVyvyq+BzLbmSEPmD8NuFURKNMYz0tUcpBPFc4gAgJtueS6iHSmYT0Thg0MRgmCl xzvXBpigfcM9ZX/I4mehlt8FlCnwwSORIqXKLjyAzqIl9OnDQdzvUxZpcX9BuKY96nEz/ LctNGJv5ykYqkS40DvgsVFw2TAIu+uK1hmJoDBTOchTdF0TvdJ/GFOXnLqgiFJauDhK1/ lPZCX5q9Ovwn3umgANCD8LFzkgFfIE5M0DqKeUN9VFfEp7Wo+eQBIdJmw+5sOjwdGDQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=eFerd7lP; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 60427606A32D for ; Sat, 7 Nov 2026 11:02:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=eFerd7lP Received: by smtp.kernel.org (Postfix) with ESMTPSA id D0B7A1F0089F; Sat, 7 Nov 2026 11:02:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794049330; bh=efUQyihJmziRhWnjChbgyq9g1zCINpp/3YU7+qfAph0=; h=From:To:Cc:Subject:Date; b=eFerd7lPX8C9YWfOyWDY9dGy97jazGyQobx2AdfHHtb82DZGKvw1FiCXXgwonnM+Z nmDrnKglAbCsrtisddX8pK3LLEhzNROfYSvjOeNwuDbH4ZmV9wyfUZiQZK+PbZFcr5 NacczZ4HdbrXHAcM51VT2RAYdTFXBzctFWVudhcEwjNL+wqzunkSFQllZJjmwO2Sg8 Py+T5J+Q/cCYU8JKLj6RdQEkpOsjwXX16eWwlwNpSYDGJJq1HMA0jnil78ZeFSqcv2 paUJDBUYxYnXizA+OYKn2iwCuCeWCB+7B+bcIVAMMB2WS2okwxC1ayu9vQqToX+/S9 mDX1E2kIE6eCA== From: Sasha Levin To: mauriziocasciano7@gmail.com, sebastian.reichel@collabora.com Cc: stable@vger.kernel.org Subject: FAILED: patch "[PATCH] power: supply: core: Honor supplied-from with CONFIG_OF=y" failed to apply to 5.15-stable tree Date: Sat, 7 Nov 2026 06:02:08 -0500 Message-ID: <20261107060208-failed-5.15-6bd80f22c764@kernel.org> X-Mailer: git-send-email 2.53.0 X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y git checkout FETCH_HEAD git cherry-pick -x 6bd80f22c764fe8c56c62c118387f86a3ca98cff # git commit -s git send-email --to '' --in-reply-to '20261107060208-failed-5.15-6bd80f22c764@kernel.org' --subject-prefix 'PATCH 5.15.y' 'HEAD^..' Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From 6bd80f22c764fe8c56c62c118387f86a3ca98cff Mon Sep 17 00:00:00 2001 From: Maurizio Casciano Date: Fri, 25 Sep 2026 00:51:52 +0200 Subject: [PATCH] power: supply: core: Honor supplied-from with CONFIG_OF=y The supplied-from device property is the name-based counterpart to firmware-node power-supplies references. It was added for non-DT platforms, but its parser is compiled only when CONFIG_OF is disabled. CONFIG_OF is a global kernel option, so x86 systems commonly enable it even when individual power supplies are described by software nodes. Consequently, these consumers never populate supplied_from and supplier notifications do not reach their external_power_changed() callbacks. On a Lenovo Yoga Book YB1-X91L, ftrace showed the Whiskey Cove supplier notification running without invoking the BQ25892 callback, leaving the input current limit at its boot-time value. Use a single power_supply_check_supplies() implementation for all configurations. Preserve firmware-node power-supplies references as the preferred firmware description and use the name-based supplied-from property only when no references are specified. Continue to honor an explicitly provided supplied_from list first and propagate errors from specified firmware references. With the fix, ftrace shows the BQ25892 callback on hotplug. A boot-offline test changes its input current limit from 500 mA to 2 A. Fixes: 58a36bb06891 ("power: supply: core: Add support for supplied-from device-property") Cc: stable@vger.kernel.org Assisted-by: LLM Signed-off-by: Maurizio Casciano Link: https://patch.msgid.link/20260924225152.985489-1-mauriziocasciano7@gmail.com Signed-off-by: Sebastian Reichel --- drivers/power/supply/power_supply_core.c | 84 ++++++++++++------------ 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c index 00d8bc98d5887..c097601ac5491 100644 --- a/drivers/power/supply/power_supply_core.c +++ b/drivers/power/supply/power_supply_core.c @@ -190,7 +190,35 @@ static void power_supply_deferred_register_work(struct work_struct *work) device_unlock(psy->dev.parent); } -#ifdef CONFIG_OF +static int power_supply_check_supplies_by_name(struct power_supply *psy) +{ + struct device *parent = psy->dev.parent; + int nval, ret; + + if (!parent) + return 0; + + nval = device_property_string_array_count(parent, "supplied-from"); + if (nval <= 0) + return 0; + + psy->supplied_from = devm_kmalloc_array(&psy->dev, nval, + sizeof(*psy->supplied_from), + GFP_KERNEL); + if (!psy->supplied_from) + return -ENOMEM; + + ret = device_property_read_string_array(parent, "supplied-from", + (const char **)psy->supplied_from, + nval); + if (ret < 0) + return ret; + + psy->num_supplies = nval; + + return 0; +} + static int __power_supply_populate_supplied_from(struct power_supply *epsy, void *data) { @@ -262,22 +290,21 @@ static int power_supply_find_supply_from_fwnode(struct fwnode_handle *supply_nod static int power_supply_check_supplies(struct power_supply *psy) { struct fwnode_handle *np; - int cnt = 0; + int cnt, ret; /* If there is already a list honor it */ if (psy->supplied_from && psy->num_supplies > 0) return 0; - /* No device node found, nothing to do */ - if (!psy->dev.fwnode) - return 0; - - do { - int ret; + for (cnt = 0; psy->dev.fwnode; cnt++) { + np = fwnode_find_reference(psy->dev.fwnode, "power-supplies", cnt); + if (IS_ERR(np)) { + ret = PTR_ERR(np); + if (ret != -ENOENT) + return ret; - np = fwnode_find_reference(psy->dev.fwnode, "power-supplies", cnt++); - if (IS_ERR(np)) break; + } ret = power_supply_find_supply_from_fwnode(np); fwnode_handle_put(np); @@ -286,48 +313,21 @@ static int power_supply_check_supplies(struct power_supply *psy) dev_dbg(&psy->dev, "Failed to find supply!\n"); return ret; } - } while (!IS_ERR(np)); + } - /* Missing valid "power-supplies" entries */ - if (cnt == 1) - return 0; + /* Fall back to the name-based property if no references were specified. */ + if (!cnt) + return power_supply_check_supplies_by_name(psy); /* All supplies found, allocate char * array for filling */ psy->supplied_from = devm_kcalloc(&psy->dev, - cnt - 1, sizeof(*psy->supplied_from), + cnt, sizeof(*psy->supplied_from), GFP_KERNEL); if (!psy->supplied_from) return -ENOMEM; return power_supply_populate_supplied_from(psy); } -#else -static int power_supply_check_supplies(struct power_supply *psy) -{ - int nval, ret; - - if (!psy->dev.parent) - return 0; - - nval = device_property_string_array_count(psy->dev.parent, "supplied-from"); - if (nval <= 0) - return 0; - - psy->supplied_from = devm_kmalloc_array(&psy->dev, nval, - sizeof(char *), GFP_KERNEL); - if (!psy->supplied_from) - return -ENOMEM; - - ret = device_property_read_string_array(psy->dev.parent, - "supplied-from", (const char **)psy->supplied_from, nval); - if (ret < 0) - return ret; - - psy->num_supplies = nval; - - return 0; -} -#endif struct psy_am_i_supplied_data { struct power_supply *psy; -- 2.53.0