Commit 8553bcad authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by Jason Cooper
Browse files

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:


 PCI: mvebu: Adapt to the new device tree layout
Signed-off-by: default avatarJason Gunthorpe <>
Signed-off-by: default avatarJason Cooper <>
parent b643f858
......@@ -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) {
Supports Markdown
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