From patchwork Wed Jul 10 20:12:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 13729636 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 16D4E198A04; Wed, 10 Jul 2024 20:12:49 +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=1720642369; cv=none; b=cHjp5dYE2VFZswKnyMS+0PCgi5MzJvgC7ohP1NL7ikYJ+R4FBJb4ZupeKyZSFM2R2UDonJ6KWlGG2vsvjdwTrN7PcFqCGPr8hhpHPuUGY7kVg7OVELcN+7rorDfvuAqhQp3UMjVZCfyLRq3quG3I/ttw8EM2yOOBSUqD/GL1GKk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720642369; c=relaxed/simple; bh=mbvqYPnjN0sDSYQIJsVwrvYeH1A/tqHM51IP0m7w1W0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=j3dxKKDEiqZ82yPWkmdtHw+Elr9HweMbcgR/5a5361nvzjFxRzpMc3JBsDu38vp+R1gONDI40/y5B9YVWAGCoB5uLwlYJY8lrmpN2AMqgODCf9v7U+Duh9dggimokqiU6peJOOiVmE3bEfpPMRwRaWHKeBmk6PPpijXGVhSbovs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=QBJTOHla; 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="QBJTOHla" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 14B6EC4AF0C; Wed, 10 Jul 2024 20:12:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1720642368; bh=mbvqYPnjN0sDSYQIJsVwrvYeH1A/tqHM51IP0m7w1W0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QBJTOHlaVxakxnBJMX2yasdFvSJLs6eWxPd6kEEIAzv+j1/Ppkmjr7NPW1J1Atet3 PNRUkr9SRpJFGoe1EgVZpz9H2okYz6xnzV0MOJInVU91UJ3HJhR4EwVHJCxHb+bq8x lalkAHPAX12oH0p/RWetJP9oG1LJ6Ghk4n/RlNx8MjVQTTvkSuHuUhJJwPh+rb89sV 5DOCr2s9EMqd6QXS6GqME6Z3xoIND79MJlxcZH+C7yyvXs+R1usYLo8xqqYx5VXAvB c1p5cumi8M8tTD47yVtjctK2s04y+Y7fmerCYFqjIWqEEif+W+BCJmbbTC7uHtnAKn Q0tmRRBBpwR2w== From: Stephen Boyd To: Michael Turquette , Stephen Boyd Cc: linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, patches@lists.linux.dev, kunit-dev@googlegroups.com, linux-kselftest@vger.kernel.org, devicetree@vger.kernel.org, Brendan Higgins , David Gow , Rae Moar , Greg Kroah-Hartman , "Rafael J . Wysocki" , Rob Herring , Saravana Kannan , Daniel Latypov , Christian Marangi , Krzysztof Kozlowski , Conor Dooley , Maxime Ripard Subject: [PATCH v7 1/8] of/platform: Allow overlays to create platform devices from the root node Date: Wed, 10 Jul 2024 13:12:37 -0700 Message-ID: <20240710201246.1802189-2-sboyd@kernel.org> X-Mailer: git-send-email 2.45.2.803.g4e1b14247a-goog In-Reply-To: <20240710201246.1802189-1-sboyd@kernel.org> References: <20240710201246.1802189-1-sboyd@kernel.org> Precedence: bulk X-Mailing-List: linux-clk@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 We'd like to apply overlays to the root node in KUnit so we can test platform devices created as children of the root node. On some architectures (powerpc), the root node isn't marked with OF_POPULATED_BUS. If an overlay tries to modify the root node on these platforms it will fail, while on other platforms, such as ARM, it will succeed. This is because the root node is marked with OF_POPULATED_BUS by of_platform_default_populate_init() calling of_platform_default_populate() with NULL as the first argument. Loosen the requirement here so that platform devices can be created for nodes created as children of the root node via DT overlays even if the platform bus wasn't populated for the root node. Reviewed-by: Rob Herring (Arm) Cc: Saravana Kannan Signed-off-by: Stephen Boyd --- drivers/of/platform.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/of/platform.c b/drivers/of/platform.c index 389d4ea6bfc1..bda6da866cc8 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -732,11 +732,14 @@ static int of_platform_notify(struct notifier_block *nb, struct of_reconfig_data *rd = arg; struct platform_device *pdev_parent, *pdev; bool children_left; + struct device_node *parent; switch (of_reconfig_get_state_change(action, rd)) { case OF_RECONFIG_CHANGE_ADD: - /* verify that the parent is a bus */ - if (!of_node_check_flag(rd->dn->parent, OF_POPULATED_BUS)) + parent = rd->dn->parent; + /* verify that the parent is a bus (or the root node) */ + if (!of_node_is_root(parent) && + of_node_check_flag(parent, OF_POPULATED_BUS)) return NOTIFY_OK; /* not for us */ /* already populated? (driver using of_populate manually) */ @@ -749,7 +752,7 @@ static int of_platform_notify(struct notifier_block *nb, */ rd->dn->fwnode.flags &= ~FWNODE_FLAG_NOT_DEVICE; /* pdev_parent may be NULL when no bus platform device */ - pdev_parent = of_find_device_by_node(rd->dn->parent); + pdev_parent = of_find_device_by_node(parent); pdev = of_platform_device_create(rd->dn, NULL, pdev_parent ? &pdev_parent->dev : NULL); platform_device_put(pdev_parent);