diff options
| author | Kleber Sacilotto de Souza <klebers@linux.vnet.ibm.com> | 2014-02-03 13:31:03 -0200 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2014-02-05 09:59:20 -0600 |
| commit | 14e2abb732e485ee57d9d5b2cb8884652238e5c1 (patch) | |
| tree | 75129edccf3a3e7164a5837cf1fd7735fa30a79e /drivers | |
| parent | 662372e42e46d9bbfcb83e1cce81f6b33cebaddd (diff) | |
| download | blackbird-op-linux-14e2abb732e485ee57d9d5b2cb8884652238e5c1.tar.gz blackbird-op-linux-14e2abb732e485ee57d9d5b2cb8884652238e5c1.zip | |
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: Kleber Sacilotto de Souza <klebers@linux.vnet.ibm.com>
Acked-by: Grant Likely <grant.likely@linaro.org>
Cc: stable@vger.kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'drivers')
| -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 d3dd41c840f1..1a54f1ffaadb 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, |
