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: 787297 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.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 6BB3B1474A3 for ; Mon, 8 Apr 2024 23:13:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712618006; cv=none; b=ECOKy8mGfqr66mxv7BXzY7cx9HvjifO+EEZzET52QQc8M41wDKXcvkeGHgugfwiwDouTx6va/oMqX8qj5y7Mvy75WniZIAqwmMCVJ/cp2zmmpVAuXmMpzaBGn7uESmBL4n09tjjRsaTFJA9k8ToWNAY6OERlwEyf8yQFUDqmkPs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712618006; c=relaxed/simple; bh=UeZnCjsFlLic2qaSZoKNxomMdFYr768316T0wajX8u0=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Cc:Content-Type; b=ibgRWHGXaKGD8PZBOLayrfruATwiHoPe4IWTTm4CcHgVuwYp6hY99fDCzA33t5+G50vuNLcp6sHrNZeOBC58I9yN62xHTbBbJNgQ87VSn5EBSKuKHxJg0+4wp55Yhg5VZvgUtpMXPE6XBTUQUPYR9OljD/VxSPPmu+oqkxzDSBQ= 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=wpoY5xr6; arc=none smtp.client-ip=209.85.128.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="wpoY5xr6" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-6150dcdf83fso96950667b3.2 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=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=eHsEtZCKaHOJpKzkmFo1QTaciQX5xyBED5wwHFx24rA=; b=wpoY5xr6Eg6EIdLC4rv+CVpg8IK9m7r88Lq7sUjAN7JGmqQnHUkl7ZJNKkRv0aMcTo G1q5jvy3BPbTzUPL45v80/RmMSq10sQsTLzvUIprfThwt2mCsYXpoIry45LtahYfHeXX lFA0jtqu0e1KKoKr/7FAEVJcTzC6JYjpZtwpD8ucViQ2BfIULB+VYBuFlbLMjflb6nbF u2jVj527tvgYe2csd7Pejh+P0yQ613LZM08jj0G9cyKAey127wcXoUnBQL/XZv8aqqk0 DBex7aHqv89gyXDNihMRO03qbY014eM2KPxKq9jWb5B35cu3LwnJ8+Sy+Z/QcS02pqlw G3xA== 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=e5WxA9Iar5xy1ACSNi619L3+FciyWcxMtMo8x9nefg4bWjeADiyGNwYQOZ7SJj4YUL YCbmeg0+C/fysb5yuHSzMUTngRqk6eQA1ZG1p36dniDvC2+eAE+w197nELg6FPbo36e8 HaIDWePgb5q8rVbFmbimZSMRgROIqmAXNPD7wlDXPWTnjW8/y9PWdukOTO2DPSA4/A0E xVZ4bis8GCOQonC6CDYZtmnllrpcwwlvC+VkujtYCtH6uDx46D7F5CFEmQGd0sVZbpLi QEBiupCoXnRbRc02m1pbmTv7ffdzTgzT8AAT+7AzrbkJCAQEo9I5Cnt6UtUYofOBZ8vz h2Aw== X-Forwarded-Encrypted: i=1; AJvYcCUm2sfV95tQatiataY/U1BMP56OL5rr/60qRaUYpjcLZD0OKu08TeE1XKO5R1WOhuGMyAahbSBNN2l/h/oQnfZNb8cVjRg1geeg X-Gm-Message-State: AOJu0YwJZlJgVQFhIXLAGYtbTeaFpxP1oJ6O7uE5ZELWqSTHkTUjkVGx NQ5cvcmvcyc7q8gnFVd75tPtOG+3QdFADiUGplxY5n5RJIMEJIVYkDBci+KTjpHLo0hCaFha5T3 jR9iEP/dSZecH+Q== 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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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 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: 787063 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) (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 2414D14A0A4 for ; Mon, 8 Apr 2024 23:13:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712618010; cv=none; b=OVSnwiBnGfwY4/NgHbI4sW+JACff/pq4Dg2SwHiSNzkaZ4lKwvcdAnbJM2nw5rxmWpfdT3pIzx8axMncPNtlaWwAzPbW8y66Ru0FBIwYXpIlJ8kl+KmUQr5ZDOurOyc5J9qW+1wxafxNEx2ShRNCOeQhuy2Bcadtzen2WAbKxkY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712618010; c=relaxed/simple; bh=e6fodSav/CbFNwfCAIa1o37PSzn8hWZNWnEmaNgYfBo=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Cc:Content-Type; b=bulxzj/8JsDFCrAUSAI4rUXiq5LXa8qJ/e0RK1kaNfiiDEAdSB/kZtx1uhouDc8Gw5IRvHDGQuUT2cSJX+Cw6hp64L5EDbEXhSIr1trffgomc+JpmSupxGpTaMng8/vJNM9uByLMoCc4rLf8Yq6cHmngTQVXlSFIFWDZs5ro6uU= 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=sUAgEt7m; arc=none smtp.client-ip=209.85.219.201 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="sUAgEt7m" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dc693399655so8809980276.1 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=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=nczmkQOw9DMhXXSsKHtJl6R+5z/iUhkTreCA2OOkZws=; b=sUAgEt7mLb0o5ektNf2E5DR8dq3u5+V3Q5mx+gZji6Su6subrmxJyK51ejVlZWfraG 0K2oZg2+S23+IreJbAWGOHf6/e8PKRlGjBkY6yIRl2oW2EWz01PcVLyoxfzTUJPafI/o mb/bx0Ez7ylrqVucsHD/d/0QZCRQFW2D1vIwKQPKfJ30qnmzPeDUaakIN32DAEh92ez4 kLnPAXfoLQdKbYFozTRuiAd0ZF+9x3hog14FiRVrRgojS8zfXCEPyXPKLuhqZwEUMa4t NOnNhdUiC80wEWEjWFjIaA/UwfR5MgU6DUfGVFc4V3/uPMRhwtQvRarxChohsPoCOB7b DJAg== 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=lPRDV9q8t+ZwV+HFyGTLXumkZ1/lMDw4u+ksC1zk7aBqQI1baFWPnhfbfvVTEsxzDJ ochtmlnMo76+oKhCDpt/KeixKVy/C3eOYgDX6IOxGijpiaAky9hyjgxchBkOhJ3FNNwP 2uiZp3eYDWHNDLnJS4Oy09FFuFYB4fPqRu56YSNHlTWTyW4eJ+Uy7QwDx58Yi3xwr5Zc nIeqLznUYL/F0Zhq7Es3x0bFw1x0htv7t6OzD07p84HHtIIsSLsh/oBpiWTdYtqQXHzF yecf2rm7foxf4Flrh0EikYjjGZZkqumvg5RCqiv/anh6XPw35wQ37JU9kw7QFFcBtAFu euPg== X-Forwarded-Encrypted: i=1; AJvYcCXyF8zMsrdXghWIsdnjYqVnFfZr0QSFa8yXrLuACDn62aH5aB/Ow8D1GG663PsDvMvynTR2xoN05bWRAeTuMVNYJVeN0D2eIBIZ X-Gm-Message-State: AOJu0Yyr8jTuMCCA860dOXrzZJKaZXfcGCmPCeTk8cMjn5qBXnPrD9w8 P7K5lNPgWBiHlUiBlK3apwPbBuLZXnf4tORL0ZhHuaOBJAYMtdo5WUCuWjEpmTDoMdL9U9mphHW io+H5E5WJI0lSaQ== 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> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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 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