Commit 8911c9e3 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by James Bottomley
Browse files

[SCSI] aic79xx: fix MMIO for PPC 44x platforms



The driver stores the PCI resource address into 'u_long' variable before
calling ioremap_nocache() on it. This warrants kernel oops when the registers
are accessed on PPC 44x platforms which (being 32-bit) have PCI memory space
mapped beyond 4 GB.

The arch/ppc/ kernel has a fixup in ioremap() that helps create an illusion
that the PCI memory resources are mapped below 4 GB, but arch/powerpc/ code
got rid of this trick, having instead CONFIG_RESOURCES_64BIT enabled.
Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 44850413
...@@ -360,7 +360,7 @@ struct ahd_platform_data { ...@@ -360,7 +360,7 @@ struct ahd_platform_data {
#define AHD_LINUX_NOIRQ ((uint32_t)~0) #define AHD_LINUX_NOIRQ ((uint32_t)~0)
uint32_t irq; /* IRQ for this adapter */ uint32_t irq; /* IRQ for this adapter */
uint32_t bios_address; uint32_t bios_address;
uint32_t mem_busaddr; /* Mem Base Addr */ resource_size_t mem_busaddr; /* Mem Base Addr */
}; };
/************************** OS Utility Wrappers *******************************/ /************************** OS Utility Wrappers *******************************/
......
...@@ -249,8 +249,8 @@ ahd_linux_pci_exit(void) ...@@ -249,8 +249,8 @@ ahd_linux_pci_exit(void)
} }
static int static int
ahd_linux_pci_reserve_io_regions(struct ahd_softc *ahd, u_long *base, ahd_linux_pci_reserve_io_regions(struct ahd_softc *ahd, resource_size_t *base,
u_long *base2) resource_size_t *base2)
{ {
*base = pci_resource_start(ahd->dev_softc, 0); *base = pci_resource_start(ahd->dev_softc, 0);
/* /*
...@@ -272,11 +272,11 @@ ahd_linux_pci_reserve_io_regions(struct ahd_softc *ahd, u_long *base, ...@@ -272,11 +272,11 @@ ahd_linux_pci_reserve_io_regions(struct ahd_softc *ahd, u_long *base,
static int static int
ahd_linux_pci_reserve_mem_region(struct ahd_softc *ahd, ahd_linux_pci_reserve_mem_region(struct ahd_softc *ahd,
u_long *bus_addr, resource_size_t *bus_addr,
uint8_t __iomem **maddr) uint8_t __iomem **maddr)
{ {
u_long start; resource_size_t start;
u_long base_page; resource_size_t base_page;
u_long base_offset; u_long base_offset;
int error = 0; int error = 0;
...@@ -310,7 +310,7 @@ int ...@@ -310,7 +310,7 @@ int
ahd_pci_map_registers(struct ahd_softc *ahd) ahd_pci_map_registers(struct ahd_softc *ahd)
{ {
uint32_t command; uint32_t command;
u_long base; resource_size_t base;
uint8_t __iomem *maddr; uint8_t __iomem *maddr;
int error; int error;
...@@ -346,31 +346,32 @@ ahd_pci_map_registers(struct ahd_softc *ahd) ...@@ -346,31 +346,32 @@ ahd_pci_map_registers(struct ahd_softc *ahd)
} else } else
command |= PCIM_CMD_MEMEN; command |= PCIM_CMD_MEMEN;
} else if (bootverbose) { } else if (bootverbose) {
printf("aic79xx: PCI%d:%d:%d MEM region 0x%lx " printf("aic79xx: PCI%d:%d:%d MEM region 0x%llx "
"unavailable. Cannot memory map device.\n", "unavailable. Cannot memory map device.\n",
ahd_get_pci_bus(ahd->dev_softc), ahd_get_pci_bus(ahd->dev_softc),
ahd_get_pci_slot(ahd->dev_softc), ahd_get_pci_slot(ahd->dev_softc),
ahd_get_pci_function(ahd->dev_softc), ahd_get_pci_function(ahd->dev_softc),
base); (unsigned long long)base);
} }
if (maddr == NULL) { if (maddr == NULL) {
u_long base2; resource_size_t base2;
error = ahd_linux_pci_reserve_io_regions(ahd, &base, &base2); error = ahd_linux_pci_reserve_io_regions(ahd, &base, &base2);
if (error == 0) { if (error == 0) {
ahd->tags[0] = BUS_SPACE_PIO; ahd->tags[0] = BUS_SPACE_PIO;
ahd->tags[1] = BUS_SPACE_PIO; ahd->tags[1] = BUS_SPACE_PIO;
ahd->bshs[0].ioport = base; ahd->bshs[0].ioport = (u_long)base;
ahd->bshs[1].ioport = base2; ahd->bshs[1].ioport = (u_long)base2;
command |= PCIM_CMD_PORTEN; command |= PCIM_CMD_PORTEN;
} else { } else {
printf("aic79xx: PCI%d:%d:%d IO regions 0x%lx and 0x%lx" printf("aic79xx: PCI%d:%d:%d IO regions 0x%llx and "
"unavailable. Cannot map device.\n", "0x%llx unavailable. Cannot map device.\n",
ahd_get_pci_bus(ahd->dev_softc), ahd_get_pci_bus(ahd->dev_softc),
ahd_get_pci_slot(ahd->dev_softc), ahd_get_pci_slot(ahd->dev_softc),
ahd_get_pci_function(ahd->dev_softc), ahd_get_pci_function(ahd->dev_softc),
base, base2); (unsigned long long)base,
(unsigned long long)base2);
} }
} }
ahd_pci_write_config(ahd->dev_softc, PCIR_COMMAND, command, 4); ahd_pci_write_config(ahd->dev_softc, PCIR_COMMAND, command, 4);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment