From: Jean-Philippe Brucker <jean-philippe.brucker@arm.com> To: iommu@lists.linux-foundation.org, linux-pci@vger.kernel.org, devicetree@vger.kernel.org, virtualization@lists.linux-foundation.org, virtio-dev@lists.oasis-open.org, joro@8bytes.org, mst@redhat.com Cc: jasowang@redhat.com, robh+dt@kernel.org, mark.rutland@arm.com, bhelgaas@google.com, frowand.list@gmail.com, kvmarm@lists.cs.columbia.edu, 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, bharat.bhushan@nxp.com Subject: [PATCH v7 4/7] PCI: OF: Initialize dev->fwnode appropriately Date: Tue, 15 Jan 2019 12:19:56 +0000 [thread overview] Message-ID: <20190115121959.23763-5-jean-philippe.brucker@arm.com> (raw) In-Reply-To: <20190115121959.23763-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"). Acked-by: Bjorn Helgaas <bhelgaas@google.com> 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 4c4217d0c3f1..c272ecfcd038 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
WARNING: multiple messages have this Message-ID (diff)
From: Jean-Philippe Brucker <jean-philippe.brucker@arm.com> To: iommu@lists.linux-foundation.org, linux-pci@vger.kernel.org, devicetree@vger.kernel.org, virtualization@lists.linux-foundation.org, virtio-dev@lists.oasis-open.org, joro@8bytes.org, mst@redhat.com Cc: jasowang@redhat.com, robh+dt@kernel.org, mark.rutland@arm.com, bhelgaas@google.com, frowand.list@gmail.com, kvmarm@lists.cs.columbia.edu, 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, bharat.bhushan@nxp.com Subject: [virtio-dev] [PATCH v7 4/7] PCI: OF: Initialize dev->fwnode appropriately Date: Tue, 15 Jan 2019 12:19:56 +0000 [thread overview] Message-ID: <20190115121959.23763-5-jean-philippe.brucker@arm.com> (raw) In-Reply-To: <20190115121959.23763-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"). Acked-by: Bjorn Helgaas <bhelgaas@google.com> 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 4c4217d0c3f1..c272ecfcd038 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 --------------------------------------------------------------------- To unsubscribe, e-mail: virtio-dev-unsubscribe@lists.oasis-open.org For additional commands, e-mail: virtio-dev-help@lists.oasis-open.org
next prev parent reply other threads:[~2019-01-15 12:19 UTC|newest] Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-01-15 12:19 [PATCH v7 0/7] Add virtio-iommu driver Jean-Philippe Brucker 2019-01-15 12:19 ` [virtio-dev] " Jean-Philippe Brucker 2019-01-15 12:19 ` [PATCH v7 1/7] dt-bindings: virtio-mmio: Add IOMMU description Jean-Philippe Brucker 2019-01-15 12:19 ` Jean-Philippe Brucker 2019-01-15 12:19 ` [virtio-dev] " Jean-Philippe Brucker 2019-01-15 12:19 ` [PATCH v7 2/7] dt-bindings: virtio: Add virtio-pci-iommu node Jean-Philippe Brucker 2019-01-15 12:19 ` [virtio-dev] " Jean-Philippe Brucker 2019-01-15 12:19 ` Jean-Philippe Brucker 2019-01-15 12:19 ` [PATCH v7 3/7] of: Allow the iommu-map property to omit untranslated devices Jean-Philippe Brucker 2019-01-15 12:19 ` [virtio-dev] " Jean-Philippe Brucker 2019-01-15 12:19 ` Jean-Philippe Brucker 2019-01-15 12:19 ` Jean-Philippe Brucker [this message] 2019-01-15 12:19 ` [virtio-dev] [PATCH v7 4/7] PCI: OF: Initialize dev->fwnode appropriately Jean-Philippe Brucker 2019-01-15 12:19 ` Jean-Philippe Brucker 2019-01-15 12:19 ` [PATCH v7 5/7] iommu: Add virtio-iommu driver Jean-Philippe Brucker 2019-01-15 12:19 ` [virtio-dev] " Jean-Philippe Brucker 2019-01-15 12:19 ` Jean-Philippe Brucker 2019-01-15 12:19 ` [PATCH v7 6/7] iommu/virtio: Add probe request Jean-Philippe Brucker 2019-01-15 12:19 ` Jean-Philippe Brucker 2019-01-15 12:19 ` [virtio-dev] " Jean-Philippe Brucker 2019-01-15 12:19 ` [PATCH v7 7/7] iommu/virtio: Add event queue Jean-Philippe Brucker 2019-01-15 12:19 ` Jean-Philippe Brucker 2019-01-15 12:19 ` [virtio-dev] " Jean-Philippe Brucker [not found] ` <20190115121959.23763-1-jean-philippe.brucker-5wv7dgnIgG8@public.gmane.org> 2019-01-18 15:51 ` [PATCH v7 0/7] Add virtio-iommu driver Michael S. Tsirkin 2019-01-18 15:51 ` [virtio-dev] " Michael S. Tsirkin 2019-01-18 15:51 ` Michael S. Tsirkin 2019-01-21 11:29 ` Jean-Philippe Brucker 2019-01-21 11:29 ` Jean-Philippe Brucker 2019-01-21 11:29 ` [virtio-dev] " Jean-Philippe Brucker 2019-01-29 18:54 ` Michael S. Tsirkin 2019-01-29 18:54 ` [virtio-dev] " Michael S. Tsirkin 2019-01-29 18:54 ` Michael S. Tsirkin 2019-02-21 21:57 ` Thiago Jung Bauermann 2019-02-21 21:57 ` Thiago Jung Bauermann 2019-02-21 21:57 ` Thiago Jung Bauermann 2019-02-21 21:57 ` Thiago Jung Bauermann 2019-01-29 18:54 ` Michael S. Tsirkin 2019-01-18 15:51 ` Michael S. Tsirkin 2019-01-23 8:34 ` Joerg Roedel 2019-01-23 8:34 ` Joerg Roedel 2019-01-23 8:34 ` Joerg Roedel [not found] ` <20190123083435.x3svwqp472mdgglw-zLv9SwRftAIdnm+yROfE0A@public.gmane.org> 2019-01-24 16:03 ` Jean-Philippe Brucker 2019-01-24 16:03 ` [virtio-dev] " Jean-Philippe Brucker 2019-01-24 16:03 ` Jean-Philippe Brucker [not found] ` <a6315ab3-bffb-7470-365d-b26df6524bda-5wv7dgnIgG8@public.gmane.org> 2019-02-21 22:18 ` Thiago Jung Bauermann 2019-02-21 22:18 ` Thiago Jung Bauermann 2019-02-22 12:18 ` Jean-Philippe Brucker 2019-02-22 12:18 ` Jean-Philippe Brucker 2019-02-22 12:18 ` [virtio-dev] " Jean-Philippe Brucker 2019-02-22 12:18 ` Jean-Philippe Brucker 2019-02-21 22:18 ` Thiago Jung Bauermann 2019-01-24 16:03 ` Jean-Philippe Brucker 2019-02-25 13:20 ` Tomasz Nowicki 2019-02-25 13:20 ` Tomasz Nowicki 2019-05-12 16:31 ` Michael S. Tsirkin 2019-05-12 16:31 ` [virtio-dev] " Michael S. Tsirkin 2019-05-12 16:31 ` Michael S. Tsirkin 2019-05-12 16:31 ` Michael S. Tsirkin 2019-05-27 9:26 ` Joerg Roedel 2019-05-27 9:26 ` Joerg Roedel 2019-05-27 9:26 ` Joerg Roedel 2019-05-27 9:26 ` Joerg Roedel 2019-05-27 15:15 ` Michael S. Tsirkin 2019-05-27 15:15 ` [virtio-dev] " Michael S. Tsirkin 2019-05-27 15:15 ` Michael S. Tsirkin 2019-05-27 15:15 ` Michael S. Tsirkin 2019-05-28 9:18 ` Jean-Philippe Brucker 2019-05-28 9:18 ` Jean-Philippe Brucker 2019-05-28 9:18 ` [virtio-dev] " Jean-Philippe Brucker 2019-05-28 9:18 ` Jean-Philippe Brucker 2019-05-28 9:18 ` Jean-Philippe Brucker 2019-05-28 9:18 ` Jean-Philippe Brucker 2019-05-27 15:15 ` Michael S. Tsirkin 2019-05-27 9:26 ` Joerg Roedel 2019-05-12 16:31 ` Michael S. Tsirkin 2019-05-12 17:15 ` Michael S. Tsirkin 2019-05-12 17:15 ` [virtio-dev] " Michael S. Tsirkin 2019-05-12 17:15 ` Michael S. Tsirkin 2019-05-12 17:15 ` Michael S. Tsirkin 2019-05-12 17:15 ` 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=20190115121959.23763-5-jean-philippe.brucker@arm.com \ --to=jean-philippe.brucker@arm.com \ --cc=bharat.bhushan@nxp.com \ --cc=bhelgaas@google.com \ --cc=devicetree@vger.kernel.org \ --cc=eric.auger@redhat.com \ --cc=frowand.list@gmail.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=robh+dt@kernel.org \ --cc=robin.murphy@arm.com \ --cc=tnowicki@caviumnetworks.com \ --cc=virtio-dev@lists.oasis-open.org \ --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: 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.