diff options
| author | Sergey Shtylyov <s.shtylyov@omp.ru> | 2022-02-10 22:22:12 +0300 |
|---|---|---|
| committer | Damien Le Moal <damien.lemoal@opensource.wdc.com> | 2022-02-19 11:18:49 +0900 |
| commit | a58ff050b428e38461d201b24d388899111ffedf (patch) | |
| tree | 0db2571e56dde97c5baf9b671fef28ed7194db2f /drivers/ata/pata_hpt366.c | |
| parent | cf369e4e5245c583d611729e563c3b81e61d8496 (diff) | |
ata: pata_hpt366: 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: Sergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Diffstat (limited to 'drivers/ata/pata_hpt366.c')
| -rw-r--r-- | drivers/ata/pata_hpt366.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/ata/pata_hpt366.c b/drivers/ata/pata_hpt366.c index 96caa79dc8d7..c99e8f0708b3 100644 --- a/drivers/ata/pata_hpt366.c +++ b/drivers/ata/pata_hpt366.c @@ -23,7 +23,7 @@ #include <linux/libata.h> #define DRV_NAME "pata_hpt366" -#define DRV_VERSION "0.6.12" +#define DRV_VERSION "0.6.13" struct hpt_clock { u8 xfer_mode; @@ -300,10 +300,15 @@ static int hpt366_prereset(struct ata_link *link, unsigned long deadline) static const struct pci_bits hpt366_enable_bits = { 0x50, 1, 0x30, 0x30 }; + u8 mcr2; if (!pci_test_config_bits(pdev, &hpt366_enable_bits)) return -ENOENT; + pci_read_config_byte(pdev, 0x51, &mcr2); + if (mcr2 & 0x80) + pci_write_config_byte(pdev, 0x51, mcr2 & ~0x80); + return ata_sff_prereset(link, deadline); } @@ -334,17 +339,13 @@ static struct ata_port_operations hpt366_port_ops = { static void hpt36x_init_chipset(struct pci_dev *dev) { - u8 drive_fast, mcr1; + u8 mcr1; pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE, (L1_CACHE_BYTES / 4)); pci_write_config_byte(dev, PCI_LATENCY_TIMER, 0x78); pci_write_config_byte(dev, PCI_MIN_GNT, 0x08); pci_write_config_byte(dev, PCI_MAX_LAT, 0x08); - pci_read_config_byte(dev, 0x51, &drive_fast); - if (drive_fast & 0x80) - pci_write_config_byte(dev, 0x51, drive_fast & ~0x80); - /* * Now we'll have to force both channels enabled if at least one * of them has been enabled by BIOS... |