Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e46b63b3 authored by Pravin Bathija's avatar Pravin Bathija Committed by James Bottomley
Browse files

[SCSI] mpt fusion: Fix 32 bit platforms with 64 bit resources. 



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
resource_size_t which is 64-bit. The driver has been tested, the disks
get discovered correctly and can do IO.

[jejb: added printk fix for resource_size_t object]
Signed-off-by: default avatarPravin Bathija <pbathija@amcc.com>
Acked-by: default avatar"Desai, Kashyap" <Kashyap.Desai@lsi.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 7729cb78

drivers/message/fusion/mptbase.c

+3 −3
Original line number Diff line number Diff line
@@ -1587,7 +1587,7 @@ mpt_mapresources(MPT_ADAPTER *ioc) 
{

	u8		__iomem *mem;

	int		 ii;

	unsigned long	 mem_phys;

	resource_size_t	 mem_phys;

	unsigned long	 port;

	u32		 msize;

	u32		 psize;
@@ -1677,8 +1677,8 @@ 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, (unsigned long long)mem_phys));



	ioc->mem_phys = mem_phys;

	ioc->chip = (SYSIF_REGS __iomem *)mem;