linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
To: mbrugger@suse.com, u-boot@lists.denx.de, bmeng.cn@gmail.com,
	marex@denx.de, linux-kernel@vger.kernel.org
Cc: sjg@chromium.org, m.szyprowski@samsung.com,
	s.nawrocki@samsung.com, mark.kettenis@xs4all.nl,
	Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Subject: [PATCH v4 4/5] dm: pci: Assign controller device node to root bridge
Date: Fri, 12 Jun 2020 18:46:32 +0200	[thread overview]
Message-ID: <20200612164632.25648-5-nsaenzjulienne@suse.de> (raw)
In-Reply-To: <20200612164632.25648-1-nsaenzjulienne@suse.de>

There is no distinction in DT between the PCI controller device and the
root bridge, whereas such distinction exists from dm's perspective. Make
sure the root bridge ofnode is assigned to the controller's platform
device node.

This permits setups like this to work correctly:

	pcie {
		compatible = "...";
		...
		dev {
			reg = <0 0 0 0 0>;
			...
		};
	};

Without this the dev node is assigned to the root bridge and the
actual device search starts one level lower than expected.

Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
---
 drivers/pci/pci-uclass.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
index 9ab3539a49..ea27e78465 100644
--- a/drivers/pci/pci-uclass.c
+++ b/drivers/pci/pci-uclass.c
@@ -762,7 +762,20 @@ static int pci_find_and_bind_driver(struct udevice *parent,
 	str = strdup(name);
 	if (!str)
 		return -ENOMEM;
-	drv = bridge ? "pci_bridge_drv" : "pci_generic_drv";
+
+	if (bridge) {
+		drv = "pci_bridge_drv";
+
+		/*
+		 * If we're dealing with the root bridge pass the parent device
+		 * node, as there isn't a distinction in device tree between
+		 * that and the actual controller platform device.
+		 */
+		if (!PCI_MASK_BUS(bdf))
+			node = parent->node;
+	} else {
+		drv = "pci_generic_drv";
+	}
 
 	ret = device_bind_driver_to_node(parent, drv, str, node, devp);
 	if (ret) {
-- 
2.26.2


  parent reply	other threads:[~2020-06-12 16:47 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-12 16:46 [PATCH v4 0/5] usb: xhci: Load Raspberry Pi 4 VL805's firmware Nicolas Saenz Julienne
2020-06-12 16:46 ` [PATCH v4 1/5] arm: rpi: Add function to trigger VL805's firmware load Nicolas Saenz Julienne
2020-06-12 16:46 ` [PATCH v4 2/5] reset: Add Raspberry Pi 4 firmware reset controller Nicolas Saenz Julienne
2020-06-12 16:46 ` [PATCH v4 3/5] configs: Enable support for reset controllers on RPi4 Nicolas Saenz Julienne
2020-06-12 16:46 ` Nicolas Saenz Julienne [this message]
2020-06-16 13:43   ` [PATCH v4 4/5] dm: pci: Assign controller device node to root bridge Simon Glass
2020-06-16 14:09     ` Nicolas Saenz Julienne
2020-06-16 23:31       ` Simon Glass
2020-06-17 19:15         ` Nicolas Saenz Julienne
2020-06-26  1:12           ` Simon Glass
2020-06-12 16:46 ` [PATCH v4 5/5] usb: xhci-pci: Add reset controller support Nicolas Saenz Julienne
2020-06-12 17:08   ` Marek Vasut
2020-06-15  8:56     ` Nicolas Saenz Julienne

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=20200612164632.25648-5-nsaenzjulienne@suse.de \
    --to=nsaenzjulienne@suse.de \
    --cc=bmeng.cn@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=m.szyprowski@samsung.com \
    --cc=marex@denx.de \
    --cc=mark.kettenis@xs4all.nl \
    --cc=mbrugger@suse.com \
    --cc=s.nawrocki@samsung.com \
    --cc=sjg@chromium.org \
    --cc=u-boot@lists.denx.de \
    /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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).