hpt37x: Check the enablebits
PATCH 1/1 hpt37x: Check the enablebits
Helps for PATA but SATA bridged devices lie and always set all the bits so will need the error handling fixes from Tejun.
Signed-off-by Alan Cox <[email protected]>
drivers/ata/pata_hpt37x.c +16 -3
@@ -25,7 +25,7 @@#include <linux/libata.h> #define DRV_NAME "pata_hpt37x" -#define DRV_VERSION "0.5" +#define DRV_VERSION "0.5.1"struct hpt_clock {u8 xfer_speed;
@@ -453,7 +453,13 @@ {u8 scr2, ata66;struct pci_dev *pdev =to_pci_dev (ap->host->dev); - +static const struct pci_bits hpt37x_enable_bits[] = { + {0x50 ,1 ,0x04 ,0x04 }, + {0x54 ,1 ,0x04 ,0x04 } + }; +if (!pci_test_config_bits (pdev, &hpt37x_enable_bits[ap->port_no])) +return -ENOENT ; +pci_read_config_byte (pdev,0x5B , &scr2);pci_write_config_byte (pdev,0x5B , scr2 & ~0x01 );/* Cable register now active */
@@ -488,10 +499,17 @@static int hpt374_pre_reset (struct ata_port *ap) { +static const struct pci_bits hpt37x_enable_bits[] = { + {0x50 ,1 ,0x04 ,0x04 }, + {0x54 ,1 ,0x04 ,0x04 } + };u16 mcr3, mcr6;u8 ata66; -struct pci_dev *pdev =to_pci_dev (ap->host->dev); + +if (!pci_test_config_bits (pdev, &hpt37x_enable_bits[ap->port_no])) +return -ENOENT ; +/* Do the extra channel work */ pci_read_config_word (pdev,0x52 , &mcr3);pci_read_config_word (pdev,0x56 , &mcr6);
Jeff Garzik
AppliedQuoted 4 lines · Alan Cox
Helps for PATA but SATA bridged devices lie and always set all the bits so will need the error handling fixes from Tejun.
Signed-off-by Alan Cox <[email protected]>
applied