Skip to contentSkip to conversation

libata-dev queue updated

SATA Joerg Sommrey 2 participants 12 messages Mar 2, 2005 – Mar 5, 2005 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore
#1 lore raw
In reply to a message not in the archive
Quoted 6 lines · Jeff Garzik

BK users:

bk pull bk://gkernel.bkbits.net/libata-dev-2.6

Patch:
http://www.kernel.org/pub/linux/kernel/people/jgarzik/libata/2.6.11-rc5-bk4-libata-dev1.patch.bz2

Still not usable here. The same errors as before when backing up:

Mar  2 21:09:50 bear kernel: ata1: status=0x51 { DriveReady SeekComplete Error }Mar  2 21:09:51 bear kernel: ata1: called with no error (51)!
Mar  2 21:09:51 bear kernel: ata1: status=0x51 { DriveReady SeekComplete Error }Mar  2 21:09:51 bear kernel: ata1: called with no error (51)!
Mar  2 21:09:51 bear kernel: ata1: status=0x51 { DriveReady SeekComplete Error }Mar  2 21:09:51 bear kernel: ata1: called with no error (51)!
Mar  2 21:09:51 bear kernel: ata1: status=0x51 { DriveReady SeekComplete Error }Mar  2 21:09:51 bear kernel: ata1: called with no error (51)!
Mar  2 21:09:51 bear kernel: ata1: status=0x51 { DriveReady SeekComplete Error }Mar  2 21:09:51 bear kernel: ata1: called with no error (51)!
Mar  2 21:09:51 bear kernel: SCSI error : <1 0 0 0> return code = 0x8000002
Mar  2 21:09:51 bear kernel: sdb: Current: sense key: Medium Error
Mar  2 21:09:51 bear kernel:     Additional sense: Unrecovered read error - auto reallocate failed
Mar  2 21:09:51 bear kernel: end_request: I/O error, dev sdb, sector 43099350
Mar  2 21:09:51 bear kernel: ata1: status=0x51 { DriveReady SeekComplete Error }Mar  2 21:09:51 bear kernel: ata1: called with no error (51)!
Mar  2 21:09:52 bear kernel: SCSI error : <1 0 0 0> return code = 0x8000002
Mar  2 21:09:52 bear kernel: sdb: Current: sense key: Medium Error
Mar  2 21:09:52 bear kernel:     Additional sense: Unrecovered read error - auto reallocate failed
Mar  2 21:09:52 bear kernel: end_request: I/O error, dev sdb, sector 43099358
Mar  2 21:09:52 bear kernel: raid1: Disk failure on sdb2, disabling device.
Mar  2 21:09:52 bear kernel: ^IOperation continuing on 1 devices
Mar  2 21:09:52 bear kernel: raid1: sdb2: rescheduling sector 2904720
Mar  2 21:09:52 bear kernel: ata1: status=0x51 { DriveReady SeekComplete Error }Mar  2 21:09:52 bear kernel: ata1: called with no error (51)!
Mar  2 21:09:52 bear kernel: SCSI error : <1 0 0 0> return code = 0x8000002
Mar  2 21:09:52 bear kernel: sdb: Current: sense key: Medium Error
Mar  2 21:09:52 bear kernel:     Additional sense: Unrecovered read error - auto reallocate failed

Using Promise SATA150 TX4 / md-raid1 / lvm / reiserfs

-jo

Signature · 1 line
-rw-r--r--  1 jo users 63 2005-03-02 21:14 /home/jo/.signature
#3 lore raw
Quoted 9 lines · Jeff Garzik
Quoted 6 lines · Joerg Sommrey
Quoted 2 lines · Jeff Garzik

Patch:
http://www.kernel.org/pub/linux/kernel/people/jgarzik/libata/2.6.11-rc5-bk4-libata-dev1.patch.bz2

Still not usable here. The same errors as before when backing up:

Please try 2.6.11 without any patches.

Plain 2.6.11 doesn't work either. All of 2.6.10-ac11, 2.6.11-rc5, 2.6.11-rc5 + 2.6.11-rc5-bk4-libata-dev1.patch and 2.6.11 fail with the same symptoms.

Reverting to stable 2.6.10-ac8 :-)

-jo

Signature · 1 line
-rw-r--r--  1 jo users 63 2005-03-03 20:23 /home/jo/.signature
#4 lore raw
Quoted 12 lines · Joerg Sommrey
Quoted 10 lines · Jeff Garzik
Quoted 7 lines · Joerg Sommrey
Quoted 2 lines · Jeff Garzik

Patch:
http://www.kernel.org/pub/linux/kernel/people/jgarzik/libata/2.6.11-rc5-bk4-libata-dev1.patch.bz2

Still not usable here. The same errors as before when backing up:

Quoted 7 lines
Quoted 1 line

Please try 2.6.11 without any patches.

Plain 2.6.11 doesn't work either. All of 2.6.10-ac11, 2.6.11-rc5, 2.6.11-rc5 + 2.6.11-rc5-bk4-libata-dev1.patch and 2.6.11 fail with the same symptoms.

Reverting to stable 2.6.10-ac8 :-)

Does reverting the attached patch in 2.6.11 (apply with patch -R) fix things?

Jeff

