From mboxrd@z Thu Jan 1 00:00:00 1970 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 E043E3081C7; Mon, 1 Dec 2025 11:30:18 +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=1764588619; cv=none; b=rjqv9RNCf0fitwUeqSMGDGazqTobXi0IXmRsqY8dRyGIlVql6/GrF941aOowYt4rdx1wYNiL01NKdEGJD3h+wrSP4vgkR+AqPAPxuId0XrlVhANeHTrCv8TwdXt+FgcksZjYqPrcAGs+RSvD4huijQjO8aKBOhJapQzHjVhxP2k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764588619; c=relaxed/simple; bh=ZXLiK6JNAIMwmSXGk/ffqFNhg+EoxVxuJc2jcYMyWd8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=G2g/6JWsWOO3fu/jP4zgw5XCy0xwpyXID9ZFLTJLzGW+djEvPotQTLJXWTAoXgcba35stm9hn2argo+Z6wjxUenDNcZSW4KWnKcMPNvaEaF1GlcHAt7Aj9uxMlmEcOI3OKBJ8QEfQIQQ1E0Lt2/+XCD+/aSyeVFczn0aFuhi8gY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=t2i8Kbgr; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="t2i8Kbgr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 68FC2C4CEF1; Mon, 1 Dec 2025 11:30:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1764588618; bh=ZXLiK6JNAIMwmSXGk/ffqFNhg+EoxVxuJc2jcYMyWd8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t2i8KbgrChK0t5fz6Wrjj+Y2RSzOFCwTqAGFUyJIZsRSFkf10JyBSwaJmclY3lPgf VvezZAdzNiXbpKej+GkxfFCbmfGJQDMUOlyb6B4UExYj1LfHXPvVMRHP5Q23ncUq1h UCv9uypCqcVxap3nCjD6DTYoTJS2HxMGjK0TJxmo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sakari Ailus , Laurent Pinchart , Jonathan Cameron , "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH 5.4 110/187] ACPI: property: Return present device nodes only on fwnode interface Date: Mon, 1 Dec 2025 12:23:38 +0100 Message-ID: <20251201112245.207156889@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251201112241.242614045@linuxfoundation.org> References: <20251201112241.242614045@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sakari Ailus [ Upstream commit d9f866b2bb3eec38b3734f1fed325ec7c55ccdfa ] fwnode_graph_get_next_subnode() may return fwnode backed by ACPI device nodes and there has been no check these devices are present in the system, unlike there has been on fwnode OF backend. In order to provide consistent behaviour towards callers, add a check for device presence by introducing a new function acpi_get_next_present_subnode(), used as the get_next_child_node() fwnode operation that also checks device node presence. Signed-off-by: Sakari Ailus Reviewed-by: Laurent Pinchart Reviewed-by: Jonathan Cameron Link: https://patch.msgid.link/20251001102636.1272722-2-sakari.ailus@linux.intel.com [ rjw: Kerneldoc comment and changelog edits ] Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/acpi/property.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/property.c b/drivers/acpi/property.c index 5906e247b9fa1..c25fe9b86e237 100644 --- a/drivers/acpi/property.c +++ b/drivers/acpi/property.c @@ -1114,6 +1114,28 @@ struct fwnode_handle *acpi_get_next_subnode(const struct fwnode_handle *fwnode, return NULL; } +/* + * acpi_get_next_present_subnode - Return the next present child node handle + * @fwnode: Firmware node to find the next child node for. + * @child: Handle to one of the device's child nodes or a null handle. + * + * Like acpi_get_next_subnode(), but the device nodes returned by + * acpi_get_next_present_subnode() are guaranteed to be present. + * + * Returns: The fwnode handle of the next present sub-node. + */ +static struct fwnode_handle * +acpi_get_next_present_subnode(const struct fwnode_handle *fwnode, + struct fwnode_handle *child) +{ + do { + child = acpi_get_next_subnode(fwnode, child); + } while (is_acpi_device_node(child) && + !acpi_device_is_present(to_acpi_device_node(child))); + + return child; +} + /** * acpi_node_get_parent - Return parent fwnode of this fwnode * @fwnode: Firmware node whose parent to get @@ -1387,7 +1409,7 @@ acpi_fwnode_device_get_match_data(const struct fwnode_handle *fwnode, .property_read_string_array = \ acpi_fwnode_property_read_string_array, \ .get_parent = acpi_node_get_parent, \ - .get_next_child_node = acpi_get_next_subnode, \ + .get_next_child_node = acpi_get_next_present_subnode, \ .get_named_child_node = acpi_fwnode_get_named_child_node, \ .get_reference_args = acpi_fwnode_get_reference_args, \ .graph_get_next_endpoint = \ -- 2.51.0