On Mon, 3 Feb 2014 13:31:03 -0200, Kleber Sacilotto de Souza <klebers@xxxxxxxxxxxxxxxxxx> wrote:
> On IBM pseries systems the device_type device-tree property of a PCIe
> bridge contains the string "pciex". The of_bus_pci_match() function was
> looking only for "pci" on this property, so in such cases the bus
> matching code was falling back to the default bus, causing problems on
> functions that should be using "assigned-addresses" for region address
> translation. This patch fixes the problem by also looking for "pciex" on
> the PCI bus match function.
>
> v2: added comment
>
> Signed-off-by: Kleber Sacilotto de Souza <klebers@xxxxxxxxxxxxxxxxxx>
Applied, thanks.
g.
> ---
> drivers/of/address.c | 5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/of/address.c b/drivers/of/address.c
> index d3dd41c..1a54f1f 100644
> --- a/drivers/of/address.c
> +++ b/drivers/of/address.c
> @@ -99,11 +99,12 @@ static unsigned int of_bus_default_get_flags(const __be32 *addr)
> static int of_bus_pci_match(struct device_node *np)
> {
> /*
> + * "pciex" is PCI Express
> * "vci" is for the /chaos bridge on 1st-gen PCI powermacs
> * "ht" is hypertransport
> */
> - return !strcmp(np->type, "pci") || !strcmp(np->type, "vci") ||
> - !strcmp(np->type, "ht");
> + return !strcmp(np->type, "pci") || !strcmp(np->type, "pciex") ||
> + !strcmp(np->type, "vci") || !strcmp(np->type, "ht");
> }
>
> static void of_bus_pci_count_cells(struct device_node *np,
> --
> 1.7.1
>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
