From patchwork Thu Apr 11 23:56:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saravana Kannan X-Patchwork-Id: 13626650 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 0A23AC4345F for ; Thu, 11 Apr 2024 23:56:47 +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=Vpe98D95NBLSk0ES2rgYEE+ULHIc/ihijLJvYghlPq4=; b=4zrz191ZSXMzVicB9ueDz3+AsK Ub76LqUzCo3tI+Fjss305zVWmgj56vwGW+aOpYHJs4awgQc0EyXpWSr3PK4u+05uBDTB5NC1GkJcN W6mXvj7qW39PDedCmtIx0gbjz77Vg3fgODOf2GDclFD+MseBmklYE28zVmUcdFkGw4NQ9rPFJT3Ka A0AieOFqXbcLf2HcZO5iE2uo3FlqrhP5iSk5n6Hb05nQp9wCaIOxDBWq2ad6KQUZ+Nvd6q3Thb0UJ zcVxTHDzL5PoWG4u+Hwm+k5PPolQ+NIpCmqqwiBUoigKc+Gb2lMVf/fMkrVM+koWGrcrJ5KxZczjd GdNgWlKA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rv4HT-0000000EYRp-0eo1; Thu, 11 Apr 2024 23:56:35 +0000 Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rv4HQ-0000000EYPJ-1lsr for linux-arm-kernel@lists.infradead.org; Thu, 11 Apr 2024 23:56:33 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-dd0ae66422fso860652276.0 for ; Thu, 11 Apr 2024 16:56:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1712879790; x=1713484590; 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=jT0tMCUG5C45vynKdJTKsAOSulSDMwPl00tKOsyCLZI=; b=LCjd7AMo/wl2E8iPM1hahnDiA7sKFtgqs8n0b6RoSpNi4BI8yxU4fOypAgkQ3RcKEV LwtehWMiYlrGv6i+YW/4EyI3Q2mK9aEZpj/jKZ5n9csHIxTN0HVLVI2VOV5OGKy1U8La PSFhUHYMQRkg5YAF4Xep7PriXTmrdDFppS185AemM6tQEcOEPcQtOlR3kCxtnNJgHo1w AmzGShefVczKjNpbUamQ4xZo4T57NIuvtW7+2dXG3ev4UAc+HO4q+NvNTOmlGScpYHHV 5Ff+MnIjV3W3Ld9vzqq04qGZjwJrhYNiUWHmKYpqHeHKS3tgJn77u7GICejGha3anFQ3 3ghQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712879790; x=1713484590; 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=jT0tMCUG5C45vynKdJTKsAOSulSDMwPl00tKOsyCLZI=; b=WbyNCf8hafhHeGQUcB/RemGrDCTo4L4aNUtJtmEbEu1f/L+AvL6TGEbco+AWzE9sQo VYCj7CRUwoIor8KBm7zBl5aSfOxjFPifi13lsKMWjcu9bdLZn2wMBiSTOiX3fhLRsdY+ f2iCRZ3jpmjcLDXKMS6kVWjlDeXmPGOSlaU/Wd7fq9YrAjtL64XwzkBtyi9oOTg97Gdr s8LY+Ee2lk1az0tc0RTDGPr0o4AAhjymaNIOcHedyEskYMs3xKq2Txeukk1y9MasZUVc Gt7iv7M0yC6flKw0cuFGIkEBzVEAWcWqD79ujUXjCF3KW+9AYVFe5ZBvt4pnC/24GFGk OlAA== X-Forwarded-Encrypted: i=1; AJvYcCVZdKaTp2I7UamUWYPqCnuaXiBc4CYcdgo/MAb/67/J0fyyuklB/pGom1vfdyVsC0FbJbivsafDRcfRtlhluw38gEqzFalOBupyBK+250tQ70EAPk0= X-Gm-Message-State: AOJu0YyldQKsQOWLuSpMtKmHVevBA0exEKJBhJ/oXgy/2HkGBJlom1wl C2zycMbhEHwyWRfq7xWCnUtM2eHbFxo9gyDG2UwIPKvoJH/fOl7sjp96Qs4yoOhaDyswWCkH3Xu GMi41zCATvszocQ== X-Google-Smtp-Source: AGHT+IEvR1JaDEbMFFioYt0KHpMJr1gBv9IJB0hOdL9dLeYPT6CmjFeSm9ekim1dAEyyL80zGuQNzSbprufcUNI= X-Received: from saravanak.san.corp.google.com ([2620:15c:2d:3:a472:f40c:d4ba:c29]) (user=saravanak job=sendgmr) by 2002:a05:6902:708:b0:dbe:d0a9:2be3 with SMTP id k8-20020a056902070800b00dbed0a92be3mr404697ybt.3.1712879790017; Thu, 11 Apr 2024 16:56:30 -0700 (PDT) Date: Thu, 11 Apr 2024 16:56:21 -0700 In-Reply-To: <20240411235623.1260061-1-saravanak@google.com> Message-Id: <20240411235623.1260061-2-saravanak@google.com> Mime-Version: 1.0 References: <20240411235623.1260061-1-saravanak@google.com> X-Mailer: git-send-email 2.44.0.683.g7961c838ac-goog Subject: [PATCH v3 1/2] Revert "treewide: Fix probing of devices in DT overlays" From: Saravana Kannan To: Herve Codina , Greg Kroah-Hartman , "Rafael J. Wysocki" , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Wolfram Sang , Rob Herring , Saravana Kannan , Mark Brown , Len Brown , Andy Shevchenko , Daniel Scally , Heikki Krogerus , Sakari Ailus , Geert Uytterhoeven Cc: kernel-team@android.com, Wolfram Sang , 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-20240411_165632_488784_E4DFA52F X-CRM114-Status: GOOD ( 12.45 ) 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. While the commit fixed fw_devlink overlay handling for one case, it broke it for another case. So revert it and redo the fix in a separate patch. Fixes: 1a50d9403fb9 ("treewide: Fix probing of devices in DT overlays") Reported-by: Herve Codina Closes: https://lore.kernel.org/lkml/CAMuHMdXEnSD4rRJ-o90x4OprUacN_rJgyo8x6=9F9rZ+-KzjOg@mail.gmail.com/ Closes: https://lore.kernel.org/all/20240221095137.616d2aaa@bootlin.com/ Closes: https://lore.kernel.org/lkml/20240312151835.29ef62a0@bootlin.com/ Signed-off-by: Saravana Kannan --- 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);