Skip to contentSkip to conversation

pata_hpt37x: fix HPT370 DMA timeouts

PATCH Applied Sergei Shtylyov 3 participants 5 messages Apr 14, 2009 – Apr 16, 2009 libata

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pata_hpt37x: fix HPT370 DMA timeouts

The libata driver has copied the code from the IDE driver which caused a post 2.4.18 regression on many HPT370[A] chips -- DMA stopped to work completely, only causing timeouts. Now remove hpt370_bmdma_start() for good...

---
The patch is against the recent Linus' tree. It's intended to go into all stable kernels starting with 2.6.19, when the PATA drivers were first merged.

See http://marc.info/?l=linux-ide&m=123912061904872 for the IDE driver patch.

 drivers/ata/pata_hpt37x.c |   22 ++--------------------
 1 files changed, 2 insertions(+), 20 deletions(-)
drivers/ata/pata_hpt37x.c +2 -20
Index: linux-2.6/drivers/ata/pata_hpt37x.c
===================================================================
@@ -8,7 +8,7 @@
  * Copyright (C) 1999-2003		Andre Hedrick <[email protected]>
  * Portions Copyright (C) 2001	        Sun Microsystems, Inc.
  * Portions Copyright (C) 2003		Red Hat Inc
- * Portions Copyright (C) 2005-2007	MontaVista Software, Inc.
+ * Portions Copyright (C) 2005-2009	MontaVista Software, Inc.
  *
  * TODO
  *	Look into engine reset on timeout errors. Should not be	required.
@@ -24,7 +24,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME	"pata_hpt37x"
-#define DRV_VERSION	"0.6.11"
+#define DRV_VERSION	"0.6.12"
 
 struct hpt_clock {
 	u8	xfer_speed;
@@ -445,23 +445,6 @@ static void hpt370_set_dmamode(struct at
 }
 
 /**
- *	hpt370_bmdma_start		-	DMA engine begin
- *	@qc: ATA command
- *
- *	The 370 and 370A want us to reset the DMA engine each time we
- *	use it. The 372 and later are fine.
- */
-
-static void hpt370_bmdma_start(struct ata_queued_cmd *qc)
-{
-	struct ata_port *ap = qc->ap;
-	struct pci_dev *pdev = to_pci_dev(ap->host->dev);
-	pci_write_config_byte(pdev, 0x50 + 4 * ap->port_no, 0x37);
-	udelay(10);
-	ata_bmdma_start(qc);
-}
-
-/**
  *	hpt370_bmdma_end		-	DMA engine stop
  *	@qc: ATA command
  *
@@ -598,7 +581,6 @@ static struct scsi_host_template hpt37x_
 static struct ata_port_operations hpt370_port_ops = {
 	.inherits	= &ata_bmdma_port_ops,
 
-	.bmdma_start 	= hpt370_bmdma_start,
 	.bmdma_stop	= hpt370_bmdma_stop,
 
 	.mode_filter	= hpt370_filter,
#1 lore raw
Quoted 3 lines · On Tue, 14 Apr 2009 18:39:14 +0400 Sergei Shtylyov <[email protected]>…

The libata driver has copied the code from the IDE driver which caused a post 2.4.18 regression on many HPT370[A] chips -- DMA stopped to work completely, only causing timeouts. Now remove hpt370_bmdma_start() for good...

Do we need to move it rather than remove it though. I need to look at that a bit with my HPT370 and see what happens. I suspect that if we get a failed transfer we need to do the reset somewhere - perhaps qc_issue before anything hits the chip for the command ?

#2 lore raw
Quoted 7 lines · Alan Cox
Quoted 3 lines

The libata driver has copied the code from the IDE driver which caused a post 2.4.18 regression on many HPT370[A] chips -- DMA stopped to work completely, only causing timeouts. Now remove hpt370_bmdma_start() for good...

Do we need to move it rather than remove it though. I need to look at that a bit with my HPT370 and see what happens. I suspect that if we get a failed transfer we need to do the reset somewhere -

Well, the driver does the reset in hpt370_bmdma_stop(), and even twice.

Quoted 1 line

perhaps qc_issue before anything hits the chip for the command ?

No idea. I think it's just not needed.

MBR, Sergei

#3 lore raw
Quoted 11 lines · On Tue, 14 Apr 2009 20:45:50 +0400 Sergei Shtylyov <[email protected]>…
Quoted 7 lines · Alan Cox
Quoted 3 lines

The libata driver has copied the code from the IDE driver which caused a post 2.4.18 regression on many HPT370[A] chips -- DMA stopped to work completely, only causing timeouts. Now remove hpt370_bmdma_start() for good...

Do we need to move it rather than remove it though. I need to look at that a bit with my HPT370 and see what happens. I suspect that if we get a failed transfer we need to do the reset somewhere -

Quoted 5 lines

Well, the driver does the reset in hpt370_bmdma_stop(), and even twice.

Quoted 1 line

perhaps qc_issue before anything hits the chip for the command ?

No idea. I think it's just not needed.

Works for me Jeff on what testing I've done - although my controller is happy either way

Applied
#4 lore raw
In reply to Sergei Shtylyov
Quoted 6 lines · Sergei Shtylyov

The libata driver has copied the code from the IDE driver which caused a post 2.4.18 regression on many HPT370[A] chips -- DMA stopped to work completely, only causing timeouts. Now remove hpt370_bmdma_start() for good...

Quoted 8 lines

---
The patch is against the recent Linus' tree. It's intended to go into all stable kernels starting with 2.6.19, when the PATA drivers were first merged.

See http://marc.info/?l=linux-ide&m=123912061904872 for the IDE driver patch.

 drivers/ata/pata_hpt37x.c |   22 ++--------------------
 1 files changed, 2 insertions(+), 20 deletions(-)

applied