Commit 14e2abb7 authored by Kleber Sacilotto de Souza's avatar Kleber Sacilotto de Souza Committed by Rob Herring

of: fix PCI bus match for PCIe slots

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: default avatarKleber Sacilotto de Souza <klebers@linux.vnet.ibm.com>
Acked-by: default avatarGrant Likely <grant.likely@linaro.org>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent 662372e4
...@@ -99,11 +99,12 @@ static unsigned int of_bus_default_get_flags(const __be32 *addr) ...@@ -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) 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 * "vci" is for the /chaos bridge on 1st-gen PCI powermacs
* "ht" is hypertransport * "ht" is hypertransport
*/ */
return !strcmp(np->type, "pci") || !strcmp(np->type, "vci") || return !strcmp(np->type, "pci") || !strcmp(np->type, "pciex") ||
!strcmp(np->type, "ht"); !strcmp(np->type, "vci") || !strcmp(np->type, "ht");
} }
static void of_bus_pci_count_cells(struct device_node *np, static void of_bus_pci_count_cells(struct device_node *np,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment