diff options
| author | Kleber Sacilotto de Souza <klebers@linux.vnet.ibm.com> | 2014-02-03 13:31:03 -0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2014-04-02 00:58:48 +0100 |
| commit | 99ea864bc2c999bab93729d83f7eef40c2a95754 (patch) | |
| tree | d557e4f714f243184957c6b6877f5d172f0ed20a | |
| parent | 57200657f1cd8d9d579ee4b110c7eeada3e61d0d (diff) | |
| download | kernel_samsung_smdk4412-99ea864bc2c999bab93729d83f7eef40c2a95754.zip kernel_samsung_smdk4412-99ea864bc2c999bab93729d83f7eef40c2a95754.tar.gz kernel_samsung_smdk4412-99ea864bc2c999bab93729d83f7eef40c2a95754.tar.bz2 | |
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: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | 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 066c1eb..45c1727 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -98,11 +98,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, |