diff options
authorKleber Sacilotto de Souza <klebers@linux.vnet.ibm.com>2014-02-03 13:31:03 -0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-02-22 12:41:27 -0800
commitdf6b8e747f8a232226d17f021bcf725cc5f94908 (patch)
parentb825fac234c90d60b0617fae3a962a773a5ecc2d (diff)
of: fix PCI bus match for PCIe slots
commit 14e2abb732e485ee57d9d5b2cb8884652238e5c1 upstream. 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@linux.vnet.ibm.com> Acked-by: Grant Likely <grant.likely@linaro.org> Signed-off-by: Rob Herring <robh@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/of/address.c b/drivers/of/address.c
index 9e69b4f0d20..00bc55cc821 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,