Re: [PATCH 1/3] sata_sil: add board ID for 3512

Re: [PATCH 1/3] sata_sil: add board ID for 3512

[Tejun Heo]

Tejun Heo wrote:
> 3512 is slightly different from 3112 errata-wise.  Differentiate it.
> 
> Signed-off-by: Tejun Heo <htejun@gmail.com>
> 

Wow, script mix up. Sorry. Please ignore this series. Will resend.

-- 
tejun

[PATCHSET, RESEND] sata_sil: R_ERR on DMA activate FIS errata workaround

[Tejun Heo]

Hello, Jeff.

This patchset implements workaround for 3512/3114 R_ERR on DMA
activate FIS workaround.  I've confirmed the lockup and workaround on
SiI3114 with ST3120026AS (FW 3.18) and Jon Kare confirmed it on 3512
with ST3200822AS and SP2504C.  This is also consistent with a number
of lock up reports from 3512/3114 users that I personally received and
seen on linux-ide.

Mod15Write workaround masks this errata and, without m15w workaround,
this errata triggers for wider range of drives (including 7200.7's).
This seems to be the main reason for overgrowth of m15w blacklist.

The m15w workaround was applied to 3512 and 3114 until 2.6.13.
2.6.14-rc1 removed it causing lockups for 3512/3114.  I think this is
a regression (and a very bothering one) and hope this fix can slip
into 2.6.16.

Thanks.

--
tejun

[PATCH 1/3] sata_sil: add board ID for 3512

[Tejun Heo]

3512 is slightly different from 3112 errata-wise.  Differentiate it.

Signed-off-by: Tejun Heo <htejun@gmail.com>

---

 drivers/scsi/sata_sil.c |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

57cb119319e74c1d39981cf94669b4d38f326628
diff --git a/drivers/scsi/sata_sil.c b/drivers/scsi/sata_sil.c
index 17f74d3..510c2e0 100644
--- a/drivers/scsi/sata_sil.c
+++ b/drivers/scsi/sata_sil.c
@@ -53,7 +53,8 @@ enum {
 
 	sil_3112		= 0,
 	sil_3112_m15w		= 1,
-	sil_3114		= 2,
+	sil_3512		= 2,
+	sil_3114		= 3,
 
 	SIL_FIFO_R0		= 0x40,
 	SIL_FIFO_W0		= 0x41,
@@ -90,7 +91,7 @@ static void sil_post_set_mode (struct at
 static const struct pci_device_id sil_pci_tbl[] = {
 	{ 0x1095, 0x3112, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112_m15w },
 	{ 0x1095, 0x0240, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112_m15w },
-	{ 0x1095, 0x3512, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112 },
+	{ 0x1095, 0x3512, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3512 },
 	{ 0x1095, 0x3114, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3114 },
 	{ 0x1002, 0x436e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112_m15w },
 	{ 0x1002, 0x4379, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112_m15w },
@@ -185,7 +186,8 @@ static const struct ata_port_info sil_po
 		.mwdma_mask	= 0x07,			/* mwdma0-2 */
 		.udma_mask	= 0x3f,			/* udma0-5 */
 		.port_ops	= &sil_ops,
-	}, /* sil_3112_15w - keep it sync'd w/ sil_3112 */
+	},
+	/* sil_3112_15w - keep it sync'd w/ sil_3112 */
 	{
 		.sht		= &sil_sht,
 		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
@@ -195,7 +197,18 @@ static const struct ata_port_info sil_po
 		.mwdma_mask	= 0x07,			/* mwdma0-2 */
 		.udma_mask	= 0x3f,			/* udma0-5 */
 		.port_ops	= &sil_ops,
-	}, /* sil_3114 */
+	},
+	/* sil_3512 */
+	{
+		.sht		= &sil_sht,
+		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
+				  ATA_FLAG_SRST | ATA_FLAG_MMIO,
+		.pio_mask	= 0x1f,			/* pio0-4 */
+		.mwdma_mask	= 0x07,			/* mwdma0-2 */
+		.udma_mask	= 0x3f,			/* udma0-5 */
+		.port_ops	= &sil_ops,
+	},
+	/* sil_3114 */
 	{
 		.sht		= &sil_sht,
 		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
-- 
1.2.1