From patchwork Tue Apr 9 05:37:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saravana Kannan X-Patchwork-Id: 13621846 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 34832CD1284 for ; Tue, 9 Apr 2024 05:37:35 +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=P26V7eD93upPPaTHMgC1y6p7/A fKiofHpJbIbzKq35aW4chzCuca2DhvPVZxIpIPv3TH/lZ9v9+srCFomvW+uCbZWDa8vO19+ZAUSPe T2Yvp8yHGKpRJRuXqSJMV59uBqVWG4WsZ5axadHZ6davYJ3N0lfzcUoo0ysjP63LTutI0og4Mjazj 10kjS80s8Lv8PLWXNikkMkfXI5xG3RF6LoI1Fzchu3SPoluIWsfbehpeFI+DuamEdRF9QmezvrrME 6ngaASdxM2+Gz5wTj5YPL1B1pPQ+zh7TNni3Z5CMUapSLYfYND8vIXyopT4ryC8T+P9ji8PkdSFS6 weIqyRfw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1ru4Ad-00000000RY5-2jeD; Tue, 09 Apr 2024 05:37:23 +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 1ru4Aa-00000000RVL-0XPr for linux-arm-kernel@lists.infradead.org; Tue, 09 Apr 2024 05:37:21 +0000 Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-61575fc6d1cso81966627b3.1 for ; Mon, 08 Apr 2024 22:37:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1712641034; x=1713245834; 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=e0JkWaTghLC5xxCNzduq/n3HgytWErHvgTMdl/bH8d57kr4hMVu5+5X2cG8jafunv5 y30pw5Es00GqP2ztXCanbDcMRRmt9AERp2JJIA3dfqRFSqZYJt1ZI5UQCThFBmwj2XS+ qyoCMJclN6os39poWsCNDZ0Ulhu2KdVhKxY003efR00VDHcT7rKTArF2rQpCxa+889gU s1IlWZNILrRZwV8uVMdf8soufY+VukevyIzNUOWkPd7Qwa6FwpVQdXluUGCRKMWKsiXW bXJa8/fNr2qb6EuijUrTsHrtFzOuYij7uZHxdFr7Cv8mPZbpseoHqDjqyfVAI/DU9owN dbaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712641034; x=1713245834; 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=C9FbB9C7vpXsGIUfTYmzqHnpa0RCe5yKV9EYfZqdSMhbg82mSyDU+fhe0JCVQ4YKhQ BTHzcdXkbdBH0kLANo3fYUas+FYXq4js8ph/93oxHvMYDpRzSMhcO8ew0+iB0q8gwRDA 3ki0q8yWK5fOl0Nj7zqU9VF1co8JLONgbzXs6t1+4OABpIN9cQqxs0WqQaPT8oJu4SL2 5p+m4eJDZGBncqMAfak2Ev8Jx2wcIMEF8TIkq3xOioinL596PRs5Nd1jgchGTOGqjHtB eJPhN67pSQ9s1dr9KMpomXiVC6JH04W4U03y4J6umGknOdzMf36mwARbbTJhgZozG1xm RzDQ== X-Forwarded-Encrypted: i=1; AJvYcCXvcbdWnr7opba+cPaTDrFAIsk0a7FHABsqKaVSb2MWNVlR0cmrYT0LXFTr2MpZQzvnEVs2C91Rr0VP0lV7aLo5SUNyCwOqEFm4Zvcabm4l6j4Yu+U= X-Gm-Message-State: AOJu0YzG8HEg8bvoAb26Oor5drAdAz9BY5wmCVaDBM3xkXJpF2O7TW2d uHIEH5VTvR+8cqGqc/abDjKywDFSDNiNFxHJ4oky4hVC7JP9DldUeIbZhA6GEi8DHa6b5qkfq5S 30jhincKebsF7hw== X-Google-Smtp-Source: AGHT+IFVWQRJuqt+RfUsHPn8GX0evGqrx/pn1nt0eRiDqqPwuJeYG8bIxyrI0zUOLfzh2v9qJA48jtkZ7a+SQoA= X-Received: from saravanak.san.corp.google.com ([2620:15c:2d:3:96d3:321a:67f3:5322]) (user=saravanak job=sendgmr) by 2002:a0d:d983:0:b0:615:dce:e3e with SMTP id b125-20020a0dd983000000b006150dce0e3emr2755710ywe.9.1712641034295; Mon, 08 Apr 2024 22:37:14 -0700 (PDT) Date: Mon, 8 Apr 2024 22:37:02 -0700 In-Reply-To: <20240409053704.428336-1-saravanak@google.com> Message-Id: <20240409053704.428336-2-saravanak@google.com> Mime-Version: 1.0 References: <20240409053704.428336-1-saravanak@google.com> X-Mailer: git-send-email 2.44.0.478.gd926399ef9-goog Subject: [RFC PATCH v2 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_223720_185780_A86C9F04 X-CRM114-Status: GOOD ( 11.83 ) 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 Tue Apr 9 05:37:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saravana Kannan X-Patchwork-Id: 13621845 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 30D16C67861 for ; Tue, 9 Apr 2024 05:37:32 +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=WwgyChjOKNBjNC2Z4n9xPJwD/Lu6/wYnXfztMwiXDgE=; b=Y9SYtoe6ABTGA6D5qeNU0KUp+f FsluN8KUcWpT+k1VRM8VdMNsEaCio1tj6ETRWub95iBm2JC28z/FqhFjiuTg9KJV8dALwLvR2sga6 mbv2YI/cpovo42ViFDXlFPpvYlppEi9cjYINvjKFDiIesXTVjwCAY9677/0a8ueEGPvNVD2Bml7Z3 yBLTjqvpJmZkoUndy7A1mJIlQizNjyRDTexhsDxwyLlbWPAmtrqhzRfBjCbbsDf1QfbMPa0oCQI0v tJClgDdq+v1HiyZoqJwJOqD68d57SsYjdPm9METF2fYyf1t1/o4tscpukcX6kPWZbbgQBlDAivG8j YEWWKWyg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1ru4Ac-00000000RXl-3CHl; Tue, 09 Apr 2024 05:37:22 +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 1ru4Aa-00000000RVd-0W26 for linux-arm-kernel@lists.infradead.org; Tue, 09 Apr 2024 05:37:21 +0000 Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-615110c3472so97587897b3.3 for ; Mon, 08 Apr 2024 22:37:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1712641037; x=1713245837; 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=P1+matSQcfLvW/X39T9zNDkLhGrOhW1miO9PFu3HhWQ=; b=XHQSzhPesvfgm5VvsYN2kPKYgXPUvWYfwsylNRhDAUysYycOowk1+y/dx0oZJkdRyK YyBxrLgi8fa1U2BDx8/DlRmJygPC07L9Xm6kFiPjgbRtqvQVTCYD1xvficbSy8eDBCun xgW1l/kOmdCbeHM6AM7tRZUUYseLEmcdOHqHoHVwA7ubxaLIvMDxpsRcYuIxnPpxnE8y L+PLd4tedREEki2vplj72Jy7PbPoT718EuPdOWjQrNOPBpL6RIH++OCqU3zq6NdATmlE 4uWIt5aRtxF78rwNFwemjNLGvWaB6vlQd2C4MLiErFJ5lbpRyYzxcoqyraChuErDUQ8c mldQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712641037; x=1713245837; 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=P1+matSQcfLvW/X39T9zNDkLhGrOhW1miO9PFu3HhWQ=; b=QTX99Z7EeKlUFXd9HTHsz6C48IKr/bW9VAj8a8rOpK+8blGeIl2MyWX4UwTer4li2j gSrApNcwLYKGvouml7PMvEPS+wYJWw3M4eSpEG6j7Zlcl39P6NYxK+3dUs1UddStQbBM BACYCW8PA/BifFC3MwtJz4zreaImQGCEkmwAcqO8CgrRm9q8USDaHB0McTO2sP+mfRZc eAu2FjY4hAh6sLZT8RI0W4fMs8D7S1g6UCP7F4/UwlxQ8KOoiMjgAJC9Ozze2GgXy7mC GraFnV72XUwxPuJCvZyC8VApkNPmLhPwW5SucnSm1pQ8xQCe2Xj6pbqsOPAnytB6UW+s pHrA== X-Forwarded-Encrypted: i=1; AJvYcCWDuymnE+pJPr3jNrLZvpJB410cFbHxqsmMDMTBvMGzbo04ymXG7y3Ah/mGiPixcT3GyAXlpEFqiyjuODKLE25lqTdGcVGkZuhc2QGBqG2LAn47iOk= X-Gm-Message-State: AOJu0YziXiEWs/n+8h14Ap1PCNCPNqKSVT88Iy54A/agS+yWcKUAbNwb DoyFZxan9+mZGh9K9S/iWoErUyeW26TuXAyGnkmL9AC/RV4GZWjglKJvPYfvi2tbzZKBy5O2xU+ Yj0CaIBO3pd1ibQ== X-Google-Smtp-Source: AGHT+IHRQA3n5GfF0BAtqxsFhNOUIMEXcJ7+XDV5u7QRPNR+Gdp77qx8MK2Ot4WCnaL1W/7lk2smyonaDUUJGAU= X-Received: from saravanak.san.corp.google.com ([2620:15c:2d:3:96d3:321a:67f3:5322]) (user=saravanak job=sendgmr) by 2002:a05:6902:708:b0:dd9:1db5:8348 with SMTP id k8-20020a056902070800b00dd91db58348mr3605580ybt.8.1712641037031; Mon, 08 Apr 2024 22:37:17 -0700 (PDT) Date: Mon, 8 Apr 2024 22:37:03 -0700 In-Reply-To: <20240409053704.428336-1-saravanak@google.com> Message-Id: <20240409053704.428336-3-saravanak@google.com> Mime-Version: 1.0 References: <20240409053704.428336-1-saravanak@google.com> X-Mailer: git-send-email 2.44.0.478.gd926399ef9-goog Subject: [RFC PATCH v2 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_223720_206245_8A001C13 X-CRM114-Status: GOOD ( 11.35 ) 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 | 23 +++++++++++++++++++++++ drivers/of/dynamic.c | 1 + include/linux/fwnode.h | 1 + 3 files changed, 25 insertions(+) diff --git a/drivers/base/core.c b/drivers/base/core.c index 5f4e03336e68..5ce33dbd7560 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -237,6 +237,29 @@ static void __fw_devlink_pickup_dangling_consumers(struct fwnode_handle *fwnode, __fw_devlink_pickup_dangling_consumers(child, new_sup); } + +void fw_devlink_fixup_new_fwnode(struct fwnode_handle *new_fwnode) +{ + struct fwnode_handle *parent; + + if (new_fwnode->dev && new_fwnode->dev->bus) + return; + + fwnode_for_each_parent_node(new_fwnode, parent) + if (parent->dev && parent->dev->bus) + break; + + if (!parent) + return; + + mutex_lock(&fwnode_link_lock); + __fw_devlink_pickup_dangling_consumers(new_fwnode, parent); + __fw_devlink_link_to_consumers(parent->dev); + mutex_unlock(&fwnode_link_lock); + + fwnode_handle_put(parent); +} + 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..a2ad79ea9a06 100644 --- a/drivers/of/dynamic.c +++ b/drivers/of/dynamic.c @@ -581,6 +581,7 @@ static int __of_changeset_entry_notify(struct of_changeset_entry *ce, memset(&rd, 0, sizeof(rd)); rd.dn = ce->np; ret = of_reconfig_notify(ce->action, &rd); + fw_devlink_fixup_new_fwnode(of_fwnode_handle(ce->np)); break; case OF_RECONFIG_ADD_PROPERTY: case OF_RECONFIG_REMOVE_PROPERTY: diff --git a/include/linux/fwnode.h b/include/linux/fwnode.h index 0d79070c5a70..230aeccef6f3 100644 --- a/include/linux/fwnode.h +++ b/include/linux/fwnode.h @@ -220,6 +220,7 @@ 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_fixup_new_fwnode(struct fwnode_handle *new_fwnode); bool fw_devlink_is_strict(void); #endif