lkml.org 
[lkml]   [2019]   [Aug]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.2 014/131] PCI: OF: Initialize dev->fwnode appropriately
    Date
    [ Upstream commit 59b099a6c75e4ddceeaf9676422d8d91d0049755 ]

    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>
    Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/pci/of.c | 8 ++++++++
    1 file changed, 8 insertions(+)

    diff --git a/drivers/pci/of.c b/drivers/pci/of.c
    index 73d5adec0a28d..bc7b27a28795d 100644
    --- a/drivers/pci/of.c
    +++ b/drivers/pci/of.c
    @@ -22,12 +22,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)
    @@ -41,13 +44,18 @@ void pci_set_bus_of_node(struct pci_bus *bus)
    if (node && of_property_read_bool(node, "external-facing"))
    bus->self->untrusted = true;
    }
    +
    bus->dev.of_node = 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.20.1


    \
     
     \ /
      Last update: 2019-08-05 15:56    [W:9.089 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site