From patchwork Fri Mar 17 10:33:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 71231 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp262382wrt; Fri, 17 Mar 2023 03:43:12 -0700 (PDT) X-Google-Smtp-Source: AK7set8HSv42VWp0erfEo4ZoDo9sNTVjWixDki3UgiubKJ1b8Ya39oE5gyrjwM7HgKGMhdRJIXXy X-Received: by 2002:a17:902:b713:b0:19a:7439:3e98 with SMTP id d19-20020a170902b71300b0019a74393e98mr9544277pls.4.1679049791820; Fri, 17 Mar 2023 03:43:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679049791; cv=none; d=google.com; s=arc-20160816; b=SPz1R4dABAucpPmNMeZSUS34bqS/ZUfh3D7ad5ct490jNdTDqKZoWGLNtZcRzSOhq5 wh2YrOrBmoSYJ/VOZEGaX6Q/pzt70INx/+RmYyPpQrXRGdLD1/qVzJWQD1Pj3+iP4UgM 7Uwn726cER9Zzoh50cbbQDQNyUihWwpXlFNTfvByLvYCijzqMMej3pvZFnBwIbXtWd9s hCdaKy2dyjgsJy4jCi5Nzf2exPGC13Gl26dhOvUvyaP8bcNjjxaTX8INti95t1j+U7n6 ShNIyAd60d+4z/fB0FVHHOoTbo8FhJ++uW1V3uII+fVkh2FspAGNyLMhHAY0cm2xhqD3 7Yug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=4F6STDdTSQhmrfwVqLU0VVZUQVMxIfBiG86aHmocSfg=; b=r8KOjLIa3N9NeOCfsq/bDpe627cfvg17/haLqo9DA5PNnvfxa5TH9DXoKvvJuGMtQg uMyF4+W6/w5ndOUOQSXa0/nPJvhw0e3zI8ajSg6wl2flXwLUSgGEqXNUUHcQPCJmBjbF 23EomgYibiHSqpp0UIWfEUuTfBXD3R6quo6aLlsUIlyHr454DweitIPzih8uFXy/LDgF PB3vUo9C7LzOsVJELbBUeyrDcUopl9XFurHZnjJ8qJeD4a/lraliPCeEMxnF08VRh/m6 ybtbo9Xj/ug97I9kMh5CPOSALJv+d7MiHQMJZKHc/8AwJ7K6EwNIfqmp1vNZ64JKgOoh TU3w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m13-20020a170902db0d00b0019e6a5cf724si2437386plx.203.2023.03.17.03.42.56; Fri, 17 Mar 2023 03:43:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229760AbjCQKdj (ORCPT + 99 others); Fri, 17 Mar 2023 06:33:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52408 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229616AbjCQKdg (ORCPT ); Fri, 17 Mar 2023 06:33:36 -0400 Received: from laurent.telenet-ops.be (laurent.telenet-ops.be [IPv6:2a02:1800:110:4::f00:19]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C686F2CC42 for ; Fri, 17 Mar 2023 03:33:32 -0700 (PDT) Received: from ramsan.of.borg ([84.195.187.55]) by laurent.telenet-ops.be with bizsmtp id ZNZM290071C8whw01NZMKx; Fri, 17 Mar 2023 11:33:31 +0100 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1pd7O5-00CXwE-E0; Fri, 17 Mar 2023 11:33:21 +0100 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1pd7Oi-00FFZ4-Tm; Fri, 17 Mar 2023 11:33:20 +0100 From: Geert Uytterhoeven To: Saravana Kannan , Greg Kroah-Hartman Cc: Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Wolfram Sang , Rob Herring , Frank Rowand , Mark Brown , linux-arm-kernel@lists.infradead.org, linux-i2c@vger.kernel.org, devicetree@vger.kernel.org, linux-spi@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH/RFC] treewide: Fix instantiation of devices in DT overlay Date: Fri, 17 Mar 2023 11:33:18 +0100 Message-Id: <328e557aaee9d3f5f1bcaf2b8ac2de0e04c4fbb8.1679049188.git.geert+renesas@glider.be> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.3 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760611314265559000?= X-GMAIL-MSGID: =?utf-8?q?1760611314265559000?= When loading a DT overlay that creates a device, the device is not instantiated, unless the DT overlay is unloaded and reloaded again. Saravana explains: Basically for all overlays (I hope the function is only used for overlays) we assume all nodes are NOT devices until they actually get added as a device. Don't review the code, it's not meant to be :) Based on a hacky patch by Saravana Kannan, which covered only platform and spi devices. Fixes: 4a032827daa89350 ("of: property: Simplify of_link_to_phandle()") Link: https://lore.kernel.org/all/CAGETcx_+rhHvaC_HJXGrr5_WAd2+k5f=rWYnkCZ6z5bGX-wj4w@mail.gmail.com Signed-off-by: Geert Uytterhoeven Acked-by: Mark Brown --- Marked RFC as Saravana said this is an ugly hack. Still, this is a regression in v6.3-rc1 that should be fixed. --- drivers/bus/imx-weim.c | 1 + drivers/i2c/i2c-core-of.c | 1 + drivers/of/dynamic.c | 1 + drivers/of/platform.c | 1 + drivers/spi/spi.c | 1 + 5 files changed, 5 insertions(+) diff --git a/drivers/bus/imx-weim.c b/drivers/bus/imx-weim.c index 2a6b4f676458612e..71d8807170fa9f29 100644 --- a/drivers/bus/imx-weim.c +++ b/drivers/bus/imx-weim.c @@ -329,6 +329,7 @@ static int of_weim_notify(struct notifier_block *nb, unsigned long action, "Failed to setup timing for '%pOF'\n", rd->dn); if (!of_node_check_flag(rd->dn, OF_POPULATED)) { + rd->dn->fwnode.flags &= ~FWNODE_FLAG_NOT_DEVICE; if (!of_platform_device_create(rd->dn, NULL, &pdev->dev)) { dev_err(&pdev->dev, "Failed to create child device '%pOF'\n", diff --git a/drivers/i2c/i2c-core-of.c b/drivers/i2c/i2c-core-of.c index bce6b796e04c2ca0..79a0d47010ba0b20 100644 --- a/drivers/i2c/i2c-core-of.c +++ b/drivers/i2c/i2c-core-of.c @@ -178,6 +178,7 @@ static int of_i2c_notify(struct notifier_block *nb, unsigned long action, return NOTIFY_OK; } + rd->dn->fwnode.flags &= ~FWNODE_FLAG_NOT_DEVICE; client = of_i2c_register_device(adap, rd->dn); if (IS_ERR(client)) { dev_err(&adap->dev, "failed to create client for '%pOF'\n", diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c index 07d93753b12f5f4d..e311d406b1705306 100644 --- a/drivers/of/dynamic.c +++ b/drivers/of/dynamic.c @@ -226,6 +226,7 @@ static void __of_attach_node(struct device_node *np) np->sibling = np->parent->child; np->parent->child = np; of_node_clear_flag(np, OF_DETACHED); + np->fwnode.flags |= FWNODE_FLAG_NOT_DEVICE; } /** diff --git a/drivers/of/platform.c b/drivers/of/platform.c index b2bd2e783445dd78..17c92cbfb62ee3ef 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -737,6 +737,7 @@ static int of_platform_notify(struct notifier_block *nb, if (of_node_check_flag(rd->dn, OF_POPULATED)) return NOTIFY_OK; + 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 = of_platform_device_create(rd->dn, NULL, diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 1a65f96fe2aff591..7bd053a32fad1a3c 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -4480,6 +4480,7 @@ static int of_spi_notify(struct notifier_block *nb, unsigned long action, return NOTIFY_OK; } + rd->dn->fwnode.flags &= ~FWNODE_FLAG_NOT_DEVICE; spi = of_register_spi_device(ctlr, rd->dn); put_device(&ctlr->dev);