Commit 8553bcad authored Sep 17, 2013 by Jason Gunthorpe Committed by Jason Cooper Oct 01, 2013

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:

  11be6547 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>

parent b643f858

drivers/bus/mvebu-mbus.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -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) {

Admin message