Re: [PATCH 2/2] MIPS: implement pcibios_get_phb_of_node

[Bjorn Helgaas]

On Thu, Apr 4, 2013 at 12:01 PM, Gabor Juhos <juhosg@xxxxxxxxxxx> wrote:
> The of_node field of the device assigned to a
> PCI bus is used during scanning of the PCI bus.
> However on MIPS, the of_node field is assigned
> only after the bus has been scanned.
>
> Implement the architecture specific version of
> 'pcibios_get_phb_of_node'. Which ensures that the
> PCI driver core will initialize the of_node field
> before starting the scan.
>
> Also remove the local assignment of bus->dev.of_node,
> it is not needed after the patch.
>
> Signed-off-by: Gabor Juhos <juhosg@xxxxxxxxxxx>

I removed the __weak annotation from include/linux/pci.h and applied
this patch to my pci/gabor-get-of-node.  Give it a try and make sure
it solves your problem.  If so, and Ralph approves, I can push both
for v3.10.  It should appear at
http://git.kernel.org/cgit/linux/kernel/git/helgaas/pci.git/log/?h=pci/gabor-get-of-node
soon.

Or if you prefer, you can take them through the MIPS tree.

Bjorn

> ---
>  arch/mips/pci/pci.c |    8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c
> index 0872f12..594e60d 100644
> --- a/arch/mips/pci/pci.c
> +++ b/arch/mips/pci/pci.c
> @@ -115,7 +115,6 @@ static void pcibios_scanbus(struct pci_controller *hose)
>                         pci_bus_assign_resources(bus);
>                         pci_enable_bridges(bus);
>                 }
> -               bus->dev.of_node = hose->of_node;
>         }
>  }
>
> @@ -169,6 +168,13 @@ void pci_load_of_ranges(struct pci_controller *hose, struct device_node *node)
>                 }
>         }
>  }
> +
> +struct device_node *pcibios_get_phb_of_node(struct pci_bus *bus)
> +{
> +       struct pci_controller *hose = bus->sysdata;
> +
> +       return of_node_get(hose->of_node);
> +}
>  #endif
>
>  static DEFINE_MUTEX(pci_scan_mutex);
> --
> 1.7.10
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/