drivers/scsi/sata_promise.c +18 -4
diff -Nru a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c
@@ -156,10 +156,18 @@
 	  board_2037x },
 	{ PCI_VENDOR_ID_PROMISE, 0x3376, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
 	  board_2037x },
+	{ PCI_VENDOR_ID_PROMISE, 0x3574, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+	  board_2037x },
+	{ PCI_VENDOR_ID_PROMISE, 0x3d75, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+	  board_2037x },
+
 	{ PCI_VENDOR_ID_PROMISE, 0x3318, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
 	  board_20319 },
 	{ PCI_VENDOR_ID_PROMISE, 0x3319, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
 	  board_20319 },
+	{ PCI_VENDOR_ID_PROMISE, 0x3d18, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+	  board_20319 },
+
 	{ }	/* terminate list */
 };
 
@@ -406,9 +414,11 @@
 		return IRQ_NONE;
 	}
 
-        spin_lock(&host_set->lock);
+	spin_lock(&host_set->lock);
 
-        for (i = 0; i < host_set->n_ports; i++) {
+	writel(mask, mmio_base + PDC_INT_SEQMASK);
+
+	for (i = 0; i < host_set->n_ports; i++) {
 		VPRINTK("port %u\n", i);
 		ap = host_set->ports[i];
 		tmp = mask & (1 << (i + 1));
@@ -546,6 +556,7 @@
 	unsigned long base;
 	void *mmio_base;
 	unsigned int board_idx = (unsigned int) ent->driver_data;
+	int pci_dev_busy = 0;
 	int rc;
 
 	if (!printed_version++)
@@ -560,8 +571,10 @@
 		return rc;
 
 	rc = pci_request_regions(pdev, DRV_NAME);
-	if (rc)
+	if (rc) {
+		pci_dev_busy = 1;
 		goto err_out;
+	}
 
 	rc = pci_set_dma_mask(pdev, ATA_DMA_MASK);
 	if (rc)
@@ -640,7 +653,8 @@
 err_out_regions:
 	pci_release_regions(pdev);
 err_out:
-	pci_disable_device(pdev);
+	if (!pci_dev_busy)
+		pci_disable_device(pdev);
 	return rc;
 }
 
#5 lore raw
Quoted 15 lines · Jeff Garzik
Quoted 14 lines · Joerg Sommrey
Quoted 11 lines · Jeff Garzik
Quoted 7 lines · Joerg Sommrey
Quoted 2 lines · Jeff Garzik

Patch:
http://www.kernel.org/pub/linux/kernel/people/jgarzik/libata/2.6.11-rc5-bk4-libata-dev1.patch.bz2

Still not usable here. The same errors as before when backing up:

Please try 2.6.11 without any patches.

Quoted 9 lines
Quoted 5 lines

Plain 2.6.11 doesn't work either. All of 2.6.10-ac11, 2.6.11-rc5, 2.6.11-rc5 + 2.6.11-rc5-bk4-libata-dev1.patch and 2.6.11 fail with the same symptoms.

Reverting to stable 2.6.10-ac8 :-)

Does reverting the attached patch in 2.6.11 (apply with patch -R) fix things?

Still the same with this patch reverted.
-jo

Signature · 1 line
-rw-r--r--  1 jo users 63 2005-03-04 07:32 /home/jo/.signature
#6 lore raw
Quoted 25 lines · Joerg Sommrey
Quoted 23 lines · Jeff Garzik
Quoted 21 lines · Joerg Sommrey
Quoted 6 lines · Jeff Garzik
Quoted 3 lines · Joerg Sommrey

Jeff Garzik wrote:

Quoted 7 lines
Quoted 5 lines
Quoted 2 lines

Patch:
http://www.kernel.org/pub/linux/kernel/people/jgarzik/libata/2.6.11-rc5-bk4-libata-dev1.patch.bz2

Still not usable here. The same errors as before when backing up:

Please try 2.6.11 without any patches.

Plain 2.6.11 doesn't work either. All of 2.6.10-ac11, 2.6.11-rc5, 2.6.11-rc5 + 2.6.11-rc5-bk4-libata-dev1.patch and 2.6.11 fail with the same symptoms.

Quoted 7 lines
Quoted 4 lines
Quoted 1 line

Reverting to stable 2.6.10-ac8 :-)

Does reverting the attached patch in 2.6.11 (apply with patch -R) fix things?

Still the same with this patch reverted.

Does reverting the attached patch in 2.6.11 fix things? (apply with patch -R)

This patch reverts the entire libata back to 2.6.10.

Jeff

drivers/scsi/ahci.c +28 -13
diff -Nru a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
@@ -179,6 +179,7 @@
 static void ahci_host_stop(struct ata_host_set *host_set);
 static void ahci_qc_prep(struct ata_queued_cmd *qc);
 static u8 ahci_check_status(struct ata_port *ap);
