From patchwork Mon Apr 8 23:13:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saravana Kannan X-Patchwork-Id: 13621657 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 63699CD1292 for ; Mon, 8 Apr 2024 23:13:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:References: Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=aIsGeEG8Tg57PRV1+uiwsE5W3r1mN5FhdhhrDQYsV4I=; b=0RZA3QgugK+9GTLRKX3SATJIRN uU24bQgXESa3sGh1s9VbkWXY4KSUGIvyYobPcGcu/QOfN80Lig/8unmlDlDzee8oxdJPaAaZTnu5Q uyDltGRF4bKE/x2Nu7t8QppV67fXkKPzp8vKIf1udscQGlfybDE1WCggLaJKjyHNlUvh7KHitAr0s eW4VkLF1btMx7tbfVn/NmdezXEim/P3InnwRKWgdpe30QyXvZzPqEmntiEwwhPXezjOo3W4JUJvlY ioruQmutmn/555a3X3ERGQDaQjAa0PYlIra7ICx3cn6EahV/elBuBNrBKLwKquSpHlQEhHwl1lytX b4XExTfw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rtyBB-0000000H79Z-3vEa; Mon, 08 Apr 2024 23:13:33 +0000 Received: from mail-yw1-x114a.google.com ([2607:f8b0:4864:20::114a]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rtyB3-0000000H775-0VjQ for linux-arm-kernel@lists.infradead.org; Mon, 08 Apr 2024 23:13:26 +0000 Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-610c23abd1fso92899627b3.0 for ; Mon, 08 Apr 2024 16:13:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1712618003; x=1713222803; darn=lists.infradead.org; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=eHsEtZCKaHOJpKzkmFo1QTaciQX5xyBED5wwHFx24rA=; b=4CyenfwAouoFjAYsgihA5sieYB9bDyTfBvkf2L1gzItjq9e55JdpFVMvXPAR02Stqi KzC1S/eAB/zfrL7a8k7jl1AXHrsSfautPw+NBsnUxybGFuWyd/VakXj2AlNHERuxVw5Y 4ozoXItoNzR+a70ZTDYj6dnk8imKdAHYonDvG/9JHAPXw4QSpKFC9CSnPk8agotHiFCC VywuHWhIrv5/qntHD8E9+sfJ3mG00rkfMyHt6lZhBjrpdElArN6L+cib2wt2ZFUyE8jy 4Ni6CyVPfAWe2czV23i6aHXeoctX5MFfNvLqja4VoCYr8XzdRCk+yp5B9tgbqnP1ntVH 8myw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712618003; x=1713222803; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=eHsEtZCKaHOJpKzkmFo1QTaciQX5xyBED5wwHFx24rA=; b=dc+EiMDboLoYjqpoNFmKccslkt5eZyICdxewRybbXfnrc7qiFOZE9r4bd1duOHy6Dl sdPu69FUx6wzCzWp3/NFkVYUVAWtmps0MiKgZCRA8sKOM4Qkg+zB8P6PKtCFGeoz7iDN 4kpHt93R2FxARoRNkON5N6DV12pYFkAa1ZV7aztyg0aRhRmyX6Da43jeknpAjVOFJQ2N j85iPrnRYtOhOEfQzyRiYMudBmIP4Nbch1cb8bkFlAJ91SfqXG1Qlbky8okdsb152OuP 2KDpEV+Aq+mGg/iu4CiNBJ0gBGy7VgyRzfVgUv7y4YrFGgonqxAQK25Pazni7mvQCM2N xt/A== X-Forwarded-Encrypted: i=1; AJvYcCUyvhDnZNgMjUxruZnFQfspvOCnj9zS8mvIv7d5nhgWD2ty/OVfB+PEQ9Z59Qb9NXhefD21g8wnx4ZNmTbZIyqc+xfOz/Q33uVdOb/VQ3EVsDa8cac= X-Gm-Message-State: AOJu0YxtcFWRSqfRx7Psw9gWuSECtxxLlWCCIvkbDh5eD5WXFMVoMiul DNgMmpOgOAurk31k55Mzv/PcGCFCoWGxjPgvYabCgcJBY6L+9bVxNv+5UbQfq6LuRKXsi5tHvEB mIu26AeLOenubUA== X-Google-Smtp-Source: AGHT+IGUNVwH6Vn5KU9h3xgJ3juWehgll1GRUIrL/52jY9NzlwNFR0T9bAXNZP4TZgr6puPAMVlsBtbBaZPruJU= X-Received: from saravanak.san.corp.google.com ([2620:15c:2d:3:96d3:321a:67f3:5322]) (user=saravanak job=sendgmr) by 2002:a05:690c:6e09:b0:615:33de:61d5 with SMTP id jb9-20020a05690c6e0900b0061533de61d5mr2900141ywb.1.1712618003548; Mon, 08 Apr 2024 16:13:23 -0700 (PDT) Date: Mon, 8 Apr 2024 16:13:08 -0700 In-Reply-To: <20240408231310.325451-1-saravanak@google.com> Message-Id: <20240408231310.325451-2-saravanak@google.com> Mime-Version: 1.0 References: <20240408231310.325451-1-saravanak@google.com> X-Mailer: git-send-email 2.44.0.478.gd926399ef9-goog Subject: [RFC PATCH v1 1/2] Revert "treewide: Fix probing of devices in DT overlays" From: Saravana Kannan To: Herve Codina , Geert Uytterhoeven Cc: Saravana Kannan , Rob Herring , kernel-team@android.com, linux-kernel@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-i2c@vger.kernel.org, devicetree@vger.kernel.org, linux-spi@vger.kernel.org, linux-acpi@vger.kernel.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240408_161325_254942_4DE6E40B X-CRM114-Status: GOOD ( 11.73 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This reverts commit 1a50d9403fb90cbe4dea0ec9fd0351d2ecbd8924. --- drivers/bus/imx-weim.c | 6 ------ drivers/i2c/i2c-core-of.c | 5 ----- drivers/of/dynamic.c | 1 - drivers/of/platform.c | 5 ----- drivers/spi/spi.c | 5 ----- 5 files changed, 22 deletions(-) diff --git a/drivers/bus/imx-weim.c b/drivers/bus/imx-weim.c index 837bf9d51c6e..caaf887e0ccc 100644 --- a/drivers/bus/imx-weim.c +++ b/drivers/bus/imx-weim.c @@ -331,12 +331,6 @@ 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)) { - /* - * Clear the flag before adding the device so that - * fw_devlink doesn't skip adding consumers to this - * device. - */ - 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 a6c407d36800..a250921bbce0 100644 --- a/drivers/i2c/i2c-core-of.c +++ b/drivers/i2c/i2c-core-of.c @@ -178,11 +178,6 @@ static int of_i2c_notify(struct notifier_block *nb, unsigned long action, return NOTIFY_OK; } - /* - * Clear the flag before adding the device so that fw_devlink - * doesn't skip adding consumers to this device. - */ - 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 4d57a4e34105..19a1a38554f2 100644 --- a/drivers/of/dynamic.c +++ b/drivers/of/dynamic.c @@ -224,7 +224,6 @@ 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; raw_spin_unlock_irqrestore(&devtree_lock, flags); diff --git a/drivers/of/platform.c b/drivers/of/platform.c index 389d4ea6bfc1..efd861fa254f 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -743,11 +743,6 @@ static int of_platform_notify(struct notifier_block *nb, if (of_node_check_flag(rd->dn, OF_POPULATED)) return NOTIFY_OK; - /* - * Clear the flag before adding the device so that fw_devlink - * doesn't skip adding consumers to this device. - */ - 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 ff75838c1b5d..17cd417f7681 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -4761,11 +4761,6 @@ static int of_spi_notify(struct notifier_block *nb, unsigned long action, return NOTIFY_OK; } - /* - * Clear the flag before adding the device so that fw_devlink - * doesn't skip adding consumers to this device. - */ - rd->dn->fwnode.flags &= ~FWNODE_FLAG_NOT_DEVICE; spi = of_register_spi_device(ctlr, rd->dn); put_device(&ctlr->dev); From patchwork Mon Apr 8 23:13:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saravana Kannan X-Patchwork-Id: 13621658 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 01147CD1292 for ; Mon, 8 Apr 2024 23:13:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:References: Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=ITzKRFIJnvf9AIGgCG7bdiQ1yc7iAsswb8dw2eJj02Y=; b=UKH1T0E8YmZPLFZBJpKck8MwqG EvDoZDnYXY0TRTvF9bhfaV8ZXOd7lJw6GZ++ZJJ/yArbJnXSsFCPk8gS7DSDCS5NZG1xexDnSxx2u HW1WqQufRAHARXg629ztvq4BH1gPHm+TI1EzyWDa6t3Fr4KYO4M982UFHBlg3VMSkKMPT3pDrF5br AyDMOQR8csCudFqk7Dmswv22mrQuEIJfNhOz+O+o8QWZKTNGeNBo1kJuTy78YtEkwVB4esKtrAwH+ wAKQWkm+XeeIpW6Hvftx1cJPdrFq981s4WG78TX2q0mVz3+XzUVfh2w/PEQHISDN/RCCnuLlN0Cr9 lo8pDU7A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rtyBE-0000000H7Ad-1dOt; Mon, 08 Apr 2024 23:13:36 +0000 Received: from mail-yw1-x1149.google.com ([2607:f8b0:4864:20::1149]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rtyBB-0000000H77u-2Xjv for linux-arm-kernel@lists.infradead.org; Mon, 08 Apr 2024 23:13:35 +0000 Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-61517841a2eso85634667b3.2 for ; Mon, 08 Apr 2024 16:13:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1712618006; x=1713222806; darn=lists.infradead.org; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=nczmkQOw9DMhXXSsKHtJl6R+5z/iUhkTreCA2OOkZws=; b=RJIA2KWrCb6RUxJl5wqdbS9C5XX0Lhc1R56ua9qJNqJYB7FTHiYCWK52gDKJRyXiGR uKW6n4eqpLnM26Rh2HASmzpkZZB0y+8qjDUaWIt5MbsWjiFikhRWpQI7CeW1p997nBBq ffUlUcB12wfBlm9mferYmjsOgeoGpLki2LjFjL48U0Sq4O1E6bFembjbLGT/7HE4Vyi/ UDpcUANvmWn74J0ra3yzERytg5eoE76iSjdTn0CaF3DJjetqR5cdXWEHBeYS18Y4y/wE uaM9Obbhsth2hXyB+UprszVsr8XzRJ26OzJuim3qiIsV4k+K7dkmWag99OWOylK+/gkJ z34g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712618006; x=1713222806; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=nczmkQOw9DMhXXSsKHtJl6R+5z/iUhkTreCA2OOkZws=; b=oiEA/64LiU9H8kXWZoaTO3nnf6C1S+xh38Xa3ra/Fd4Tn3czargXoy0uVHAdNURp9u xMwfUYUIhIPXyggpHH6QHPtn2GxickeZYtl0iT1sMPMi61phnMS+s6M3TsDz3panYOk3 YLx5CvEpgacmC2z8vqbZeWcRFO8oTZu/iFh+uYXRmXzej3Sb5o6e47xnUd+n65WiSLls lLtr0OJCFPb5O+iLlCzgjKL2F7aiVtf9qapuToKTP8PBvIMlI5AesU6mOWHzJnApMzHX ePSCfSW/N4gxPqAFqs5+RcsKp46b65Pj2+5wlB+p4jGKoabamq8RHZMYLtYHsQq8PnrM yWvg== X-Forwarded-Encrypted: i=1; AJvYcCXkYnv3X714J1tHbyPWwtmfBbSSqtrkxcj/Pr/Q0v8+WMqFG/rhP7X2HeXrp/838sLIk2fJz8xH61YGB7WOW7nxMRFA+jLTm12ezjaHIE+peIXK5bg= X-Gm-Message-State: AOJu0YxkU7LIT589amrlKi3lSECSE3JnT8R48iGc28/Gi5GyvVuTGy4D iIKgw/EeVY+LUz+vS85ZqXPev1d8pPrTAOegr4wmN+nfPncUZnqPXjhbvLZpm4bVDW7214+mVJk Le8/jH+Vvfk1hWg== X-Google-Smtp-Source: AGHT+IHInv1s683PD0VpXFGdyKVT7quDre0k4j4QPZmziEdXPq9Eij+lZ0mHQQ58tOImSwsWuy4cFSS2rHxW/D0= X-Received: from saravanak.san.corp.google.com ([2620:15c:2d:3:96d3:321a:67f3:5322]) (user=saravanak job=sendgmr) by 2002:a25:7456:0:b0:dc7:5c0d:f177 with SMTP id p83-20020a257456000000b00dc75c0df177mr3025061ybc.6.1712618006311; Mon, 08 Apr 2024 16:13:26 -0700 (PDT) Date: Mon, 8 Apr 2024 16:13:09 -0700 In-Reply-To: <20240408231310.325451-1-saravanak@google.com> Message-Id: <20240408231310.325451-3-saravanak@google.com> Mime-Version: 1.0 References: <20240408231310.325451-1-saravanak@google.com> X-Mailer: git-send-email 2.44.0.478.gd926399ef9-goog Subject: [RFC PATCH v1 2/2] of: dynamic: Fix probing of overlay devices From: Saravana Kannan To: Herve Codina , Geert Uytterhoeven Cc: Saravana Kannan , Rob Herring , kernel-team@android.com, linux-kernel@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-i2c@vger.kernel.org, devicetree@vger.kernel.org, linux-spi@vger.kernel.org, linux-acpi@vger.kernel.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240408_161333_680427_FB45C931 X-CRM114-Status: GOOD ( 11.61 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Get fw_devlink to work well with overlay devices. Signed-off-by: Saravana Kannan --- drivers/base/core.c | 10 ++++++++++ drivers/of/dynamic.c | 8 ++++++++ include/linux/fwnode.h | 2 ++ 3 files changed, 20 insertions(+) diff --git a/drivers/base/core.c b/drivers/base/core.c index 5f4e03336e68..d856f9c5d601 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -237,6 +237,16 @@ static void __fw_devlink_pickup_dangling_consumers(struct fwnode_handle *fwnode, __fw_devlink_pickup_dangling_consumers(child, new_sup); } + +void fw_devlink_pickup_dangling_consumers(struct fwnode_handle *child, + struct fwnode_handle *parent) +{ + mutex_lock(&fwnode_link_lock); + __fw_devlink_pickup_dangling_consumers(child, parent); + __fw_devlink_link_to_consumers(parent->dev); + mutex_unlock(&fwnode_link_lock); +} + static DEFINE_MUTEX(device_links_lock); DEFINE_STATIC_SRCU(device_links_srcu); diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c index 19a1a38554f2..0a936f46820e 100644 --- a/drivers/of/dynamic.c +++ b/drivers/of/dynamic.c @@ -237,6 +237,7 @@ static void __of_attach_node(struct device_node *np) int of_attach_node(struct device_node *np) { struct of_reconfig_data rd; + struct fwnode_handle *fwnode, *parent; memset(&rd, 0, sizeof(rd)); rd.dn = np; @@ -246,6 +247,13 @@ int of_attach_node(struct device_node *np) mutex_unlock(&of_mutex); of_reconfig_notify(OF_RECONFIG_ATTACH_NODE, &rd); + fwnode = of_fwnode_handle(np); + fwnode_for_each_parent_node(fwnode, parent) + if (parent->dev) { + fw_devlink_pickup_dangling_consumers(fwnode, parent); + fwnode_handle_put(parent); + break; + } return 0; } diff --git a/include/linux/fwnode.h b/include/linux/fwnode.h index 0d79070c5a70..4b3f697a90e8 100644 --- a/include/linux/fwnode.h +++ b/include/linux/fwnode.h @@ -220,6 +220,8 @@ int fwnode_link_add(struct fwnode_handle *con, struct fwnode_handle *sup, u8 flags); void fwnode_links_purge(struct fwnode_handle *fwnode); void fw_devlink_purge_absent_suppliers(struct fwnode_handle *fwnode); +void fw_devlink_pickup_dangling_consumers(struct fwnode_handle *child, + struct fwnode_handle *parent); bool fw_devlink_is_strict(void); #endif