From: Bartosz Golaszewski <brgl@bgdev.pl> To: Marcel Holtmann <marcel@holtmann.org>, Luiz Augusto von Dentz <luiz.dentz@gmail.com>, "David S . Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>, Rob Herring <robh@kernel.org>, Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, Conor Dooley <conor+dt@kernel.org>, Kalle Valo <kvalo@kernel.org>, Bjorn Andersson <andersson@kernel.org>, Konrad Dybcio <konrad.dybcio@linaro.org>, Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org>, Bjorn Helgaas <bhelgaas@google.com>, Bartosz Golaszewski <brgl@bgdev.pl>, Saravana Kannan <saravanak@google.com>, Geert Uytterhoeven <geert+renesas@glider.be>, Arnd Bergmann <arnd@arndb.de>, Neil Armstrong <neil.armstrong@linaro.org>, Marek Szyprowski <m.szyprowski@samsung.com>, Alex Elder <elder@linaro.org>, Srini Kandagatla <srinivas.kandagatla@linaro.org>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Abel Vesa <abel.vesa@linaro.org>, Manivannan Sadhasivam <mani@kernel.org>, Lukas Wunner <lukas@wunner.de>, Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Cc: linux-bluetooth@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, linux-pm@vger.kernel.org, Bartosz Golaszewski <bartosz.golaszewski@linaro.org> Subject: [PATCH v5 11/18] PCI/pwrctl: reuse the OF node for power controlled devices Date: Fri, 16 Feb 2024 21:32:08 +0100 [thread overview] Message-ID: <20240216203215.40870-12-brgl@bgdev.pl> (raw) In-Reply-To: <20240216203215.40870-1-brgl@bgdev.pl> From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> With PCI power control we deal with two struct device objects bound to two different drivers but consuming the same OF node. We must not bind the pinctrl twice. To that end: before setting the OF node of the newly instantiated PCI device, check if a platform device consuming the same OF node doesn't already exist on the platform bus and - if so - mark the PCI device as reusing the OF node. Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> --- drivers/pci/of.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/pci/of.c b/drivers/pci/of.c index 51e3dd0ea5ab..b908fe1ae951 100644 --- a/drivers/pci/of.c +++ b/drivers/pci/of.c @@ -6,6 +6,7 @@ */ #define pr_fmt(fmt) "PCI: OF: " fmt +#include <linux/cleanup.h> #include <linux/irqdomain.h> #include <linux/kernel.h> #include <linux/pci.h> @@ -13,6 +14,7 @@ #include <linux/of_irq.h> #include <linux/of_address.h> #include <linux/of_pci.h> +#include <linux/platform_device.h> #include "pci.h" #ifdef CONFIG_PCI @@ -25,16 +27,20 @@ */ int pci_set_of_node(struct pci_dev *dev) { - struct device_node *node; - if (!dev->bus->dev.of_node) return 0; - node = of_pci_find_child_device(dev->bus->dev.of_node, dev->devfn); + struct device_node *node __free(device_node) = + of_pci_find_child_device(dev->bus->dev.of_node, dev->devfn); if (!node) return 0; - device_set_node(&dev->dev, of_fwnode_handle(node)); + struct device *pdev __free(put_device) = + bus_find_device_by_of_node(&platform_bus_type, node); + if (pdev) + dev->bus->dev.of_node_reused = true; + + device_set_node(&dev->dev, of_fwnode_handle(no_free_ptr(node))); return 0; } -- 2.40.1
WARNING: multiple messages have this Message-ID (diff)
From: Bartosz Golaszewski <brgl@bgdev.pl> To: Marcel Holtmann <marcel@holtmann.org>, Luiz Augusto von Dentz <luiz.dentz@gmail.com>, "David S . Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>, Rob Herring <robh@kernel.org>, Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, Conor Dooley <conor+dt@kernel.org>, Kalle Valo <kvalo@kernel.org>, Bjorn Andersson <andersson@kernel.org>, Konrad Dybcio <konrad.dybcio@linaro.org>, Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org>, Bjorn Helgaas <bhelgaas@google.com>, Bartosz Golaszewski <brgl@bgdev.pl>, Saravana Kannan <saravanak@google.com>, Geert Uytterhoeven <geert+renesas@glider.be>, Arnd Bergmann <arnd@arndb.de>, Neil Armstrong <neil.armstrong@linaro.org>, Marek Szyprowski <m.szyprowski@samsung.com>, Alex Elder <elder@linaro.org>, Srini Kandagatla <srinivas.kandagatla@linaro.org>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Abel Vesa <abel.vesa@linaro.org>, Manivannan Sadhasivam <mani@kernel.org>, Lukas Wunner <lukas@wunner.de>, Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Cc: linux-bluetooth@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, linux-pm@vger.kernel.org, Bartosz Golaszewski <bartosz.golaszewski@linaro.org> Subject: [PATCH v5 11/18] PCI/pwrctl: reuse the OF node for power controlled devices Date: Fri, 16 Feb 2024 21:32:08 +0100 [thread overview] Message-ID: <20240216203215.40870-12-brgl@bgdev.pl> (raw) In-Reply-To: <20240216203215.40870-1-brgl@bgdev.pl> From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> With PCI power control we deal with two struct device objects bound to two different drivers but consuming the same OF node. We must not bind the pinctrl twice. To that end: before setting the OF node of the newly instantiated PCI device, check if a platform device consuming the same OF node doesn't already exist on the platform bus and - if so - mark the PCI device as reusing the OF node. Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> --- drivers/pci/of.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/pci/of.c b/drivers/pci/of.c index 51e3dd0ea5ab..b908fe1ae951 100644 --- a/drivers/pci/of.c +++ b/drivers/pci/of.c @@ -6,6 +6,7 @@ */ #define pr_fmt(fmt) "PCI: OF: " fmt +#include <linux/cleanup.h> #include <linux/irqdomain.h> #include <linux/kernel.h> #include <linux/pci.h> @@ -13,6 +14,7 @@ #include <linux/of_irq.h> #include <linux/of_address.h> #include <linux/of_pci.h> +#include <linux/platform_device.h> #include "pci.h" #ifdef CONFIG_PCI @@ -25,16 +27,20 @@ */ int pci_set_of_node(struct pci_dev *dev) { - struct device_node *node; - if (!dev->bus->dev.of_node) return 0; - node = of_pci_find_child_device(dev->bus->dev.of_node, dev->devfn); + struct device_node *node __free(device_node) = + of_pci_find_child_device(dev->bus->dev.of_node, dev->devfn); if (!node) return 0; - device_set_node(&dev->dev, of_fwnode_handle(node)); + struct device *pdev __free(put_device) = + bus_find_device_by_of_node(&platform_bus_type, node); + if (pdev) + dev->bus->dev.of_node_reused = true; + + device_set_node(&dev->dev, of_fwnode_handle(no_free_ptr(node))); return 0; } -- 2.40.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2024-02-16 20:33 UTC|newest] Thread overview: 159+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-02-16 20:31 [PATCH v5 00/18] power: sequencing: implement the subsystem and add first users Bartosz Golaszewski 2024-02-16 20:31 ` Bartosz Golaszewski 2024-02-16 20:31 ` [PATCH v5 01/18] of: Add cleanup.h based auto release via __free(device_node) markings Bartosz Golaszewski 2024-02-16 20:31 ` Bartosz Golaszewski 2024-02-16 20:36 ` power: sequencing: implement the subsystem and add first users bluez.test.bot 2024-02-16 20:31 ` [PATCH v5 02/18] arm64: defconfig: enable ath12k as a module Bartosz Golaszewski 2024-02-16 20:31 ` Bartosz Golaszewski 2024-02-19 7:31 ` Krzysztof Kozlowski 2024-02-19 7:31 ` Krzysztof Kozlowski 2024-02-19 7:56 ` Bartosz Golaszewski 2024-02-19 7:56 ` Bartosz Golaszewski 2024-02-16 20:32 ` [PATCH v5 03/18] dt-bindings: regulator: describe the PMU module of the QCA6390 package Bartosz Golaszewski 2024-02-16 20:32 ` Bartosz Golaszewski 2024-02-17 15:48 ` Mark Brown 2024-02-17 15:48 ` Mark Brown 2024-02-17 18:32 ` Bartosz Golaszewski 2024-02-17 18:32 ` Bartosz Golaszewski 2024-02-17 20:43 ` Mark Brown 2024-02-17 20:43 ` Mark Brown 2024-02-19 7:32 ` Krzysztof Kozlowski 2024-02-19 7:32 ` Krzysztof Kozlowski 2024-02-19 12:53 ` Bartosz Golaszewski 2024-02-19 12:53 ` Bartosz Golaszewski 2024-02-19 21:23 ` Krzysztof Kozlowski 2024-02-19 21:23 ` Krzysztof Kozlowski 2024-02-19 7:34 ` Krzysztof Kozlowski 2024-02-19 7:34 ` Krzysztof Kozlowski 2024-02-16 20:32 ` [PATCH v5 04/18] dt-bindings: net: bluetooth: qualcomm: describe regulators for QCA6390 Bartosz Golaszewski 2024-02-16 20:32 ` Bartosz Golaszewski 2024-02-19 7:34 ` Krzysztof Kozlowski 2024-02-19 7:34 ` Krzysztof Kozlowski 2024-02-16 20:32 ` [PATCH v5 05/18] dt-bindings: new: wireless: qcom,ath11k: describe the ath11k on QCA6390 Bartosz Golaszewski 2024-02-16 20:32 ` Bartosz Golaszewski 2024-02-16 20:32 ` [PATCH v5 06/18] dt-bindings: new: wireless: describe the ath12k PCI module Bartosz Golaszewski 2024-02-16 20:32 ` Bartosz Golaszewski 2024-02-17 6:34 ` Kalle Valo 2024-02-17 6:34 ` Kalle Valo 2024-02-17 18:30 ` Bartosz Golaszewski 2024-02-17 18:30 ` Bartosz Golaszewski 2024-02-17 20:02 ` Jeff Johnson 2024-02-17 20:02 ` Jeff Johnson 2024-02-19 7:38 ` Krzysztof Kozlowski 2024-02-19 7:38 ` Krzysztof Kozlowski 2024-02-22 23:56 ` Rob Herring 2024-02-22 23:56 ` Rob Herring 2024-02-16 20:32 ` [PATCH v5 07/18] arm64: dts: qcom: sm8550-qrd: add the Wifi node Bartosz Golaszewski 2024-02-16 20:32 ` Bartosz Golaszewski 2024-02-16 20:32 ` [PATCH v5 08/18] arm64: dts: qcom: sm8650-qrd: " Bartosz Golaszewski 2024-02-16 20:32 ` Bartosz Golaszewski 2024-02-16 23:09 ` Dmitry Baryshkov 2024-02-16 23:09 ` Dmitry Baryshkov 2024-02-17 18:53 ` Bartosz Golaszewski 2024-02-17 18:53 ` Bartosz Golaszewski 2024-02-16 20:32 ` [PATCH v5 09/18] arm64: dts: qcom: qrb5165-rb5: model the PMU of the QCA6391 Bartosz Golaszewski 2024-02-16 20:32 ` Bartosz Golaszewski 2024-02-19 18:03 ` Mark Brown 2024-02-19 18:03 ` Mark Brown 2024-02-19 18:48 ` Bartosz Golaszewski 2024-02-19 18:48 ` Bartosz Golaszewski 2024-02-19 19:59 ` Mark Brown 2024-02-19 19:59 ` Mark Brown 2024-02-20 11:16 ` Bartosz Golaszewski 2024-02-20 11:16 ` Bartosz Golaszewski 2024-02-20 13:31 ` Mark Brown 2024-02-20 13:31 ` Mark Brown 2024-02-20 13:38 ` Bartosz Golaszewski 2024-02-20 13:38 ` Bartosz Golaszewski 2024-02-20 13:48 ` Mark Brown 2024-02-20 13:48 ` Mark Brown 2024-02-20 13:51 ` Bartosz Golaszewski 2024-02-20 13:51 ` Bartosz Golaszewski 2024-02-20 14:10 ` Mark Brown 2024-02-20 14:10 ` Mark Brown 2024-02-20 16:30 ` Dmitry Baryshkov 2024-02-20 16:30 ` Dmitry Baryshkov 2024-02-20 17:53 ` Bartosz Golaszewski 2024-02-20 17:53 ` Bartosz Golaszewski 2024-02-20 18:11 ` Dmitry Baryshkov 2024-02-20 18:11 ` Dmitry Baryshkov 2024-02-16 20:32 ` [PATCH v5 10/18] PCI: hold the rescan mutex when scanning for the first time Bartosz Golaszewski 2024-02-16 20:32 ` Bartosz Golaszewski 2024-02-16 20:32 ` Bartosz Golaszewski [this message] 2024-02-16 20:32 ` [PATCH v5 11/18] PCI/pwrctl: reuse the OF node for power controlled devices Bartosz Golaszewski 2024-02-16 20:32 ` [PATCH v5 12/18] PCI/pwrctl: create platform devices for child OF nodes of the port node Bartosz Golaszewski 2024-02-16 20:32 ` Bartosz Golaszewski 2024-02-16 20:32 ` [PATCH v5 13/18] PCI/pwrctl: add PCI power control core code Bartosz Golaszewski 2024-02-16 20:32 ` Bartosz Golaszewski 2024-02-16 20:32 ` [PATCH v5 14/18] PCI/pwrctl: add a power control driver for WCN7850 Bartosz Golaszewski 2024-02-16 20:32 ` Bartosz Golaszewski 2024-02-18 12:25 ` kernel test robot 2024-02-19 17:49 ` Mark Brown 2024-02-19 17:49 ` Mark Brown 2024-02-20 11:22 ` Bartosz Golaszewski 2024-02-20 11:22 ` Bartosz Golaszewski 2024-02-20 12:47 ` Mark Brown 2024-02-20 12:47 ` Mark Brown 2024-02-20 21:21 ` Konrad Dybcio 2024-02-20 21:21 ` Konrad Dybcio 2024-02-20 23:44 ` Mark Brown 2024-02-20 23:44 ` Mark Brown 2024-02-22 9:22 ` Bartosz Golaszewski 2024-02-22 9:22 ` Bartosz Golaszewski 2024-02-22 12:21 ` Mark Brown 2024-02-22 12:21 ` Mark Brown 2024-02-22 12:26 ` Bartosz Golaszewski 2024-02-22 12:26 ` Bartosz Golaszewski 2024-02-22 13:15 ` Mark Brown 2024-02-22 13:15 ` Mark Brown 2024-02-22 13:26 ` Bartosz Golaszewski 2024-02-22 13:26 ` Bartosz Golaszewski 2024-02-16 20:32 ` [PATCH v5 15/18] power: sequencing: implement the pwrseq core Bartosz Golaszewski 2024-02-16 20:32 ` Bartosz Golaszewski 2024-02-18 16:26 ` kernel test robot 2024-02-16 20:32 ` [PATCH v5 16/18] power: pwrseq: add a driver for the QCA6390 PMU module Bartosz Golaszewski 2024-02-16 20:32 ` Bartosz Golaszewski 2024-02-16 23:17 ` Dmitry Baryshkov 2024-02-16 23:17 ` Dmitry Baryshkov 2024-02-17 19:09 ` Bartosz Golaszewski 2024-02-17 19:09 ` Bartosz Golaszewski 2024-02-16 20:32 ` [PATCH v5 17/18] Bluetooth: qca: use the power sequencer for QCA6390 Bartosz Golaszewski 2024-02-16 20:32 ` Bartosz Golaszewski 2024-02-16 20:32 ` [PATCH v5 18/18] PCI/pwrctl: add a PCI power control driver for power sequenced devices Bartosz Golaszewski 2024-02-16 20:32 ` Bartosz Golaszewski 2024-02-18 12:53 ` [PATCH v5 00/18] power: sequencing: implement the subsystem and add first users Dmitry Baryshkov 2024-02-18 12:53 ` Dmitry Baryshkov 2024-02-19 8:14 ` Neil Armstrong 2024-02-19 8:14 ` Neil Armstrong 2024-02-19 9:22 ` Dmitry Baryshkov 2024-02-19 9:22 ` Dmitry Baryshkov 2024-02-19 9:42 ` neil.armstrong 2024-02-19 9:42 ` neil.armstrong 2024-02-19 10:26 ` Dmitry Baryshkov 2024-02-19 10:26 ` Dmitry Baryshkov 2024-02-19 12:23 ` Bartosz Golaszewski 2024-02-19 12:23 ` Bartosz Golaszewski 2024-02-19 12:33 ` Dmitry Baryshkov 2024-02-19 12:33 ` Dmitry Baryshkov 2024-02-19 17:18 ` neil.armstrong 2024-02-19 17:18 ` neil.armstrong 2024-02-19 22:21 ` Dmitry Baryshkov 2024-02-19 22:21 ` Dmitry Baryshkov 2024-02-22 11:00 ` Bartosz Golaszewski 2024-02-22 11:00 ` Bartosz Golaszewski 2024-02-22 11:26 ` Dmitry Baryshkov 2024-02-22 11:26 ` Dmitry Baryshkov 2024-02-22 12:27 ` Bartosz Golaszewski 2024-02-22 12:27 ` Bartosz Golaszewski 2024-02-22 12:47 ` Dmitry Baryshkov 2024-02-22 12:47 ` Dmitry Baryshkov 2024-02-22 12:50 ` Bartosz Golaszewski 2024-02-22 12:50 ` Bartosz Golaszewski 2024-02-22 13:46 ` neil.armstrong 2024-02-22 13:46 ` neil.armstrong 2024-02-24 8:52 ` Krzysztof Kozlowski 2024-02-24 8:52 ` Krzysztof Kozlowski 2024-02-19 8:16 ` Neil Armstrong 2024-02-19 8:16 ` Neil Armstrong 2024-03-05 12:50 ` Amit Pundir 2024-03-05 12:50 ` Amit Pundir
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20240216203215.40870-12-brgl@bgdev.pl \ --to=brgl@bgdev.pl \ --cc=abel.vesa@linaro.org \ --cc=andersson@kernel.org \ --cc=arnd@arndb.de \ --cc=bartosz.golaszewski@linaro.org \ --cc=bhelgaas@google.com \ --cc=broonie@kernel.org \ --cc=catalin.marinas@arm.com \ --cc=conor+dt@kernel.org \ --cc=davem@davemloft.net \ --cc=devicetree@vger.kernel.org \ --cc=dmitry.baryshkov@linaro.org \ --cc=edumazet@google.com \ --cc=elder@linaro.org \ --cc=geert+renesas@glider.be \ --cc=gregkh@linuxfoundation.org \ --cc=konrad.dybcio@linaro.org \ --cc=krzysztof.kozlowski+dt@linaro.org \ --cc=kuba@kernel.org \ --cc=kvalo@kernel.org \ --cc=lgirdwood@gmail.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-arm-msm@vger.kernel.org \ --cc=linux-bluetooth@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pci@vger.kernel.org \ --cc=linux-pm@vger.kernel.org \ --cc=linux-wireless@vger.kernel.org \ --cc=luiz.dentz@gmail.com \ --cc=lukas@wunner.de \ --cc=m.szyprowski@samsung.com \ --cc=mani@kernel.org \ --cc=marcel@holtmann.org \ --cc=neil.armstrong@linaro.org \ --cc=netdev@vger.kernel.org \ --cc=pabeni@redhat.com \ --cc=robh@kernel.org \ --cc=saravanak@google.com \ --cc=srinivas.kandagatla@linaro.org \ --cc=will@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.