+static u8 ahci_check_err(struct ata_port *ap);
 static inline int ahci_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc);
 
 static Scsi_Host_Template ahci_sht = {
@@ -204,6 +205,8 @@
 	.port_disable		= ata_port_disable,
 
 	.check_status		= ahci_check_status,
+	.check_altstatus	= ahci_check_status,
+	.check_err		= ahci_check_err,
 	.dev_select		= ata_noop_dev_select,
 
 	.phy_reset		= ahci_phy_reset,
@@ -239,9 +242,19 @@
 
 static struct pci_device_id ahci_pci_tbl[] = {
 	{ PCI_VENDOR_ID_INTEL, 0x2652, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-	  board_ahci },
+	  board_ahci }, /* ICH6 */
 	{ PCI_VENDOR_ID_INTEL, 0x2653, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-	  board_ahci },
+	  board_ahci }, /* ICH6M */
+	{ PCI_VENDOR_ID_INTEL, 0x27c1, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+	  board_ahci }, /* ICH7 */
+	{ PCI_VENDOR_ID_INTEL, 0x27c5, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+	  board_ahci }, /* ICH7M */
+	{ PCI_VENDOR_ID_INTEL, 0x27c2, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+	  board_ahci }, /* ICH7R */
+	{ PCI_VENDOR_ID_INTEL, 0x27c3, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+	  board_ahci }, /* ICH7R */
+	{ PCI_VENDOR_ID_AL, 0x5288, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+	  board_ahci }, /* ULi M5288 */
 	{ }	/* terminate list */
 };
 
@@ -442,6 +455,13 @@
 	return readl(mmio + PORT_TFDATA) & 0xFF;
 }
 
+static u8 ahci_check_err(struct ata_port *ap)
+{
+	void *mmio = (void *) ap->ioaddr.cmd_addr;
+
+	return (readl(mmio + PORT_TFDATA) >> 8) & 0xFF;
+}
+
 static void ahci_fill_sg(struct ata_queued_cmd *qc)
 {
 	struct ahci_port_priv *pp = qc->ap->private_data;
@@ -509,15 +529,6 @@
 	ahci_fill_sg(qc);
 }
 
-static inline void ahci_dma_complete (struct ata_port *ap,
-                                     struct ata_queued_cmd *qc,
-				     int have_err)
-{
-	/* get drive status; clear intr; complete txn */
-	ata_qc_complete(ata_qc_from_tag(ap, ap->active_tag),
-			have_err ? ATA_ERR : 0);
-}
-
 static void ahci_intr_error(struct ata_port *ap, u32 irq_stat)
 {
 	void *mmio = ap->host_set->mmio_base;
@@ -939,6 +950,7 @@
 	unsigned long base;
 	void *mmio_base;
 	unsigned int board_idx = (unsigned int) ent->driver_data;
+	int pci_dev_busy = 0;
 	int rc;
 
 	VPRINTK("ENTER\n");
@@ -951,8 +963,10 @@
 		return rc;
 
 	rc = pci_request_regions(pdev, DRV_NAME);
-	if (rc)
+	if (rc) {
+		pci_dev_busy = 1;
 		goto err_out;
+	}
 
 	pci_enable_intx(pdev);
 
@@ -1014,7 +1028,8 @@
 err_out_regions:
 	pci_release_regions(pdev);
 err_out:
-	pci_disable_device(pdev);
+	if (!pci_dev_busy)
+		pci_disable_device(pdev);
 	return rc;
 }
 
drivers/scsi/ata_piix.c +19 -0
diff -Nru a/drivers/scsi/ata_piix.c b/drivers/scsi/ata_piix.c
@@ -60,6 +60,7 @@
 	piix4_pata		= 2,
 	ich6_sata		= 3,
 	ich6_sata_rm		= 4,
+	ich7_sata		= 5,
 };
 
 static int piix_init_one (struct pci_dev *pdev,
@@ -90,6 +91,8 @@
 	{ 0x8086, 0x2651, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata },
 	{ 0x8086, 0x2652, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_rm },
 	{ 0x8086, 0x2653, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_rm },
+	{ 0x8086, 0x27c0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich7_sata },
+	{ 0x8086, 0x27c4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich7_sata },
 
 	{ }	/* terminate list */
 };
@@ -135,6 +138,8 @@
 
 	.bmdma_setup		= ata_bmdma_setup,
 	.bmdma_start		= ata_bmdma_start,
+	.bmdma_stop		= ata_bmdma_stop,
+	.bmdma_status		= ata_bmdma_status,
 	.qc_prep		= ata_qc_prep,
 	.qc_issue		= ata_qc_issue_prot,
 
@@ -160,6 +165,8 @@
 
 	.bmdma_setup		= ata_bmdma_setup,
 	.bmdma_start		= ata_bmdma_start,
+	.bmdma_stop		= ata_bmdma_stop,
+	.bmdma_status		= ata_bmdma_status,
 	.qc_prep		= ata_qc_prep,
 	.qc_issue		= ata_qc_issue_prot,
 
@@ -226,6 +233,18 @@
 	},
 
 	/* ich6_sata_rm */
