Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58a69c36 authored by Bernhard Walle's avatar Bernhard Walle Committed by Tony Luck
Browse files

[IA64] Fix wrong /proc/iomem on SGI Altix 



In sn_io_slot_fixup(), the parent is re-set from the bus to
io(port|mem)_resource because the address is changed in a way that it's not
child of the bus any more.

However, only the root is set but not the parent/child/sibling relationship in
the resource tree which causes 'cat /proc/iomem' to stop after this memory
area. Depding on the poition in the tree the iomem may be nearly completely
empty.

Signed-off-by: default avatarBernhard Walle <bwalle@suse.de>
Acked-by: default avatarJohn Keller <jpk@sgi.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 0bdfc190

arch/ia64/sn/kernel/io_init.c

+10 −2
Original line number Diff line number Diff line
@@ -247,10 +247,18 @@ sn_io_slot_fixup(struct pci_dev *dev) 
		addr = ((addr << 4) >> 4) | __IA64_UNCACHED_OFFSET;

		dev->resource[idx].start = addr;

		dev->resource[idx].end = addr + size;



		/*

		 * if it's already in the device structure, remove it before

		 * inserting

		 */

		if (dev->resource[idx].parent && dev->resource[idx].parent->child)

			release_resource(&dev->resource[idx]);



		if (dev->resource[idx].flags & IORESOURCE_IO)

			dev->resource[idx].parent = &ioport_resource;

			insert_resource(&ioport_resource, &dev->resource[idx]);

		else

			dev->resource[idx].parent = &iomem_resource;

			insert_resource(&iomem_resource, &dev->resource[idx]);

		/* If ROM, mark as shadowed in PROM */

		if (idx == PCI_ROM_RESOURCE)

			dev->resource[idx].flags |= IORESOURCE_ROM_BIOS_COPY;