[PATCH 3/3] - Altix: Initial ACPI support - ROM shadowing.

John Keller
2006-10-04T21:49:52Z

---

Resend #2 - resync with TOT.

arch/ia64/sn/kernel/io_acpi_init.c | 33 +++++++++++++++++++++++++++
arch/ia64/sn/kernel/io_common.c | 5 ++--
arch/ia64/sn/kernel/io_init.c | 3 ++
drivers/pci/rom.c | 9 ++++---
include/linux/ioport.h | 1
5 files changed, 46 insertions(+), 5 deletions(-)

Index: linux-2.6/arch/ia64/sn/kernel/io_common.c
=================================--- linux-2.6.orig/arch/ia64/sn/kernel/io_common.c 2006-10-04 16:15:17.255542785 -0500
+++ linux-2.6/arch/ia64/sn/kernel/io_common.c 2006-10-04 16:15:31.645262234 -0500
@@ -286,9 +286,10 @@ void sn_pci_fixup_slot(struct pci_dev *d
list_add_tail(&pcidev_info->pdi_list,
&(SN_PLATFORM_DATA(dev->bus)->pcidev_info));

- if (!SN_ACPI_BASE_SUPPORT())
+ if (SN_ACPI_BASE_SUPPORT())
+ sn_acpi_slot_fixup(dev, pcidev_info);
+ else
sn_more_slot_fixup(dev, pcidev_info);
-
/*
* Using the PROMs values for the PCI host bus, get the Linux
* PCI host_pci_dev struct and set up host bus linkages
Index: linux-2.6/drivers/pci/rom.c
=================================--- linux-2.6.orig/drivers/pci/rom.c 2006-10-04 16:15:07.542382237 -0500
+++ linux-2.6/drivers/pci/rom.c 2006-10-04 16:15:31.645262234 -0500
@@ -77,7 +77,8 @@ void __iomem *pci_map_rom(struct pci_dev
start = (loff_t)0xC0000;
*size = 0x20000; /* cover C000:0 through E000:0 */
} else {
- if (res->flags & IORESOURCE_ROM_COPY) {
+ if (res->flags &
+ (IORESOURCE_ROM_COPY | IORESOURCE_ROM_BIOS_COPY)) {
*size = pci_resource_len(pdev, PCI_ROM_RESOURCE);
return (void __iomem *)(unsigned long)
pci_resource_start(pdev, PCI_ROM_RESOURCE);
@@ -161,7 +162,8 @@ void __iomem *pci_map_rom_copy(struct pc
if (!rom)
return NULL;

- if (res->flags & (IORESOURCE_ROM_COPY | IORESOURCE_ROM_SHADOW))
+ if (res->flags & (IORESOURCE_ROM_COPY | IORESOURCE_ROM_SHADOW |
+ IORESOURCE_ROM_BIOS_COPY))
return rom;

res->start = (unsigned long)kmalloc(*size, GFP_KERNEL);
@@ -187,7 +189,7 @@ void pci_unmap_rom(struct pci_dev *pdev,
{
struct resource *res = &pdev->resource[PCI_ROM_RESOURCE];

- if (res->flags & IORESOURCE_ROM_COPY)
+ if (res->flags & (IORESOURCE_ROM_COPY | IORESOURCE_ROM_BIOS_COPY))
return;

iounmap(rom);
@@ -211,6 +213,7 @@ void pci_remove_rom(struct pci_dev *pdev
sysfs_remove_bin_file(&pdev->dev.kobj, pdev->rom_attr);
if (!(res->flags & (IORESOURCE_ROM_ENABLE |
IORESOURCE_ROM_SHADOW |
+ IORESOURCE_ROM_BIOS_COPY |
IORESOURCE_ROM_COPY)))
pci_disable_rom(pdev);
}
Index: linux-2.6/include/linux/ioport.h
=================================--- linux-2.6.orig/include/linux/ioport.h 2006-10-04 16:15:07.542382237 -0500
+++ linux-2.6/include/linux/ioport.h 2006-10-04 16:15:31.645262234 -0500
@@ -89,6 +89,7 @@ struct resource_list {
#define IORESOURCE_ROM_ENABLE (1<<0) /* ROM is enabled, same as PCI_ROM_ADDRESS_ENABLE */
#define IORESOURCE_ROM_SHADOW (1<<1) /* ROM is copy at C000:0 */
#define IORESOURCE_ROM_COPY (1<<2) /* ROM is alloc'd copy, resource field overlaid */
+#define IORESOURCE_ROM_BIOS_COPY (1<<3) /* ROM is BIOS copy, resource field overlaid */

/* PC/ISA/whatever - the normal PC address spaces: IO and memory */
extern struct resource ioport_resource;
Index: linux-2.6/arch/ia64/sn/kernel/io_acpi_init.c
=================================--- linux-2.6.orig/arch/ia64/sn/kernel/io_acpi_init.c 2006-10-04 16:15:17.255542785 -0500
+++ linux-2.6/arch/ia64/sn/kernel/io_acpi_init.c 2006-10-04 16:15:31.645262234 -0500
@@ -169,6 +169,39 @@ sn_acpi_bus_fixup(struct pci_bus *bus)
}
}

+/*
+ * sn_acpi_slot_fixup - Perform any SN specific slot fixup.
+ * At present there does not appear to be
+ * any generic way to handle a ROM image
+ * that has been shadowed by the PROM, so
+ * we pass a pointer to it within the
+ * pcidev_info structure.
+ */
+
+void
+sn_acpi_slot_fixup(struct pci_dev *dev, struct pcidev_info *pcidev_info)
+{
+ void __iomem *addr;
+ size_t size;
+
+ if (pcidev_info->pdi_pio_mapped_addr[PCI_ROM_RESOURCE]) {
+ /*
+ * A valid ROM image exists and has been shadowed by the
+ * PROM. Setup the pci_dev ROM resource to point to
+ * the shadowed copy.
+ */
+ size = dev->resource[PCI_ROM_RESOURCE].end -
+ dev->resource[PCI_ROM_RESOURCE].start;
+ addr + ioremap(pcidev_info->pdi_pio_mapped_addr[PCI_ROM_RESOURCE],
+ size);
+ dev->resource[PCI_ROM_RESOURCE].start = (unsigned long) addr;
+ dev->resource[PCI_ROM_RESOURCE].end + (unsigned long) addr + size;
+ dev->resource[PCI_ROM_RESOURCE].flags |= IORESOURCE_ROM_BIOS_COPY;
+ }
+}
+
static struct acpi_driver acpi_sn_hubdev_driver = {
.name = "SGI HUBDEV Driver",
.ids = "SGIHUB,SGITIO",
Index: linux-2.6/arch/ia64/sn/kernel/io_init.c
=================================--- linux-2.6.orig/arch/ia64/sn/kernel/io_init.c 2006-10-04 16:15:17.243541351 -0500
+++ linux-2.6/arch/ia64/sn/kernel/io_init.c 2006-10-04 16:15:31.645262234 -0500