+	{
+		.sht		= &piix_sht,
+		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_SRST |
+				  PIIX_FLAG_COMBINED | PIIX_FLAG_CHECKINTR |
+				  ATA_FLAG_SLAVE_POSS | PIIX_FLAG_AHCI,
+		.pio_mask	= 0x1f,	/* pio0-4 */
+		.mwdma_mask	= 0x07, /* mwdma0-2 */
+		.udma_mask	= 0x7f,	/* udma0-6 */
+		.port_ops	= &piix_sata_ops,
+	},
+
+	/* ich7_sata */
 	{
 		.sht		= &piix_sht,
 		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_SRST |
drivers/scsi/libata-core.c +270 -87

598 lines not on this page · raw message

drivers/scsi/libata-scsi.c +28 -16

127 lines not on this page · raw message

drivers/scsi/libata.h +2 -0
diff -Nru a/drivers/scsi/libata.h b/drivers/scsi/libata.h
@@ -37,7 +37,9 @@
 /* libata-core.c */
 extern struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap,
 				      struct ata_device *dev);
+extern void ata_qc_free(struct ata_queued_cmd *qc);
 extern int ata_qc_issue(struct ata_queued_cmd *qc);
+extern int ata_check_atapi_dma(struct ata_queued_cmd *qc);
 extern void ata_dev_select(struct ata_port *ap, unsigned int device,
                            unsigned int wait, unsigned int can_sleep);
 extern void ata_tf_to_host_nolock(struct ata_port *ap, struct ata_taskfile *tf);
drivers/scsi/sata_nv.c +42 -13

163 lines not on this page · raw message

drivers/scsi/sata_promise.c +18 -4
diff -Nru a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c
@@ -156,10 +156,18 @@
 	  board_2037x },
 	{ PCI_VENDOR_ID_PROMISE, 0x3376, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
 	  board_2037x },
+	{ PCI_VENDOR_ID_PROMISE, 0x3574, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+	  board_2037x },
+	{ PCI_VENDOR_ID_PROMISE, 0x3d75, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+	  board_2037x },
+
 	{ PCI_VENDOR_ID_PROMISE, 0x3318, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
 	  board_20319 },
 	{ PCI_VENDOR_ID_PROMISE, 0x3319, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
 	  board_20319 },
+	{ PCI_VENDOR_ID_PROMISE, 0x3d18, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+	  board_20319 },
+
 	{ }	/* terminate list */
 };
 
@@ -406,9 +414,11 @@
 		return IRQ_NONE;
 	}
 
-        spin_lock(&host_set->lock);
+	spin_lock(&host_set->lock);
 
-        for (i = 0; i < host_set->n_ports; i++) {
+	writel(mask, mmio_base + PDC_INT_SEQMASK);
+
+	for (i = 0; i < host_set->n_ports; i++) {
 		VPRINTK("port %u\n", i);
 		ap = host_set->ports[i];
 		tmp = mask & (1 << (i + 1));
@@ -546,6 +556,7 @@
 	unsigned long base;
 	void *mmio_base;
 	unsigned int board_idx = (unsigned int) ent->driver_data;
+	int pci_dev_busy = 0;
 	int rc;
 
 	if (!printed_version++)
@@ -560,8 +571,10 @@
 		return rc;
 
 	rc = pci_request_regions(pdev, DRV_NAME);
-	if (rc)
+	if (rc) {
+		pci_dev_busy = 1;
 		goto err_out;
+	}
 
 	rc = pci_set_dma_mask(pdev, ATA_DMA_MASK);
 	if (rc)
@@ -640,7 +653,8 @@
 err_out_regions:
 	pci_release_regions(pdev);
 err_out:
-	pci_disable_device(pdev);
+	if (!pci_dev_busy)
+		pci_disable_device(pdev);
 	return rc;
 }
 
drivers/scsi/sata_qstor.c new file +700 -0

700 lines not on this page · raw message

drivers/scsi/sata_sil.c +12 -2
diff -Nru a/drivers/scsi/sata_sil.c b/drivers/scsi/sata_sil.c
@@ -71,6 +71,8 @@
 	{ 0x1095, 0x0240, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112 },
 	{ 0x1095, 0x3512, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112 },
 	{ 0x1095, 0x3114, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3114 },
+	{ 0x1002, 0x436e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112 },
+	{ 0x1002, 0x4379, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112 },
 	{ }	/* terminate list */
 };
 
@@ -84,10 +86,12 @@
 	{ "ST330013AS",		SIL_QUIRK_MOD15WRITE },
 	{ "ST340017AS",		SIL_QUIRK_MOD15WRITE },
 	{ "ST360015AS",		SIL_QUIRK_MOD15WRITE },
+	{ "ST380013AS",		SIL_QUIRK_MOD15WRITE },
 	{ "ST380023AS",		SIL_QUIRK_MOD15WRITE },
 	{ "ST3120023AS",	SIL_QUIRK_MOD15WRITE },
 	{ "ST3160023AS",	SIL_QUIRK_MOD15WRITE },
 	{ "ST3120026AS",	SIL_QUIRK_MOD15WRITE },
+	{ "ST3200822AS",	SIL_QUIRK_MOD15WRITE },
 	{ "ST340014ASL",	SIL_QUIRK_MOD15WRITE },
 	{ "ST360014ASL",	SIL_QUIRK_MOD15WRITE },
 	{ "ST380011ASL",	SIL_QUIRK_MOD15WRITE },
@@ -135,6 +139,8 @@
 	.post_set_mode		= sil_post_set_mode,
 	.bmdma_setup            = ata_bmdma_setup,
 	.bmdma_start            = ata_bmdma_start,
