Commit 4230fa3b authored Dec 09, 2009 by David S. Miller

sparc64: Fix overly strict range type matching for PCI devices.



When we are trying to see if a range property entry applies
to a given address, we are overly strict about the type.

We should only allow I/O ranges for I/O addresses, and only allow
CONFIG space ranges for CONFIG space address.

However for MEM ranges, they come in 32-bit and 64-bit flavors.
And a lack of an exact match is OK if the range is 32-bit and
the address is 64-bit.  We can assign a 64-bit address properly
into a 32-bit parent range just fine.

So allow it.

Reported-by: Patrick Finnegan <pat@computer-refuge.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent a252e749

arch/sparc/kernel/of_device_64.c

+12 −2

Original line number	Diff line number	Diff line
		@@ -104,9 +104,19 @@ static int of_bus_pci_map(u32 addr, const u32 range,
		int i;

		/* Check address type match */
		if ((addr[0] ^ range[0]) & 0x03000000)
		if (!((addr[0] ^ range[0]) & 0x03000000))
		goto type_match;

		/* Special exception, we can map a 64-bit address into
		* a 32-bit range.
		*/
		if ((addr[0] & 0x03000000) == 0x03000000 &&
		(range[0] & 0x03000000) == 0x02000000)
		goto type_match;

		return -EINVAL;

		type_match:
		if (of_out_of_range(addr + 1, range + 1, range + na + pna,
		na - 1, ns))
		return -EINVAL;