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: 13621848 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 3F5DD6A8AC for ; Tue, 9 Apr 2024 05:37:15 +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=1712641036; cv=none; b=bIO6UWy8Dorvv2HLN2EPQ8KOEpF6s+XIFLu9tNpMXxe71J+k6C5cesFM5uIEunjiDvb8LbQs9HukpC3qV4EpsGac/dY6M3yM2E1o6cY/eMq4mX1QFpbkL5le8lE4qmRKjdk2JTn2+fD2D3sZc+AaYTvRtyBrVNVxXY2vtnrPG84= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712641036; c=relaxed/simple; bh=UeZnCjsFlLic2qaSZoKNxomMdFYr768316T0wajX8u0=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Cc:Content-Type; b=YzYglEmW7ViNAzd65r8PQiEEZcn6cHlu44lygdVrfA1uxeYanqr0PLUw4F1bN6rvpSv+ZRFhoLV0HPaKIELTDmLKIBk7/PGqoBlHCPp5XX3RBtKgmg4YkRhULSiviQaziDnGQNpU+3BNx5ZOb/GvUDd17n1plAXVD0XHu6tCiX8= 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=sWtLPJcs; 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="sWtLPJcs" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-60cd62fa1f9so81252307b3.0 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=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=sWtLPJcsrRU+YOrqZK01sNtI9pW3V3U7bUI+SItreqz9yVw5Pwkie3jc9UNJSZKhh6 wnQ2nDy5HdaA1/wWziZ9iHOZHaIVT/DYAvjni4u9hjkpNQb8hDHiDUdYxOnI1bAlExt4 grwskoA12q+PVBqCs+s/DB+aX52N4MEbM2DP/XQvJS6VsgyykwYKvE5EiWBfo2MIu0p8 nWP+VZQoFheCXV0FWv3ShqMHRE4lWMutJIEQnZx7tniAsh3Uk2YI9pZmsa+v8sdqpR3Z gJd4mDscFaspsczU2XAEWsNPUBahaC8QSvH9ld/+mCuDCPddSc9I27NVAQcoPhW1LWTv 6bLw== 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=idLOiuBPtaztBilsCpVmsmrRaoPOGCO/xxyfBRQpzyltcH0c4qoVbL7MyL/S4uZZ7Q bmgRQoryQg2LxflMCndZxKFWQ2SDdWmc/71UAAngnlgl+jJv2U8b/p/FKAttcaLPIx8d LgLwWrA8ZEGJmEDd+6FH7zQz4S5p/zq8IWWnP0VCrvajfHM8ZlzGZ2+O1ND8JefVD2OB QBx+IJmYSkaDzVzwvzncxJsHIpQ6bNGEevipoKs6ZyZdBcuZTzEegw5bw0HMkqC+auni pq/szO39SQ00RRX+4xSs1qibl3UMf5r4OMM1DOFm6BSpHlFGh2gKjLltrSQF7N4C61Sf vLaA== X-Forwarded-Encrypted: i=1; AJvYcCX+GAT3Pv9SkkvUdRP7fXgVByz05ItcL/5HvPGXY93Smiro2HdoxFj+j9NrGAgn2PO2/83P5nIW7QW7Ut9qsAOETLmxPyw0sbJ/ X-Gm-Message-State: AOJu0YzS9WrzJbh5EdDBJn7TbxON5Vs0z5eMwiIaY3bPpgkb2fXwy6wc v2drkBsVRdOk6B96rV0XYYLD7VNdgMv4uFaGmXQxDtT675WivTqLyrdko68Zr4W/1cuhoMj+H7/ ACPqKUae2JgZHLA== 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> Precedence: bulk X-Mailing-List: linux-spi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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 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: 13621849 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 1FD7A138E for ; Tue, 9 Apr 2024 05:37:17 +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=1712641039; cv=none; b=UQAdQsT3F7F2ISzTgWN/+iHmNwAMUDc9QAl7R+X6rKFeVYrYNRMx1oQoZxbgUzcd7ZDVVnXo9vcqQD7XrXUc00AiuQqJv06f6VNS+ygXa4UbtnJrCDcbxrsre4cQpsgeLO0gz53fZ/vivfX1DYzc6SP8wOG2BZbjt3xGi+7k7O0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712641039; c=relaxed/simple; bh=wkLOEX+/YulnkTfcEPKaLhHUYq2+5Yqcely2pOg3H0A=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Cc:Content-Type; b=L52XePVBvUw7ke3ehDHJp4fNOw3XdzRpJrVdnVhLDY1p7CkhJph3eUeJC5Gl0c69RET1Tm5BrhfwDgEQ8jEMe/yBgrupx7h907cmzogNA73mSP9k7zzGxzr1mcXVG2cD+bhBLN552SliKW7ZKXkpgL2wONXg9NCbi36RBUiIxLY= 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=dAj8J9CR; 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="dAj8J9CR" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dc746178515so8219057276.2 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=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=P1+matSQcfLvW/X39T9zNDkLhGrOhW1miO9PFu3HhWQ=; b=dAj8J9CRK7jnTlePkfHw6DWCeHQlWXV0svgu9pc2HNeFt7WZ6VKpDvjYwRCU5G2r2p 3EotlFDLBLscOqLS5TueGxmmOEFrs1hGBxwjhCogwZkBA1z3c6c+mkUJEo8Vb5GlsYRL AfdDON5cRkwGo0pm+bUA2Vnm/nRNjS6jjvX2/bP/RUISSpo331pBNeUx/9GQwlrCHgNx DURGuyagqjetgdxNs6yJ2hakbcIbuDUIZSPeobMOAQ8l6r6vG06BS3UVvwF0Tf6Xis2r Ux0BotzHji1oCT2m7zUn00LzBYuODhbRn/IaQ6MXbk8ae0ZDrJBe/abk3Ncb3CP4g6R2 rqJg== 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=wfak+7FCCoOPDc2RuTVW/uyB5hy/Q7z8siEXZpVCxFlx1B/MhQKr8YPnuw4JLx5Dpv uLnrCJ1WSRSd63zNkDH+FYRO89MA1uKAdCqCeLrL2L5teVRyqJKbvEVmiFa7rpuQCdjE jzW5k2dtidEgV6h+4KIReZCW00FsEcnO5prtc/bCkW5fKWReJrf4oW8bY89ZDDcRwIlY W/h4FJNWR3xRhDtg90/d5TfyH8wLs2nbRS0nhlxvK+zDEkWiLSczNABGymyuWC1nt7La ffBmicWdI4SXRL7Eb+RSZfjK4OF0w0+Esan6Wu4/Dol35ieVlgxOYnC53NY5w0jCkzeb RqXw== X-Forwarded-Encrypted: i=1; AJvYcCVnw29fMVsGnfIhBfMg2d0Qx4vYV8nQwG3L+v/EyOpeBLYfqMRvHXnC2VEDN2ts9oP8EddHR3OXPRKxqcvKWm0xnchKcSixSbAL X-Gm-Message-State: AOJu0Yz7faclLB4vrp2MKf3iPkMQeEA9lh/O6Tiyv0AAbuMyYFZ+xuCl hrzy5KFys8uQ5cGdMu20rIN3tTX7IlLiqp7QDxQoYbVj21ODYr7EsGhw2bRR3Ef+IthUGdDNy8i arhqllsTWQQ5bqg== 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> Precedence: bulk X-Mailing-List: linux-spi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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 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