+	.bmdma_stop		= ata_bmdma_stop,
+	.bmdma_status		= ata_bmdma_status,
 	.qc_prep		= ata_qc_prep,
 	.qc_issue		= ata_qc_issue_prot,
 	.eng_timeout		= ata_eng_timeout,
@@ -332,6 +338,7 @@
 	void *mmio_base;
 	int rc;
 	unsigned int i;
+	int pci_dev_busy = 0;
 	u32 tmp, irq_mask;
 
 	if (!printed_version++)
@@ -346,8 +353,10 @@
 		return rc;
 
 	rc = pci_request_regions(pdev, DRV_NAME);
-	if (rc)
+	if (rc) {
+		pci_dev_busy = 1;
 		goto err_out;
+	}
 
 	rc = pci_set_dma_mask(pdev, ATA_DMA_MASK);
 	if (rc)
@@ -434,7 +443,8 @@
 err_out_regions:
 	pci_release_regions(pdev);
 err_out:
-	pci_disable_device(pdev);
+	if (!pci_dev_busy)
+		pci_disable_device(pdev);
 	return rc;
 }
 
drivers/scsi/sata_sis.c +8 -2
diff -Nru a/drivers/scsi/sata_sis.c b/drivers/scsi/sata_sis.c
@@ -102,6 +102,8 @@
 	.phy_reset		= sata_phy_reset,
 	.bmdma_setup            = ata_bmdma_setup,
 	.bmdma_start            = ata_bmdma_start,
+	.bmdma_stop		= ata_bmdma_stop,
+	.bmdma_status		= ata_bmdma_status,
 	.qc_prep		= ata_qc_prep,
 	.qc_issue		= ata_qc_issue_prot,
 	.eng_timeout		= ata_eng_timeout,
@@ -200,14 +202,17 @@
 	int rc;
 	u32 genctl;
 	struct ata_port_info *ppi;
+	int pci_dev_busy = 0;
 
 	rc = pci_enable_device(pdev);
 	if (rc)
 		return rc;
 
 	rc = pci_request_regions(pdev, DRV_NAME);
-	if (rc)
+	if (rc) {
+		pci_dev_busy = 1;
 		goto err_out;
+	}
 
 	rc = pci_set_dma_mask(pdev, ATA_DMA_MASK);
 	if (rc)
@@ -259,7 +264,8 @@
 	pci_release_regions(pdev);
 
 err_out:
-	pci_disable_device(pdev);
+	if (!pci_dev_busy)
+		pci_disable_device(pdev);
 	return rc;
 
 }
drivers/scsi/sata_svw.c +8 -2
diff -Nru a/drivers/scsi/sata_svw.c b/drivers/scsi/sata_svw.c
@@ -301,6 +301,8 @@
 	.phy_reset		= sata_phy_reset,
 	.bmdma_setup		= k2_bmdma_setup_mmio,
 	.bmdma_start		= k2_bmdma_start_mmio,
+	.bmdma_stop		= ata_bmdma_stop,
+	.bmdma_status		= ata_bmdma_status,
 	.qc_prep		= ata_qc_prep,
 	.qc_issue		= ata_qc_issue_prot,
 	.eng_timeout		= ata_eng_timeout,
@@ -338,6 +340,7 @@
 	struct ata_probe_ent *probe_ent = NULL;
 	unsigned long base;
 	void *mmio_base;
+	int pci_dev_busy = 0;
 	int rc;
 
 	if (!printed_version++)
@@ -359,8 +362,10 @@
 
 	/* Request PCI regions */
 	rc = pci_request_regions(pdev, DRV_NAME);
-	if (rc)
+	if (rc) {
+		pci_dev_busy = 1;
 		goto err_out;
+	}
 
 	rc = pci_set_dma_mask(pdev, ATA_DMA_MASK);
 	if (rc)
@@ -433,7 +438,8 @@
 err_out_regions:
 	pci_release_regions(pdev);
 err_out:
-	pci_disable_device(pdev);
+	if (!pci_dev_busy)
+		pci_disable_device(pdev);
 	return rc;
 }
 
drivers/scsi/sata_sx4.c +6 -2
diff -Nru a/drivers/scsi/sata_sx4.c b/drivers/scsi/sata_sx4.c
@@ -1366,6 +1366,7 @@
 	void *mmio_base, *dimm_mmio = NULL;
 	struct pdc_host_priv *hpriv = NULL;
 	unsigned int board_idx = (unsigned int) ent->driver_data;
+	int pci_dev_busy = 0;
 	int rc;
 
 	if (!printed_version++)
@@ -1380,8 +1381,10 @@
 		return rc;
 
 	rc = pci_request_regions(pdev, DRV_NAME);
-	if (rc)
+	if (rc) {
+		pci_dev_busy = 1;
 		goto err_out;
+	}
 
 	rc = pci_set_dma_mask(pdev, ATA_DMA_MASK);
 	if (rc)
@@ -1471,7 +1474,8 @@
 err_out_regions:
 	pci_release_regions(pdev);
 err_out:
-	pci_disable_device(pdev);
+	if (!pci_dev_busy)
+		pci_disable_device(pdev);
 	return rc;
 }
 
drivers/scsi/sata_uli.c +31 -30

148 lines not on this page · raw message

drivers/scsi/sata_via.c +157 -56

