[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <200703151601.l2FG1PHm002278@fcbayern.americas.sgi.com>
Date: Thu, 15 Mar 2007 11:01:24 -0500 (CDT)
From: John Keller <jpk@....com>
To: linux-ia64@...r.kernel.org, linux-kernel@...r.kernel.org
Cc: bwalle@...e.de
Subject: Re: [PATCH] Fix wrong /proc/iomem on SGI Altix
Looks good.
Feel free to add.
Acked-by: John Keller <jpk@....com>
>
> 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: Bernhard Walle <bwalle@...e.de>
>
> ---
> arch/ia64/sn/kernel/io_init.c | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
> Index: b/arch/ia64/sn/kernel/io_init.c
> ===================================================================
> --- a/arch/ia64/sn/kernel/io_init.c
> +++ b/arch/ia64/sn/kernel/io_init.c
> @@ -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;
> -
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists