From: Jean-Philippe Brucker <jean-philippe.brucker@arm.com>
To: iommu@lists.linux-foundation.org,
virtualization@lists.linux-foundation.org,
devicetree@vger.kernel.org
Cc: linux-pci@vger.kernel.org, kvmarm@lists.cs.columbia.edu,
peter.maydell@linaro.org, joro@8bytes.org, mst@redhat.com,
jasowang@redhat.com, robh+dt@kernel.org, mark.rutland@arm.com,
eric.auger@redhat.com, tnowicki@caviumnetworks.com,
kevin.tian@intel.com, marc.zyngier@arm.com, robin.murphy@arm.com,
will.deacon@arm.com, lorenzo.pieralisi@arm.com
Subject: [PATCH v3 4/7] PCI: OF: Initialize dev->fwnode appropriately
Date: Fri, 12 Oct 2018 15:59:14 +0100 [thread overview]
Message-ID: <20181012145917.6840-5-jean-philippe.brucker@arm.com> (raw)
In-Reply-To: <20181012145917.6840-1-jean-philippe.brucker@arm.com>
For PCI devices that have an OF node, set the fwnode as well. This way
drivers that rely on fwnode don't need the special case described by
commit f94277af03ea ("of/platform: Initialise dev->fwnode appropriately").
Signed-off-by: Jean-Philippe Brucker <jean-philippe.brucker@arm.com>
---
drivers/pci/of.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/pci/of.c b/drivers/pci/of.c
index 2f5015bdb256..8026417fab38 100644
--- a/drivers/pci/of.c
+++ b/drivers/pci/of.c
@@ -21,12 +21,15 @@ void pci_set_of_node(struct pci_dev *dev)
return;
dev->dev.of_node = of_pci_find_child_device(dev->bus->dev.of_node,
dev->devfn);
+ if (dev->dev.of_node)
+ dev->dev.fwnode = &dev->dev.of_node->fwnode;
}
void pci_release_of_node(struct pci_dev *dev)
{
of_node_put(dev->dev.of_node);
dev->dev.of_node = NULL;
+ dev->dev.fwnode = NULL;
}
void pci_set_bus_of_node(struct pci_bus *bus)
@@ -35,12 +38,16 @@ void pci_set_bus_of_node(struct pci_bus *bus)
bus->dev.of_node = pcibios_get_phb_of_node(bus);
else
bus->dev.of_node = of_node_get(bus->self->dev.of_node);
+
+ if (bus->dev.of_node)
+ bus->dev.fwnode = &bus->dev.of_node->fwnode;
}
void pci_release_bus_of_node(struct pci_bus *bus)
{
of_node_put(bus->dev.of_node);
bus->dev.of_node = NULL;
+ bus->dev.fwnode = NULL;
}
struct device_node * __weak pcibios_get_phb_of_node(struct pci_bus *bus)
--
2.19.1
next prev parent reply other threads:[~2018-10-12 15:00 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-12 14:59 [PATCH v3 0/7] Add virtio-iommu driver Jean-Philippe Brucker
2018-10-12 14:59 ` [PATCH v3 1/7] dt-bindings: virtio-mmio: Add IOMMU description Jean-Philippe Brucker
2018-10-18 0:30 ` Rob Herring
2018-11-15 8:45 ` Auger Eric
2018-10-12 14:59 ` [PATCH v3 2/7] dt-bindings: virtio: Add virtio-pci-iommu node Jean-Philippe Brucker
2018-10-18 0:35 ` Rob Herring
2018-11-15 8:45 ` Auger Eric
2018-10-12 14:59 ` [PATCH v3 3/7] PCI: OF: Allow endpoints to bypass the iommu Jean-Philippe Brucker
2018-10-12 19:41 ` Bjorn Helgaas
2018-10-15 10:52 ` Michael S. Tsirkin
2018-10-15 19:46 ` Jean-philippe Brucker
2018-10-17 15:14 ` Michael S. Tsirkin
2018-10-18 10:47 ` Robin Murphy
2018-10-22 11:27 ` Jean-Philippe Brucker
2018-10-15 11:32 ` Robin Murphy
2018-10-15 19:45 ` Jean-philippe Brucker
2018-10-12 14:59 ` Jean-Philippe Brucker [this message]
2018-10-12 19:44 ` [PATCH v3 4/7] PCI: OF: Initialize dev->fwnode appropriately Bjorn Helgaas
2018-10-12 14:59 ` [PATCH v3 5/7] iommu: Add virtio-iommu driver Jean-Philippe Brucker
2018-10-12 16:35 ` Michael S. Tsirkin
2018-10-12 18:54 ` Jean-Philippe Brucker
2018-11-08 14:51 ` Auger Eric
2018-11-08 16:46 ` Jean-Philippe Brucker
2018-10-12 14:59 ` [PATCH v3 6/7] iommu/virtio: Add probe request Jean-Philippe Brucker
2018-10-12 16:42 ` Michael S. Tsirkin
2018-11-08 14:48 ` Auger Eric
2018-11-08 16:46 ` Jean-Philippe Brucker
2018-11-15 13:20 ` Auger Eric
2018-11-15 16:22 ` Jean-Philippe Brucker
2018-10-12 14:59 ` [PATCH v3 7/7] iommu/virtio: Add event queue Jean-Philippe Brucker
2018-10-12 17:00 ` [PATCH v3 0/7] Add virtio-iommu driver Michael S. Tsirkin
2018-10-12 18:55 ` Jean-Philippe Brucker
2018-10-16 9:25 ` Auger Eric
2018-10-16 18:44 ` Jean-Philippe Brucker
2018-10-16 20:31 ` Auger Eric
2018-10-17 11:54 ` Jean-Philippe Brucker
2018-10-17 15:23 ` Michael S. Tsirkin
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=20181012145917.6840-5-jean-philippe.brucker@arm.com \
--to=jean-philippe.brucker@arm.com \
--cc=devicetree@vger.kernel.org \
--cc=eric.auger@redhat.com \
--cc=iommu@lists.linux-foundation.org \
--cc=jasowang@redhat.com \
--cc=joro@8bytes.org \
--cc=kevin.tian@intel.com \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-pci@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=marc.zyngier@arm.com \
--cc=mark.rutland@arm.com \
--cc=mst@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=robh+dt@kernel.org \
--cc=robin.murphy@arm.com \
--cc=tnowicki@caviumnetworks.com \
--cc=virtualization@lists.linux-foundation.org \
--cc=will.deacon@arm.com \
/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).