292 lines not on this page · raw message

drivers/scsi/sata_vsc.c +8 -2
diff -Nru a/drivers/scsi/sata_vsc.c b/drivers/scsi/sata_vsc.c
@@ -217,6 +217,8 @@
 	.phy_reset		= sata_phy_reset,
 	.bmdma_setup            = ata_bmdma_setup,
 	.bmdma_start            = ata_bmdma_start,
+	.bmdma_stop		= ata_bmdma_stop,
+	.bmdma_status		= ata_bmdma_status,
 	.qc_prep		= ata_qc_prep,
 	.qc_issue		= ata_qc_issue_prot,
 	.eng_timeout		= ata_eng_timeout,
@@ -255,6 +257,7 @@
 	static int printed_version;
 	struct ata_probe_ent *probe_ent = NULL;
 	unsigned long base;
+	int pci_dev_busy = 0;
 	void *mmio_base;
 	int rc;
 
@@ -274,8 +277,10 @@
 	}
 
 	rc = pci_request_regions(pdev, DRV_NAME);
-	if (rc)
+	if (rc) {
+		pci_dev_busy = 1;
 		goto err_out;
+	}
 
 	/*
 	 * Use 32 bit DMA mask, because 64 bit address support is poor.
@@ -352,7 +357,8 @@
 err_out_regions:
 	pci_release_regions(pdev);
 err_out:
-	pci_disable_device(pdev);
+	if (!pci_dev_busy)
+		pci_disable_device(pdev);
 	return rc;
 }
 
include/linux/ata.h +2 -0
diff -Nru a/include/linux/ata.h b/include/linux/ata.h
@@ -123,6 +123,8 @@
 	ATA_CMD_PIO_WRITE_EXT	= 0x34,
 	ATA_CMD_SET_FEATURES	= 0xEF,
 	ATA_CMD_PACKET		= 0xA0,
+	ATA_CMD_VERIFY		= 0x40,
+	ATA_CMD_VERIFY_EXT	= 0x42,
 
 	/* SETFEATURES stuff */
 	SETFEATURES_XFER	= 0x03,
include/linux/libata.h +11 -57

120 lines not on this page · raw message

#7 lore raw
Quoted 33 lines · Jeff Garzik
Quoted 32 lines · Joerg Sommrey
Quoted 28 lines · Jeff Garzik
Quoted 15 lines · Joerg Sommrey
Quoted 12 lines · Jeff Garzik
Quoted 8 lines · Joerg Sommrey
Quoted 2 lines · Jeff Garzik

Patch:
http://www.kernel.org/pub/linux/kernel/people/jgarzik/libata/2.6.11-rc5-bk4-libata-dev1.patch.bz2

Still not usable here. The same errors as before when backing up:

Quoted 7 lines
Quoted 1 line

Please try 2.6.11 without any patches.

Plain 2.6.11 doesn't work either. All of 2.6.10-ac11, 2.6.11-rc5, 2.6.11-rc5 + 2.6.11-rc5-bk4-libata-dev1.patch and 2.6.11 fail with the same symptoms.

Reverting to stable 2.6.10-ac8 :-)

Does reverting the attached patch in 2.6.11 (apply with patch -R) fix things?

Quoted 7 lines
Quoted 1 line

Still the same with this patch reverted.

Does reverting the attached patch in 2.6.11 fix things? (apply with patch -R)

This patch reverts the entire libata back to 2.6.10.

I'm confused. Still the same with everything reverted. What shall I do now?

-jo

Signature · 1 line
-rw-r--r--  1 jo users 63 2005-03-04 18:44 /home/jo/.signature
#8 lore raw
Quoted 42 lines · Joerg Sommrey
Quoted 40 lines · Jeff Garzik
Quoted 37 lines · Joerg Sommrey
Quoted 23 lines · Jeff Garzik
Quoted 20 lines · Joerg Sommrey
Quoted 15 lines · Jeff Garzik
Quoted 9 lines · Joerg Sommrey
Quoted 2 lines · Jeff Garzik

Patch:
http://www.kernel.org/pub/linux/kernel/people/jgarzik/libata/2.6.11-rc5-bk4-libata-dev1.patch.bz2

Still not usable here. The same errors as before when backing up:

Please try 2.6.11 without any patches.

Quoted 8 lines
Quoted 5 lines

Plain 2.6.11 doesn't work either. All of 2.6.10-ac11, 2.6.11-rc5, 2.6.11-rc5 + 2.6.11-rc5-bk4-libata-dev1.patch and 2.6.11 fail with the same symptoms.

Reverting to stable 2.6.10-ac8 :-)

Does reverting the attached patch in 2.6.11 (apply with patch -R) fix things?

Still the same with this patch reverted.

Quoted 7 lines
Quoted 4 lines

Does reverting the attached patch in 2.6.11 fix things? (apply with patch -R)

This patch reverts the entire libata back to 2.6.10.

I'm confused. Still the same with everything reverted. What shall I do now?

Well, first, thanks for your patience in narrowing this down.

This means we have eliminated libata as a problem source, but we still have the rest of the kernel go to through :)

Try disabling ACPI with 'acpi=off' or 'pci=biosirq' to see if that fixes things.

Jeff

