[patch] couple of megaraid fixes

[patch] couple of megaraid fixes

[David Mosberger]

The attached patch has been in my tree for some time.  IIRC, Grant
Grundler sent it to me.  The old code is clearly broken: it still uses
virt_to_bus() and SCpnt->pid is declared as "unsigned long", so I'm
pretty sure this is an improvement. ;-)

	--david

diff -Nru a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
--- a/drivers/scsi/megaraid.c	Wed Apr  9 14:49:48 2003
+++ b/drivers/scsi/megaraid.c	Wed Apr  9 14:49:48 2003
@@ -2045,7 +2045,7 @@
 		return;
 
 	mbox = (mega_mailbox *) pScb->mboxData;
-	printk ("%u cmd:%x id:%x #scts:%x lba:%x addr:%x logdrv:%x #sg:%x\n",
+	printk ("%lu cmd:%x id:%x #scts:%x lba:%x addr:%x logdrv:%x #sg:%x\n",
 		pScb->SCpnt->pid,
 		mbox->cmd, mbox->cmdid, mbox->numsectors,
 		mbox->lba, mbox->xferaddr, mbox->logdrv, mbox->numsgelements);
@@ -3351,9 +3351,13 @@
 	mbox[0] = IS_BIOS_ENABLED;
 	mbox[2] = GET_BIOS;
 
-	mboxpnt->xferaddr = virt_to_bus ((void *) megacfg->mega_buffer);
+	mboxpnt->xferaddr = pci_map_single(megacfg->dev,
+				(void *) megacfg->mega_buffer, (2 * 1024L),
+				PCI_DMA_FROMDEVICE);
 
 	ret = megaIssueCmd (megacfg, mbox, NULL, 0);
+
+	pci_unmap_single(megacfg->dev, mboxpnt->xferaddr, 2 * 1024L, PCI_DMA_FROMDEVICE);
 
 	return (*(char *) megacfg->mega_buffer);
 }

Re: [patch] couple of megaraid fixes

[Christoph Hellwig]

On Wed, Apr 09, 2003 at 03:58:02PM -0700, David Mosberger wrote:
> The attached patch has been in my tree for some time.  IIRC, Grant
> Grundler sent it to me.  The old code is clearly broken: it still uses
> virt_to_bus() and SCpnt->pid is declared as "unsigned long", so I'm
> pretty sure this is an improvement. ;-)

Looks okay, but I really wonder where the promised complete rewrite
(megaraid2) is stuck..