On Thu, 2009-11-05 at 08:43 -0500, Josh Boyer wrote:
> On Tue, Sep 15, 2009 at 03:25:55PM -0700, pbathija@xxxxxxxx wrote:
> >From: Pravin Bathija <pbathija@xxxxxxxx>
> >
> >Powerpc 44x uses 36 bit real address while the real address defined
> >in MPT Fusion driver is of type 32 bit. This causes ioremap to fail and driver
> >fails to initialize. This fix changes the data types representing the real
> >address from unsigned long 32-bit types to "phys_addr_t" which is 64-bit. The
> >driver has been tested, the disks get discovered correctly and can do IO. Also,
> >replaced phys_addr_t with resource_size_t as suggested by Ben.
> >
> >Signed-off-by: Pravin Bathija <pbathija@xxxxxxxx>
> >Acked-by: Feng Kan <fkan@xxxxxxxx>
> >Acked-by: Prodyut Hazarika <phazarika@xxxxxxxx>
> >Acked-by: Loc Ho <lho@xxxxxxxx>
> >Acked-by: Tirumala Reddy Marri <tmarri@xxxxxxxx>
> >Acked-by: Victor Gallardo <vgallardo@xxxxxxxx>
>
> Is this patch included in the scsi tree at all? I can't seem to find it in
> linux-next and I know it's not in the powerpc tree. Are there further changes
> needed, or has it simply been missed?
What was the feedback from LSI ... I haven't seen any here?
> josh
>
> >
> >---
> > drivers/message/fusion/mptbase.c | 34 +++++++++++++++++++++++++---------
> > drivers/message/fusion/mptbase.h | 5 +++--
> > 2 files changed, 28 insertions(+), 11 deletions(-)
> >
> >diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
> >index 5d496a9..e296f2e 100644
> >--- a/drivers/message/fusion/mptbase.c
> >+++ b/drivers/message/fusion/mptbase.c
> >@@ -1510,11 +1510,12 @@ static int
> > mpt_mapresources(MPT_ADAPTER *ioc)
> > {
> > u8 __iomem *mem;
> >+ u8 __iomem *port;
> > int ii;
> >- unsigned long mem_phys;
> >- unsigned long port;
> >- u32 msize;
> >- u32 psize;
> >+ resource_size_t mem_phys;
> >+ resource_size_t port_phys;
> >+ resource_size_t msize;
> >+ resource_size_t psize;
> > u8 revision;
> > int r = -ENODEV;
> > struct pci_dev *pdev;
> >@@ -1552,13 +1553,13 @@ mpt_mapresources(MPT_ADAPTER *ioc)
> > }
> >
> > mem_phys = msize = 0;
> >- port = psize = 0;
> >+ port_phys = psize = 0;
> > for (ii = 0; ii < DEVICE_COUNT_RESOURCE; ii++) {
> > if (pci_resource_flags(pdev, ii) & PCI_BASE_ADDRESS_SPACE_IO) {
> > if (psize)
> > continue;
> > /* Get I/O space! */
> >- port = pci_resource_start(pdev, ii);
> >+ port_phys = pci_resource_start(pdev, ii);
> > psize = pci_resource_len(pdev, ii);
> > } else {
> > if (msize)
> >@@ -1580,14 +1581,23 @@ mpt_mapresources(MPT_ADAPTER *ioc)
> > return -EINVAL;
> > }
> > ioc->memmap = mem;
> >- dinitprintk(ioc, printk(MYIOC_s_INFO_FMT "mem = %p, mem_phys = %lx\n",
> >- ioc->name, mem, mem_phys));
> >+ dinitprintk(ioc, printk(MYIOC_s_INFO_FMT "mem = %p, mem_phys = %llx\n",
> >+ ioc->name, mem, (u64)mem_phys));
> >
> > ioc->mem_phys = mem_phys;
> > ioc->chip = (SYSIF_REGS __iomem *)mem;
> >
> > /* Save Port IO values in case we need to do downloadboot */
> >- ioc->pio_mem_phys = port;
> >+ port = ioremap(port_phys, psize);
> >+ if (port == NULL) {
> >+ printk(MYIOC_s_ERR_FMT " : ERROR - Unable to map adapter"
> >+ " port !\n", ioc->name);
> >+ return -EINVAL;
So this looks problematic on a few platforms ... what happens to
platforms that have no IO space? They automatically fail here and it
looks like the adapter never attaches.
James
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