#9 lore raw
Quoted 53 lines · Jeff Garzik
Quoted 43 lines · Joerg Sommrey
Quoted 41 lines · Jeff Garzik
Quoted 38 lines · Joerg Sommrey
Quoted 23 lines · Jeff Garzik
Quoted 20 lines · Joerg Sommrey
Quoted 15 lines · Jeff Garzik
Quoted 9 lines · Joerg Sommrey
Quoted 2 lines · Jeff Garzik

Patch:
http://www.kernel.org/pub/linux/kernel/people/jgarzik/libata/2.6.11-rc5-bk4-libata-dev1.patch.bz2

Still not usable here. The same errors as before when backing up:

Please try 2.6.11 without any patches.

Quoted 9 lines
Quoted 5 lines

Plain 2.6.11 doesn't work either. All of 2.6.10-ac11, 2.6.11-rc5, 2.6.11-rc5 + 2.6.11-rc5-bk4-libata-dev1.patch and 2.6.11 fail with the same symptoms.

Reverting to stable 2.6.10-ac8 :-)

Does reverting the attached patch in 2.6.11 (apply with patch -R) fix things?

Still the same with this patch reverted.

Quoted 8 lines
Quoted 5 lines

Does reverting the attached patch in 2.6.11 fix things? (apply with patch -R)

This patch reverts the entire libata back to 2.6.10.

I'm confused. Still the same with everything reverted. What shall I do now?

Quoted 8 lines

Well, first, thanks for your patience in narrowing this down.

This means we have eliminated libata as a problem source, but we still have the rest of the kernel go to through :)

Try disabling ACPI with 'acpi=off' or 'pci=biosirq' to see if that fixes things.

I tried both settings with plain 2.6.11. Almost the same results, in my impression apci=off causes the failure to appear even faster.

-jo

Signature · 1 line
-rw-r--r--  1 jo users 63 2005-03-04 20:54 /home/jo/.signature
#10 lore raw
Quoted 63 lines · Joerg Sommrey
Quoted 61 lines · Jeff Garzik
Quoted 49 lines · Joerg Sommrey
Quoted 46 lines · Jeff Garzik
Quoted 42 lines · Joerg Sommrey
Quoted 27 lines · Jeff Garzik
Quoted 23 lines · Joerg Sommrey
Quoted 17 lines · Jeff Garzik
Quoted 10 lines · Joerg Sommrey
Quoted 2 lines · Jeff Garzik

Patch:
http://www.kernel.org/pub/linux/kernel/people/jgarzik/libata/2.6.11-rc5-bk4-libata-dev1.patch.bz2

Still not usable here. The same errors as before when backing up:

Please try 2.6.11 without any patches.

Quoted 8 lines
Quoted 5 lines

Plain 2.6.11 doesn't work either. All of 2.6.10-ac11, 2.6.11-rc5, 2.6.11-rc5 + 2.6.11-rc5-bk4-libata-dev1.patch and 2.6.11 fail with the same symptoms.

Reverting to stable 2.6.10-ac8 :-)

Does reverting the attached patch in 2.6.11 (apply with patch -R) fix things?

Still the same with this patch reverted.

Quoted 7 lines
Quoted 4 lines

Does reverting the attached patch in 2.6.11 fix things? (apply with patch -R)

This patch reverts the entire libata back to 2.6.10.

I'm confused. Still the same with everything reverted. What shall I do now?

Well, first, thanks for your patience in narrowing this down.

Quoted 7 lines
Quoted 4 lines

This means we have eliminated libata as a problem source, but we still have the rest of the kernel go to through :)

Try disabling ACPI with 'acpi=off' or 'pci=biosirq' to see if that fixes things.

I tried both settings with plain 2.6.11. Almost the same results, in my impression apci=off causes the failure to appear even faster.

Just to make sure I have things right, please tell me if this is correct:

* 2.6.10 vanilla works

* 2.6.11 vanilla does not work

* 2.6.11 vanilla + 2.6.10 libata does not work
[2.6.10 libata == reverting all libata changes]

Is that all correct?

Jeff

#12 lore raw
In reply to Joerg Sommrey
Quoted 99 lines · Joerg Sommrey
Quoted 79 lines · Jeff Garzik
Quoted 69 lines · Joerg Sommrey
Quoted 67 lines · Jeff Garzik
Quoted 51 lines · Joerg Sommrey
Quoted 48 lines · Jeff Garzik
Quoted 44 lines · Joerg Sommrey
Quoted 32 lines · Jeff Garzik
Quoted 28 lines · Joerg Sommrey
Quoted 10 lines · Jeff Garzik
Quoted 5 lines · Joerg Sommrey

Jeff Garzik wrote:

Quoted 7 lines
Quoted 5 lines
Quoted 2 lines

Patch:
http://www.kernel.org/pub/linux/kernel/people/jgarzik/libata/2.6.11-rc5-bk4-libata-dev1.patch.bz2

Still not usable here. The same errors as before when backing up:

Please try 2.6.11 without any patches.

Plain 2.6.11 doesn't work either. All of 2.6.10-ac11, 2.6.11-rc5, 2.6.11-rc5 + 2.6.11-rc5-bk4-libata-dev1.patch and 2.6.11 fail with the
same symptoms.

