Commit 25d83f9d authored by Sergey Shtylyov's avatar Sergey Shtylyov Committed by Damien Le Moal
Browse files

ata: pata_hpt3x2n: disable fast interrupts in prereset() method 



The PIO/DMA mode setting function is hardly a good place for disabling
the fast interrupts on a channel -- let's move that code to the driver's
prereset() method instead.

Signed-off-by: default avatarSergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
parent 6110530b

drivers/ata/pata_hpt3x2n.c

+10 −13
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include <linux/libata.h>



#define DRV_NAME	"pata_hpt3x2n"

#define DRV_VERSION	"0.3.17"

#define DRV_VERSION	"0.3.18"



enum {

	PCI66		=	(1 << 1),
@@ -166,6 +166,7 @@ static int hpt3x2n_pre_reset(struct ata_link *link, unsigned long deadline) 
		{ 0x50, 1, 0x04, 0x04 },

		{ 0x54, 1, 0x04, 0x04 }

	};

	u8 mcr2;



	if (!pci_test_config_bits(pdev, &hpt3x2n_enable_bits[ap->port_no]))

		return -ENOENT;
@@ -174,6 +175,11 @@ static int hpt3x2n_pre_reset(struct ata_link *link, unsigned long deadline) 
	pci_write_config_byte(pdev, 0x50 + 4 * ap->port_no, 0x37);

	udelay(100);



	/* Fast interrupt prediction disable, hold off interrupt disable */

	pci_read_config_byte(pdev, 0x51 + 4 * ap->port_no, &mcr2);

	mcr2 &= ~0x07;

	pci_write_config_byte(pdev, 0x51 + 4 * ap->port_no, mcr2);



	return ata_sff_prereset(link, deadline);

}
@@ -181,17 +187,8 @@ static void hpt3x2n_set_mode(struct ata_port *ap, struct ata_device *adev, 
			     u8 mode)

{

	struct pci_dev *pdev = to_pci_dev(ap->host->dev);

	u32 addr1, addr2;

	int addr = 0x40 + 4 * (adev->devno + 2 * ap->port_no);

	u32 reg, timing, mask;

	u8 fast;



	addr1 = 0x40 + 4 * (adev->devno + 2 * ap->port_no);

	addr2 = 0x51 + 4 * ap->port_no;



	/* Fast interrupt prediction disable, hold off interrupt disable */

	pci_read_config_byte(pdev, addr2, &fast);

	fast &= ~0x07;

	pci_write_config_byte(pdev, addr2, fast);



	/* Determine timing mask and find matching mode entry */

	if (mode < XFER_MW_DMA_0)
@@ -203,9 +200,9 @@ static void hpt3x2n_set_mode(struct ata_port *ap, struct ata_device *adev, 


	timing = hpt3x2n_find_mode(ap, mode);



	pci_read_config_dword(pdev, addr1, &reg);

	pci_read_config_dword(pdev, addr, &reg);

	reg = (reg & ~mask) | (timing & mask);

	pci_write_config_dword(pdev, addr1, reg);

	pci_write_config_dword(pdev, addr, reg);

}



/**