2 files changed, 25 insertions, 12 deletions

diff --git a/arch/ia64/sn/kernel/io_acpi_init.c b/arch/ia64/sn/kernel/io_acpi_init.c
index c6216f454ffb..3c7178f5dce8 100644
--- a/arch/ia64/sn/kernel/io_acpi_init.c
+++ b/arch/ia64/sn/kernel/io_acpi_init.c
@@ -418,7 +418,7 @@ sn_acpi_slot_fixup(struct pci_dev *dev)
         void __iomem *addr;
         struct pcidev_info *pcidev_info = NULL;
         struct sn_irq_info *sn_irq_info = NULL;
-        size_t size;
+        size_t image_size, size;
 
         if (sn_acpi_get_pcidev_info(dev, &pcidev_info, &sn_irq_info)) {
                 panic("%s:  Failure obtaining pcidev_info for %s\n",
@@ -428,17 +428,16 @@ sn_acpi_slot_fixup(struct pci_dev *dev)
         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.
+                 * PROM. Setup the pci_dev ROM resource with the address
+                 * of the shadowed copy, and the actual length of the ROM image.
                  */
-                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);
+                size = pci_resource_len(dev, PCI_ROM_RESOURCE);
+                addr = ioremap(pcidev_info->pdi_pio_mapped_addr[PCI_ROM_RESOURCE],
+                               size);
+                image_size = pci_get_rom_size(addr, size);
                 dev->resource[PCI_ROM_RESOURCE].start = (unsigned long) addr;
                 dev->resource[PCI_ROM_RESOURCE].end =
-                                                (unsigned long) addr + size;
+                                        (unsigned long) addr + image_size - 1;
                 dev->resource[PCI_ROM_RESOURCE].flags |= IORESOURCE_ROM_BIOS_COPY;
         }
         sn_pci_fixup_slot(dev, pcidev_info, sn_irq_info);
diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c
index 6b10e5d28488..906b93674b76 100644
--- a/arch/ia64/sn/kernel/io_init.c
+++ b/arch/ia64/sn/kernel/io_init.c
@@ -259,9 +259,23 @@ sn_io_slot_fixup(struct pci_dev *dev)
                         insert_resource(&ioport_resource, &dev->resource[idx]);
                 else
                         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;
+                /*
+                 * If ROM, set the actual ROM image size, and mark as
+                 * shadowed in PROM.
+                 */
+                if (idx == PCI_ROM_RESOURCE) {
+                        size_t image_size;
+                        void __iomem *rom;
+
+                        rom = ioremap(pci_resource_start(dev, PCI_ROM_RESOURCE),
+                                      size + 1);
+                        image_size = pci_get_rom_size(rom, size + 1);
+                        dev->resource[PCI_ROM_RESOURCE].end =
+                                dev->resource[PCI_ROM_RESOURCE].start +
+                                image_size - 1;
+                        dev->resource[PCI_ROM_RESOURCE].flags |=
+                                                 IORESOURCE_ROM_BIOS_COPY;
+                }
         }
         /* Create a pci_window in the pci_controller struct for
          * each device resource.