Quoted 5 lines
Quoted 1 line

Reverting to stable 2.6.10-ac8 :-)

Does reverting the attached patch in 2.6.11 (apply with patch -R) fix things?

Still the same with this patch reverted.

Quoted 8 lines
Quoted 5 lines

Does reverting the attached patch in 2.6.11 fix things? (apply with patch -R)

This patch reverts the entire libata back to 2.6.10.

I'm confused. Still the same with everything reverted. What shall I do now?

Well, first, thanks for your patience in narrowing this down.

This means we have eliminated libata as a problem source, but we still have the rest of the kernel go to through :)

Quoted 6 lines
Quoted 3 lines

Try disabling ACPI with 'acpi=off' or 'pci=biosirq' to see if that fixes things.

I tried both settings with plain 2.6.11. Almost the same results, in my impression apci=off causes the failure to appear even faster.

Just to make sure I have things right, please tell me if this is correct:

Quoted 8 lines

* 2.6.10 vanilla works

* 2.6.11 vanilla does not work

* 2.6.11 vanilla + 2.6.10 libata does not work
[2.6.10 libata == reverting all libata changes]

Is that all correct?

Thanks for asking these precise questions. After double-checking everything I found a typo in my configuration that changes things a bit. I repeated some tests and the correct answers are now:
* 2.6.10 vanilla works
* 2.6.10-ac8 works
* 2.6.10-ac11 does not work
* 2.6.11 vanilla does not work
* 2.6.11 w/o promise.patch does not work
* 2.6.11 + 2.6.10 libata works!

Quoted 2 lines

This looks much more consistent to me but brings the case back to libata.

After one more test using 2.6.11 + 2.6.10 libata I got some errors. They are different, they end after some time and they don't lock the system:

Mar  4 23:15:00 bear kernel: ata1: status=0x51 { DriveReady SeekComplete Error }Mar  4 23:15:00 bear kernel: sdb: Current: sense key: Recovered Error
Mar  4 23:15:00 bear kernel:     ASC=0x26 <<vendor>> ASCQ=0xc0
Mar  4 23:15:00 bear kernel: FMK, ILI

Got 1900 of these in 90 seconds and silence afterwards. Maybe that helps. I'll keep this kernel running and watch it.

-jo

Signature · 1 line
-rw-r--r--  1 jo users 63 2005-03-04 23:12 /home/jo/.signature
#11 lore raw
In reply to Jeff Garzik
Quoted 79 lines · Jeff Garzik
Quoted 69 lines · Joerg Sommrey
Quoted 67 lines · Jeff Garzik
Quoted 51 lines · Joerg Sommrey
Quoted 48 lines · Jeff Garzik
Quoted 44 lines · Joerg Sommrey
Quoted 32 lines · Jeff Garzik
Quoted 28 lines · Joerg Sommrey
Quoted 10 lines · Jeff Garzik
Quoted 5 lines · Joerg Sommrey

Jeff Garzik wrote:

Quoted 7 lines
Quoted 5 lines
Quoted 2 lines

Patch:
http://www.kernel.org/pub/linux/kernel/people/jgarzik/libata/2.6.11-rc5-bk4-libata-dev1.patch.bz2

Still not usable here. The same errors as before when backing up:

Please try 2.6.11 without any patches.

Plain 2.6.11 doesn't work either. All of 2.6.10-ac11, 2.6.11-rc5, 2.6.11-rc5 + 2.6.11-rc5-bk4-libata-dev1.patch and 2.6.11 fail with the
same symptoms.

Quoted 5 lines
Quoted 1 line

Reverting to stable 2.6.10-ac8 :-)

Does reverting the attached patch in 2.6.11 (apply with patch -R) fix things?

Still the same with this patch reverted.

Quoted 8 lines
Quoted 5 lines

Does reverting the attached patch in 2.6.11 fix things? (apply with patch -R)

This patch reverts the entire libata back to 2.6.10.

I'm confused. Still the same with everything reverted. What shall I do now?

Well, first, thanks for your patience in narrowing this down.

This means we have eliminated libata as a problem source, but we still have the rest of the kernel go to through :)

Quoted 6 lines
Quoted 3 lines

Try disabling ACPI with 'acpi=off' or 'pci=biosirq' to see if that fixes things.

I tried both settings with plain 2.6.11. Almost the same results, in my impression apci=off causes the failure to appear even faster.

Just to make sure I have things right, please tell me if this is correct:

Quoted 8 lines

* 2.6.10 vanilla works

* 2.6.11 vanilla does not work

* 2.6.11 vanilla + 2.6.10 libata does not work
[2.6.10 libata == reverting all libata changes]

Is that all correct?

Thanks for asking these precise questions. After double-checking everything I found a typo in my configuration that changes things a bit. I repeated some tests and the correct answers are now:
* 2.6.10 vanilla works
* 2.6.10-ac8 works
* 2.6.10-ac11 does not work
* 2.6.11 vanilla does not work
* 2.6.11 w/o promise.patch does not work
* 2.6.11 + 2.6.10 libata works!

This looks much more consistent to me but brings the case back to libata.

-jo

Signature · 1 line
-rw-r--r--  1 jo users 63 2005-03-04 22:48 /home/jo/.signature