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: 788544 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DE45E4DA05 for ; Thu, 11 Apr 2024 23:56:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712879792; cv=none; b=Hw5LDILOqLyTQjHTWb/rV5DnH1gSH5v8Y2iSNw93JrA1cVkvkf/fa6rZ9r1QfCDRdpVu4PzY1oz6dcIgZeuLjSx8f60p8pGhcsuGVJ/OlHde3LFH9uasu3BTG9cvxV31mM/Ojs04+GWdnWqutLv12tl1rEXIP+X+VvRNCdygrww= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712879792; c=relaxed/simple; bh=F1I74kxyGocGA+G2MnwZ3U1GGblglJxPUgcMkv2SMGU=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Cc:Content-Type; b=nF4NdsWw8hcx8a6fbscX1Q/PaCVsM8g35Pq0iBgWevh0hdITu6ZeqO5IlvNm9lDfQgNrs893Qjyvq8IiKann9HacPj4/5phTvFinTPnOrSoMFmZhqpryHtiwZAeqyBEwiYHJmx2RM4istbin7X8Q+HzRrY9c1nSDcX8ngyTbtPY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--saravanak.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=OtsgjEpt; arc=none smtp.client-ip=209.85.219.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--saravanak.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="OtsgjEpt" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dd933a044baso1734044276.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=vger.kernel.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=OtsgjEpte8fFldSLBzxFXK0P7yW3O0dMXz+gQV/m7XTTh+8Egz7a+zDIo0ySfrP1yN vpB95zHtQDXWf2OKc4U4l+6Bye6nQ65BkY4DMX7vrKnUNcjz9HjNbGIOtGuwvhy5507X zaFoVvgdQa+Hv9j6G3VE16/ES4FB/sIC0KFQmUsgHHoZxZIwioShCoLoGQrfr9AzG0tU gmQTNrJZAGhmP/0Fq/lX0FI++85awoPM9abY3rs59dpjv/FWSVATgblnnke6p/7a6GFZ +lFV4omOxCBWiWQUbbz5bFxXLV10XIgfvelwThivIKh+EbCV7CFNwqVFxmGBrH6UNugr I+3A== 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=taBxrvQxRXrzuWGYzybRfaFJ9Ve7/AR3bxDlug1ariW0AxMe33tRiLrjAyhYfccQJ0 ME3i/LU67S7Toovbdnr55vg0/mnx2AU233xise2GF27eAEZ4sl9MxVzuHYxwe9ClJ7zq AACPFjYHfwqlDdjcl6PsgMk5utFvx6tBUbnBvQxajhVlt0jo3zW5buBsSWfWk2gv5FQX gBRcAcRvfp83dNyPR0KLJAb39LqyKTwQ/Q1mSeIOJ4pmt7QGzRM3rMcS16KKpF6ThG9+ KtCUxzoMuQXlkDwfPER997BTmyfnsztbthzD7TVdsB7zaJvwPfpt9tdTbEbL5noYp3FR MLdA== X-Forwarded-Encrypted: i=1; AJvYcCWxHoEqZmmHcK3SZb8Ex6NUbbBycq7v67hhBCY9K9NEgpFRc9ds1FXu+ywwc48FaiSFZl8+pRnLrgBNozS/e3116u8YYYYvGv7f X-Gm-Message-State: AOJu0Yzp9LXnaTLE7sJnoeRVpapG5E47zv5ryLQ5U1bo7sB50I2GbY+0 l0ouTTpDg+QChEbLv8dnhh1TW7kuJ1a5tRrs5U79POoPgsN8iH5lQvqQqKJF9RMLI0uBfnNrGxr iRjMMirsbTyVvLw== 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> Precedence: bulk X-Mailing-List: linux-spi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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 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);