From patchwork Thu Nov 30 16:56:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herve Codina X-Patchwork-Id: 172005 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp532103vqy; Thu, 30 Nov 2023 08:57:42 -0800 (PST) X-Google-Smtp-Source: AGHT+IGuQQ2Xfp+bLYQfUBpksmwZJdWVRB3b3lQQrpCtWM6xtuTW7o1Xy5uiRnKVlxAKVN7XCdIq X-Received: by 2002:a05:6a21:33a1:b0:18d:1790:56be with SMTP id yy33-20020a056a2133a100b0018d179056bemr5180980pzb.39.1701363461970; Thu, 30 Nov 2023 08:57:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701363461; cv=none; d=google.com; s=arc-20160816; b=kGRKaivCIu0mssGNzmN/Ls1ncdCqTpZuHaqJd8NsIfWYI8nZog0hdT6G3hEVOv6Ze1 AcObud7W24xs5mGX8zroIZBfxdLrJm4z81WDyAgOg2QpxZM6HHzY6zcYTAb86wATN4R0 cvzfmSquSuqdSOOYxF3QMhvyEptOZF6gZA/sbS61YX3Kd1zzSs83OnAx0l216E2idPc9 3L9hGFD3bEi+RJQFUt+xtLM46cHZeugzmxQzGcyzABnxatLCQik5aLYNJWuaaLMBlkP9 SMXKBPZo8G+YLIZ6+rbsOb0Xv1OgDyWqbeU42igpgRIdi/W95BMTSvOI3TAiPmPUmAQe x8oA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Jm60+J+CYJrK2sHEFWjb0jmzaPleL4egUI26kWWOyu8=; fh=CrkNyKleBTZ6J4lnQ7K9K2ER2ksD5GIR0Di6J9w1078=; b=S5P9Hyy5K3lk7easKMZouHqI4NMMD7EJuHPFRJQG6tWndlnbKsnFw78yUSQ0YSBnP1 2jlhExsUqMFk30qTdU5NuT5eNAoAqgDxAOcejLxLdI+nhfSGc0HMGrehHSgYd99WYIS2 RhV92+dtVSwg1jBRkgCPCYmDh7KcG9AOxAADYLP0YGmCpvuq/TJekxouYEsGXoJNR6ly k89Dq3+tQMc3yDQXQrjaSDQViU+5bQvG8W1bN9q+DqxLZBUpvVXqoHYoJXNcmwOsydrw 2u8gO5PZsWTRAHOHHvsofWY800cU7hWVGO7/1TMmdl8QROZuM2lcFu5MPmVtWm4FWFxd /J7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=Xtp5wPQs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id p13-20020a056a000b4d00b006be26c1be4bsi1657962pfo.73.2023.11.30.08.57.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 08:57:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=Xtp5wPQs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 790D08029123; Thu, 30 Nov 2023 08:57:39 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345884AbjK3Q5M (ORCPT + 99 others); Thu, 30 Nov 2023 11:57:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346033AbjK3Q5J (ORCPT ); Thu, 30 Nov 2023 11:57:09 -0500 Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::228]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D7D510DB; Thu, 30 Nov 2023 08:57:12 -0800 (PST) Received: by mail.gandi.net (Postfix) with ESMTPA id E63221BF205; Thu, 30 Nov 2023 16:57:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1701363431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Jm60+J+CYJrK2sHEFWjb0jmzaPleL4egUI26kWWOyu8=; b=Xtp5wPQsc+mP8/wUeDLsebCQBiTDsHw4ja3/eEJNJ1j1mn2TXWLHLBXxfCiDdcSdhDIjCA sjAwfuSRUGBOGdXzNxh9def0VLeg51y1mRh0EaUldZfEZO6C3SjN8uLlvh9DjUyNW5IZIN 1ukankeKO05V4VjC7D8fHCzVKcGqP/I52KVFDo81B1penFj1sjoXsBQLdpyyO7sNPzyy+9 yPxKBIZ/0qK5g1N0m7C2rWShMwm2+ctyiq3ysSs6illr7s+f8lRUiMvnc4WF30Hx2aaHgG DZaF3p7bkyIn76547h8TMvl17T+vKwRBq2wAyjD5olDJpa7U5oQTxLf+7jWrWA== From: Herve Codina To: Greg Kroah-Hartman , "Rafael J. Wysocki" , Bjorn Helgaas , Lizhi Hou , Rob Herring Cc: Max Zhen , Sonal Santan , Stefano Stabellini , Jonathan Cameron , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, Allan Nielsen , Horatiu Vultur , Steen Hegelund , Thomas Petazzoni , Herve Codina , stable@vger.kernel.org Subject: [PATCH v2 1/2] driver core: Introduce device_{add,remove}_of_node() Date: Thu, 30 Nov 2023 17:56:58 +0100 Message-ID: <20231130165700.685764-2-herve.codina@bootlin.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231130165700.685764-1-herve.codina@bootlin.com> References: <20231130165700.685764-1-herve.codina@bootlin.com> MIME-Version: 1.0 X-GND-Sasl: herve.codina@bootlin.com X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Thu, 30 Nov 2023 08:57:39 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784008893392915934 X-GMAIL-MSGID: 1784008893392915934 An of_node can be duplicated from an existing device using device_set_of_node_from_dev() or initialized using device_set_node() In both cases, these functions have to be called before the device_add() call in order to have the of_node link created in the device sysfs directory. Further more, these function cannot prevent any of_node and/or fwnode overwrites. When adding an of_node on an already present device, the following operations need to be done: - Attach the of_node if no of_node were already attached - Attach the of_node as a fwnode if no fwnode were already attached - Create the of_node sysfs link if needed This is the purpose of device_add_of_node(). device_remove_of_node() reverts the operations done by device_add_of_node(). Cc: stable@vger.kernel.org Signed-off-by: Herve Codina --- drivers/base/core.c | 74 ++++++++++++++++++++++++++++++++++++++++++ include/linux/device.h | 2 ++ 2 files changed, 76 insertions(+) diff --git a/drivers/base/core.c b/drivers/base/core.c index 2926f3b1f868..ac026187ac6a 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -5046,6 +5046,80 @@ void set_secondary_fwnode(struct device *dev, struct fwnode_handle *fwnode) } EXPORT_SYMBOL_GPL(set_secondary_fwnode); +/** + * device_remove_of_node - Remove an of_node from a device + * @dev: device whose device-tree node is being removed + */ +void device_remove_of_node(struct device *dev) +{ + dev = get_device(dev); + if (!dev) + return; + + if (!dev->of_node) + goto end; + + sysfs_remove_link(&dev->kobj, "of_node"); + + if (dev->fwnode == of_fwnode_handle(dev->of_node)) + dev->fwnode = NULL; + + of_node_put(dev->of_node); + dev->of_node = NULL; + +end: + put_device(dev); +} +EXPORT_SYMBOL_GPL(device_remove_of_node); + +/** + * device_add_of_node - Add an of_node to an existing device + * @dev: device whose device-tree node is being added + * @of_node: of_node to add + */ +void device_add_of_node(struct device *dev, struct device_node *of_node) +{ + int ret; + + if (!of_node) + return; + + dev = get_device(dev); + if (!dev) + return; + + if (dev->of_node) { + dev_warn(dev, "Replace node %pOF with %pOF\n", dev->of_node, of_node); + device_remove_of_node(dev); + } + + dev->of_node = of_node_get(of_node); + + if (!dev->fwnode) + dev->fwnode = of_fwnode_handle(of_node); + + if (!dev->p) { + /* + * device_add() was not previously called. + * The of_node link will be created when device_add() is called. + */ + goto end; + } + + /* + * device_add() was previously called and so the of_node link was not + * created by device_add_class_symlinks(). + * Create this link now. + */ + ret = sysfs_create_link(&dev->kobj, of_node_kobj(of_node), "of_node"); + if (ret) + dev_warn(dev, "Error %d creating of_node link\n", ret); + +end: + put_device(dev); +} +EXPORT_SYMBOL_GPL(device_add_of_node); + /** * device_set_of_node_from_dev - reuse device-tree node of another device * @dev: device whose device-tree node is being set diff --git a/include/linux/device.h b/include/linux/device.h index d7a72a8749ea..2b093e62907a 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -1128,6 +1128,8 @@ int device_offline(struct device *dev); int device_online(struct device *dev); void set_primary_fwnode(struct device *dev, struct fwnode_handle *fwnode); void set_secondary_fwnode(struct device *dev, struct fwnode_handle *fwnode); +void device_add_of_node(struct device *dev, struct device_node *of_node); +void device_remove_of_node(struct device *dev); void device_set_of_node_from_dev(struct device *dev, const struct device *dev2); void device_set_node(struct device *dev, struct fwnode_handle *fwnode); From patchwork Thu Nov 30 16:56:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herve Codina X-Patchwork-Id: 172004 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp532094vqy; Thu, 30 Nov 2023 08:57:40 -0800 (PST) X-Google-Smtp-Source: AGHT+IExBcUXLtclGoeT82FSr/r+j7UNuEijRzQo3KR9UKV4COw+OYtCRm7diVdJxeuz6uHZh3oF X-Received: by 2002:a05:6a00:21c4:b0:6cb:b7b7:c04c with SMTP id t4-20020a056a0021c400b006cbb7b7c04cmr22970029pfj.12.1701363460293; Thu, 30 Nov 2023 08:57:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701363460; cv=none; d=google.com; s=arc-20160816; b=qGaQ/OpDgbxFBhOrJf1uKHytlThxJElxpy+/ZJ7g+e8glrV4Ezw5ex1fvwJwnJ62dS 8DrfYLgWPoGrLMxHIQSmRY+EtHsW1vfRlRZbYWaB/UhDh2gmGUbVCe0Iw1E7H90oB267 BaMWzoJZuCkGOh2nl0gvezj3eGrLocDp97Vr0HCKuXoeVxVdRcCiqhCwLgL/qKeE4BCC uX43KRjcXNUgPXXf+HtB+jCabSdS5Z9NFQSLwa42h+x/JHbQY0tna8zLKJSWtfQORmtq 69g/z9Xkt0Ptb9xRbAi0MhFIyesntzOQdST7wRl3vpFDxEmgib/rgU2aArHDP2yGKA4i 3MJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=XjanQLiV96Fread002ZWRWE0O5XHgSgVvDb1R2qXIW8=; fh=CrkNyKleBTZ6J4lnQ7K9K2ER2ksD5GIR0Di6J9w1078=; b=qkt25kcqnxbflIXHf3pFYiU2/v4Z9yE+/T8kN7nm4dtv6n5tqbJeZgjdMPmHVSrndS K4WXAmGTwwxdKNmVCXsUcVvS3XRBm6OuPzlG4NxXSWuPMPb89QrFR8+KlaX76yx1XcUW acDXXGrFLCFPCdCPLAyz7BY1fnwuSKJgQ8C8DBMOapUXy6UOP1jSF2SeNtkrXqlDEuJy D+NkNgTyeev8IoLCIqpPny1eHCtybw1+t0qoOAtzRQpRuJayYIRXhyo8FRFv76cWon44 mxqY2AVYuKsBCgovfJ8MQeOjcxFVyMpkgQm283UMLlUlsIfpDlCFM0TubufwZUH/zVRp UB4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=R2xXMZck; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id p23-20020a056a000a1700b006cbe5e18d29si1663753pfh.36.2023.11.30.08.57.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 08:57:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=R2xXMZck; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id AE4908028B40; Thu, 30 Nov 2023 08:57:37 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346119AbjK3Q5P (ORCPT + 99 others); Thu, 30 Nov 2023 11:57:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46744 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346080AbjK3Q5J (ORCPT ); Thu, 30 Nov 2023 11:57:09 -0500 Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::228]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0460910D0; Thu, 30 Nov 2023 08:57:13 -0800 (PST) Received: by mail.gandi.net (Postfix) with ESMTPA id BB2681BF203; Thu, 30 Nov 2023 16:57:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1701363432; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XjanQLiV96Fread002ZWRWE0O5XHgSgVvDb1R2qXIW8=; b=R2xXMZckGm13RP0RGLzamc4Vgb6v7iI8z4vIwQ/qs0jNoSNLHzqHx3vBAFWijCIKXGoCkR L6jLjdFc4H6Ypp8lt0HC2umsPm0Wtp/2Dg6BX51kdMlpF7uwLCXm1tTJceX9HXlOFdwslW SSTu2wlzabNte5XhMNvUumhiEkxKoxVxq5vbS87LrpgMM/BBWUboYAfkiC2t3dZzr5VR2N uhTN4z5TIGNF1F+ruh4VjIQkmBtVJiE9yt1oVGQgWo63uHXekz3R9hFZ/3zTzAVW5zCXLa hltDZrB5FZRCau61Gfr4AZkomtvzn+FetxJhKnEtAO95BL7grV5qp7Qc+q6MXA== From: Herve Codina To: Greg Kroah-Hartman , "Rafael J. Wysocki" , Bjorn Helgaas , Lizhi Hou , Rob Herring Cc: Max Zhen , Sonal Santan , Stefano Stabellini , Jonathan Cameron , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, Allan Nielsen , Horatiu Vultur , Steen Hegelund , Thomas Petazzoni , Herve Codina , stable@vger.kernel.org Subject: [PATCH v2 2/2] PCI: of: Attach created of_node to existing device Date: Thu, 30 Nov 2023 17:56:59 +0100 Message-ID: <20231130165700.685764-3-herve.codina@bootlin.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231130165700.685764-1-herve.codina@bootlin.com> References: <20231130165700.685764-1-herve.codina@bootlin.com> MIME-Version: 1.0 X-GND-Sasl: herve.codina@bootlin.com X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Thu, 30 Nov 2023 08:57:37 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784008891868245974 X-GMAIL-MSGID: 1784008891868245974 The commit 407d1a51921e ("PCI: Create device tree node for bridge") creates of_node for PCI devices. During the insertion handling of these new DT nodes done by of_platform, new devices (struct device) are created. For each PCI devices a struct device is already present (created and handled by the PCI core). Having a second struct device to represent the exact same PCI device is not correct. On the of_node creation, tell the of_platform that there is no need to create a device for this node (OF_POPULATED flag), link this newly created of_node to the already present device and tell fwnode that the device attached to this of_node is ready (fwnode_dev_initialized()). With this fix, the of_node are available in the sysfs device tree: /sys/devices/platform/soc/d0070000.pcie/ + of_node -> .../devicetree/base/soc/pcie@d0070000 + pci0000:00 + 0000:00:00.0 + of_node -> .../devicetree/base/soc/pcie@d0070000/pci@0,0 + 0000:01:00.0 + of_node -> .../devicetree/base/soc/pcie@d0070000/pci@0,0/dev@0,0 On the of_node removal, revert the operations. Fixes: 407d1a51921e ("PCI: Create device tree node for bridge") Cc: stable@vger.kernel.org Signed-off-by: Herve Codina --- drivers/pci/of.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/pci/of.c b/drivers/pci/of.c index 51e3dd0ea5ab..5afd2731e876 100644 --- a/drivers/pci/of.c +++ b/drivers/pci/of.c @@ -615,7 +615,8 @@ void of_pci_remove_node(struct pci_dev *pdev) np = pci_device_to_OF_node(pdev); if (!np || !of_node_check_flag(np, OF_DYNAMIC)) return; - pdev->dev.of_node = NULL; + + device_remove_of_node(&pdev->dev); of_changeset_revert(np->data); of_changeset_destroy(np->data); @@ -668,12 +669,22 @@ void of_pci_make_dev_node(struct pci_dev *pdev) if (ret) goto out_free_node; + /* + * This of_node will be added to an existing device. + * Avoid any device creation and use the existing device + */ + of_node_set_flag(np, OF_POPULATED); + np->fwnode.dev = &pdev->dev; + fwnode_dev_initialized(&np->fwnode, true); + ret = of_changeset_apply(cset); if (ret) goto out_free_node; np->data = cset; - pdev->dev.of_node = np; + + /* Add the of_node to the existing device */ + device_add_of_node(&pdev->dev, np); kfree(name); return;