Skip to contentSkip to conversation

pata_hpt3x2n: always stretch UltraDMA timing

PATCH In review Sergei Shtylyov 3 participants 3 messages Dec 7, 2009 – Dec 17, 2009 libata

lore
Share & tools
lore
#0 lore raw

PATCH 1/5 pata_hpt3x2n: always stretch UltraDMA timing

The UltraDMA Tss timing must be stretched with ATA clock of 66 MHz, but the driver only does this when PCI clock is 66 MHz, whereas it always programs DPLL clock (which is used as the ATA clock) to 66 MHz.

---
The patch is against the recent Linus' tree. It's intended to go into all stable kernels up to 2.6.22 -- when HPT371N support was merged.

 drivers/ata/pata_hpt3x2n.c |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)
drivers/ata/pata_hpt3x2n.c +10 -10
Index: linux-2.6/drivers/ata/pata_hpt3x2n.c
===================================================================
@@ -25,7 +25,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME	"pata_hpt3x2n"
-#define DRV_VERSION	"0.3.8"
+#define DRV_VERSION	"0.3.9"
 
 enum {
 	HPT_PCI_FAST	=	(1 << 31),
@@ -547,16 +547,16 @@ static int hpt3x2n_init_one(struct pci_d
 	       pci_mhz);
 	/* Set our private data up. We only need a few flags so we use
 	   it directly */
-	if (pci_mhz > 60) {
+	if (pci_mhz > 60)
 		hpriv = (void *)(PCI66 | USE_DPLL);
-		/*
-		 * On  HPT371N, if ATA clock is 66 MHz we must set bit 2 in
-		 * the MISC. register to stretch the UltraDMA Tss timing.
-		 * NOTE: This register is only writeable via I/O space.
-		 */
-		if (dev->device == PCI_DEVICE_ID_TTI_HPT371)
-			outb(inb(iobase + 0x9c) | 0x04, iobase + 0x9c);
-	}
+
+	/*
+	 * On  HPT371N, if ATA clock is 66 MHz we must set bit 2 in
+	 * the MISC. register to stretch the UltraDMA Tss timing.
+	 * NOTE: This register is only writeable via I/O space.
+	 */
+	if (dev->device == PCI_DEVICE_ID_TTI_HPT371)
+		outb(inb(iobase + 0x9c) | 0x04, iobase + 0x9c);
 
 	/* Now kick off ATA set up */
 	return ata_pci_sff_init_one(dev, ppi, &hpt3x2n_sht, hpriv);
#1 lore raw

Hi,

Quoted 5 lines · Sergei Shtylyov

The UltraDMA Tss timing must be stretched with ATA clock of 66 MHz, but the driver only does this when PCI clock is 66 MHz, whereas it always programs DPLL clock (which is used as the ATA clock) to 66 MHz.

I've reviewed those patches and they all look fine to me.

Same with your other HPT3xx pending fixes, namely:
* hpt366: fix clock turnaround
* pata_hpt3x2n: fix clock turnaround
* hpt366: add debounce delay to cable_detect() method

PS everything is in my ATA fixes tree now
--
Bartlomiej Zolnierkiewicz

#2 lore raw
In reply to Sergei Shtylyov
Quoted 7 lines · Sergei Shtylyov

The UltraDMA Tss timing must be stretched with ATA clock of 66 MHz, but the driver only does this when PCI clock is 66 MHz, whereas it always programs DPLL clock (which is used as the ATA clock) to 66 MHz.

Quoted 6 lines

---
The patch is against the recent Linus' tree. It's intended to go into all stable kernels up to 2.6.22 -- when HPT371N support was merged.

  drivers/ata/pata_hpt3x2n.c |   20 ++++++++++----------
  1 files changed, 10 insertions(+), 10 deletions(-)

applied 1-5