diff options
| author | Jason Gunthorpe <jgunthorpe@obsidianresearch.com> | 2013-09-17 22:11:04 +0200 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2013-10-01 19:04:17 +0200 |
| commit | 8553bcad3eca6cdd19c4771c378bd2cf6e25c6b2 (patch) | |
| tree | 8002c1eca37a2ad3f6a92c53be2ad9fe99b02999 /drivers/bus/mvebu-mbus.c | |
| parent | ARM: mvebu: add missing DT Mbus ranges and relocate PCIe DT nodes for RN102 (diff) | |
| download | linux-8553bcad3eca6cdd19c4771c378bd2cf6e25c6b2.tar.xz linux-8553bcad3eca6cdd19c4771c378bd2cf6e25c6b2.zip | |
bus: mvebu-mbus: Fix optional pcie-mem/io-aperture properties
If the property was not specified then the returned resource had a
resource_size(..) == 1, rather than 0. The PCI-E driver checks for 0 so it
blindly continues on with a corrupted resource.
The regression was introduced into v3.12 by:
11be654 PCI: mvebu: Adapt to the new device tree layout
Signed-off-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'drivers/bus/mvebu-mbus.c')
| -rw-r--r-- | drivers/bus/mvebu-mbus.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c index 553185318963..2394e9753ef5 100644 --- a/drivers/bus/mvebu-mbus.c +++ b/drivers/bus/mvebu-mbus.c @@ -865,11 +865,13 @@ static void __init mvebu_mbus_get_pcie_resources(struct device_node *np, int ret; /* - * These are optional, so we clear them and they'll - * be zero if they are missing from the DT. + * These are optional, so we make sure that resource_size(x) will + * return 0. */ memset(mem, 0, sizeof(struct resource)); + mem->end = -1; memset(io, 0, sizeof(struct resource)); + io->end = -1; ret = of_property_read_u32_array(np, "pcie-mem-aperture", reg, ARRAY_SIZE(reg)); if (!ret) { |