Re: sata_sil: Fix FIFO PCI Bus Arbitration KERNEL OOPS!

[Jens Axboe <axboe@suse.de>]

On Wed, Jun 08 2005, Sergio Navarro i Fajardo wrote:
> Hi!
> Kernel 2.6.12-rc5 includes patch references on mail:
> --
> Re: [RFT, PATCH] sata_sil corruption / lockup fix
> http://marc.theaimsgroup.com/?l=linux-ide&m=111818249232162&w=2
> [PATCH] sata_sil: Fix FIFO PCI Bus Arbitration
> --
> But, this patch produces an oops on load modules sata_sil on my system:
> sata_sil version 0.9

Please try with attached patch.

diff --git a/drivers/scsi/sata_sil.c b/drivers/scsi/sata_sil.c
--- a/drivers/scsi/sata_sil.c
+++ b/drivers/scsi/sata_sil.c
@@ -432,7 +432,13 @@ static int sil_init_one (struct pci_dev 
 		writeb(cls, mmio_base + SIL_FIFO_R0);
 		writeb(cls, mmio_base + SIL_FIFO_W0);
 		writeb(cls, mmio_base + SIL_FIFO_R1);
-		writeb(cls, mmio_base + SIL_FIFO_W2);
+		writeb(cls, mmio_base + SIL_FIFO_W1);
+		if (ent->driver_data == sil_3114) {
+			writeb(cls, mmio_base + SIL_FIFO_R2);
+			writeb(cls, mmio_base + SIL_FIFO_W2);
+			writeb(cls, mmio_base + SIL_FIFO_R3);
+			writeb(cls, mmio_base + SIL_FIFO_W3);
+		}
 	} else
 		printk(KERN_WARNING DRV_NAME "(%s): cache line size not set.  Driver may not function\n",
 			pci_name(pdev));

-- 
Jens Axboe