libata fixes
Subsystems (2)
PATCH 1/1 libata fixes
A bunch of one-liners, except for an embedded driver update (pata_at91) and Tejun's HPA unlocking fix.
Please pull from 'upstream-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-linus
to receive the following updates:
drivers/ata/ahci.c | 4 ++ drivers/ata/ata_piix.c | 3 ++ drivers/ata/libata-core.c | 30 ++++++++++++++---- drivers/ata/libata-eh.c | 2 +- drivers/ata/pata_at91.c | 67 ++++++++++++++++++++++------------------- drivers/ata/pata_octeon_cf.c | 3 +- drivers/ata/pata_pcmcia.c | 1 + drivers/ata/sata_mv.c | 2 +- drivers/ata/sata_sil.c | 2 +- include/linux/libata.h | 1 + 10 files changed, 73 insertions(+), 42 deletions(-)
Bartlomiej Zolnierkiewicz (2):
libata: add missing NULL pointer check to ata_eh_reset()
libata: remove superfluous NULL pointer checks
David Milburn (1):
ahci: add device IDs for Ibex Peak ahci controllers
Sergey Matyukevich (1):
libata: Updates and fixes for pata_at91 driver
Steve Conklin (2):
ata_piix: Add new laptop short cable IDs
ata_piix: Add new short cable ID
Tejun Heo (1):
libata: accept late unlocking of HPA
Wolfram Sang (1):
pata_pcmcia: add CNF-CDROM-ID
drivers/ata/ahci.c +4 -0
@@ -515,10 +515,14 @@ static const struct pci_device_id ahci_pci_tbl[] = { { PCI_VDEVICE(INTEL, 0x3a05), board_ahci }, /* ICH10 */ { PCI_VDEVICE(INTEL, 0x3a22), board_ahci }, /* ICH10 */ { PCI_VDEVICE(INTEL, 0x3a25), board_ahci }, /* ICH10 */ + { PCI_VDEVICE(INTEL, 0x3b22), board_ahci }, /* PCH AHCI */ + { PCI_VDEVICE(INTEL, 0x3b23), board_ahci }, /* PCH AHCI */ { PCI_VDEVICE(INTEL, 0x3b24), board_ahci }, /* PCH RAID */ { PCI_VDEVICE(INTEL, 0x3b25), board_ahci }, /* PCH RAID */ + { PCI_VDEVICE(INTEL, 0x3b29), board_ahci }, /* PCH AHCI */ { PCI_VDEVICE(INTEL, 0x3b2b), board_ahci }, /* PCH RAID */ { PCI_VDEVICE(INTEL, 0x3b2c), board_ahci }, /* PCH RAID */ + { PCI_VDEVICE(INTEL, 0x3b2f), board_ahci }, /* PCH AHCI *//* JMicron 360/1/3/5/6, match class to avoid IDE function */ { PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
drivers/ata/ata_piix.c +3 -0
@@ -596,9 +596,12 @@ static const struct ich_laptop ich_laptop[] = { { 0x27DF, 0x0005, 0x0280 }, /* ICH7 on Acer 5602WLMi */ { 0x27DF, 0x1025, 0x0102 }, /* ICH7 on Acer 5602aWLMi */ { 0x27DF, 0x1025, 0x0110 }, /* ICH7 on Acer 3682WLMi */ + { 0x27DF, 0x1028, 0x02b0 }, /* ICH7 on unknown Dell */ { 0x27DF, 0x1043, 0x1267 }, /* ICH7 on Asus W5F */ { 0x27DF, 0x103C, 0x30A1 }, /* ICH7 on HP Compaq nc2400 */ + { 0x27DF, 0x103C, 0x361a }, /* ICH7 on unkown HP */ { 0x27DF, 0x1071, 0xD221 }, /* ICH7 on Hercules EC-900 */ + { 0x27DF, 0x152D, 0x0778 }, /* ICH7 on unknown Intel */ { 0x24CA, 0x1025, 0x0061 }, /* ICH4 on ACER Aspire 2023WLMi */ { 0x24CA, 0x1025, 0x003d }, /* ICH4 on ACER TM290 */ { 0x266F, 0x1025, 0x0066 }, /* ICH6 on ACER Aspire 1694WLMi */
drivers/ata/libata-core.c +23 -7
@@ -1515,6 +1515,7 @@ static int ata_hpa_resize(struct ata_device *dev)return rc; } + dev->n_native_sectors = native_sectors;/* nothing to do? */ if (native_sectors <= sectors || !ata_ignore_hpa) {
@@ -4099,6 +4100,7 @@ int ata_dev_revalidate(struct ata_device *dev, unsigned int new_class, unsigned int readid_flags) {u64 n_sectors = dev->n_sectors; +u64 n_native_sectors = dev->n_native_sectors;int rc;if (!ata_dev_enabled (dev))
@@ -4128,16 +4130,30 @@ int ata_dev_revalidate(struct ata_device *dev, unsigned int new_class,/* verify n_sectors hasn't changed */ if (dev->class ==ATA_DEV_ATA && n_sectors && dev->n_sectors != n_sectors) { -ata_dev_printk (dev,KERN_INFO ,"n_sectors mismatch " +ata_dev_printk (dev,KERN_WARNING ,"n_sectors mismatch " "%llu != %llu\n" , (unsigned long long )n_sectors, (unsigned long long )dev->n_sectors); - -/* restore original n_sectors */ - dev->n_sectors = n_sectors; - - rc = -ENODEV ; - goto fail; +/* +* Something could have caused HPA to be unlocked +* involuntarily. If n_native_sectors hasn't changed +* and the new size matches it, keep the device. +*/ +if (dev->n_native_sectors == n_native_sectors && + dev->n_sectors > n_sectors && + dev->n_sectors == n_native_sectors) { +ata_dev_printk (dev,KERN_WARNING , +"new n_sectors matches native, probably " +"late HPA unlock, continuing\n" ); +/* keep using the old n_sectors */ + dev->n_sectors = n_sectors; + }else { +/* restore original n_[native]_sectors and fail */ + dev->n_native_sectors = n_native_sectors; + dev->n_sectors = n_sectors; + rc = -ENODEV ; + goto fail; + } }return 0 ;
drivers/ata/libata-eh.c +1 -1
@@ -2327,7 +2327,7 @@ int ata_eh_reset(struct ata_link *link, int classify,struct ata_port *ap = link->ap;struct ata_link *slave = ap->slave_link;struct ata_eh_context *ehc = &link->eh_context; -struct ata_eh_context *sehc = &slave->eh_context; +struct ata_eh_context *sehc = slave ? &slave->eh_context :NULL ;unsigned int *classes = ehc->classes;unsigned int lflags = link->flags;int verbose = !(ehc->i.flags &ATA_EHI_QUIET );
drivers/ata/pata_at91.c +36 -31
147 lines not on this page · raw message
drivers/ata/pata_octeon_cf.c +2 -1
@@ -653,7 +653,8 @@ static irqreturn_t octeon_cf_interrupt(int irq, void *dev_instance) ap = host->ports[i]; ocd = ap->dev->platform_data; -if (!ap || (ap->flags &ATA_FLAG_DISABLED )) + +if (ap->flags &ATA_FLAG_DISABLED )continue ; ocd = ap->dev->platform_data;
drivers/ata/pata_pcmcia.c +1 -0
@@ -411,6 +411,7 @@ static struct pcmcia_device_id pcmcia_devices[] = {PCMCIA_DEVICE_PROD_ID123 ("PCMCIA" ,"IDE CARD" ,"F1" ,0x281f1c5d ,0x1907960c ,0xf7fde8b9 ),PCMCIA_DEVICE_PROD_ID12 ("ARGOSY" ,"CD-ROM" ,0x78f308dc ,0x66536591 ),PCMCIA_DEVICE_PROD_ID12 ("ARGOSY" ,"PnPIDE" ,0x78f308dc ,0x0c694728 ), +PCMCIA_DEVICE_PROD_ID12 ("CNF " ,"CD-ROM" ,0x46d7db81 ,0x66536591 ),PCMCIA_DEVICE_PROD_ID12 ("CNF CD-M" ,"CD-ROM" ,0x7d93b852 ,0x66536591 ),PCMCIA_DEVICE_PROD_ID12 ("Creative Technology Ltd." ,"PCMCIA CD-ROM Interface Card" ,0xff8c8a45 ,0xfe8020c4 ), PCMCIA_DEVICE_PROD_ID12("Digital Equipment Corporation.", "Digital Mobile Media CD-ROM", 0x17692a66, 0xef1dcbde),
drivers/ata/sata_mv.c +1 -1
@@ -2514,7 +2514,7 @@ static void mv_unexpected_intr(struct ata_port *ap, int edma_was_enabled)char *when ="idle" ;ata_ehi_clear_desc (ehi); -if (!ap || (ap->flags &ATA_FLAG_DISABLED )) { +if (ap->flags &ATA_FLAG_DISABLED ) { when ="disabled" ; }else if (edma_was_enabled) { when ="EDMA enabled" ;
drivers/ata/sata_sil.c +1 -1
@@ -532,7 +532,7 @@ static irqreturn_t sil_interrupt(int irq, void *dev_instance)struct ata_port *ap = host->ports[i];u32 bmdma2 =readl (mmio_base + sil_port[ap->port_no].bmdma2); -if (unlikely (!ap || ap->flags &ATA_FLAG_DISABLED )) +if (unlikely (ap->flags &ATA_FLAG_DISABLED ))continue ;/* turn off SATA_IRQ if not supported */
include/linux/libata.h +1 -0
@@ -589,6 +589,7 @@ struct ata_device {#endif /* n_sector is CLEAR_BEGIN, read comment above CLEAR_BEGIN */ u64 n_sectors;/* size of device, if ATA */ +u64 n_native_sectors;/* native size, if ATA */ unsigned int class;/* ATA_DEV_xxx */ unsigned long unpark_deadline;