embeded-sourcecoder
diff --git a/‎drivers/ata/Kconfig
Lines changed: 9 additions & 0 deletions b/‎drivers/ata/Kconfig
Lines changed: 9 additions & 0 deletions
diff --git a/‎drivers/ata/Makefile
Lines changed: 1 addition & 0 deletions b/‎drivers/ata/Makefile
Lines changed: 1 addition & 0 deletions
diff --git a/‎drivers/ata/ahci.c
Lines changed: 2 additions & 2 deletions b/‎drivers/ata/ahci.c
Lines changed: 2 additions & 2 deletions
diff --git a/‎drivers/ata/libata-core.c
Lines changed: 2 additions & 2 deletions b/‎drivers/ata/libata-core.c
Lines changed: 2 additions & 2 deletions
diff --git a/‎drivers/ata/pata_amd.c
Lines changed: 3 additions & 0 deletions b/‎drivers/ata/pata_amd.c
Lines changed: 3 additions & 0 deletions
@@ -255,6 +255,15 @@ config PATA_ARTOP
 
 	  If unsure, say N.
 
+config PATA_ATP867X
+	tristate "ARTOP/Acard ATP867X PATA support"
+	depends on PCI
+	help
+	  This option enables support for ARTOP/Acard ATP867X PATA
+	  controllers.
+
+	  If unsure, say N.
+
 config PATA_AT32
 	tristate "Atmel AVR32 PATA support (Experimental)"
 	depends on AVR32 && PLATFORM_AT32AP && EXPERIMENTAL
 
@@ -22,6 +22,7 @@ obj-$(CONFIG_SATA_FSL)		+= sata_fsl.o
 obj-$(CONFIG_PATA_ALI)		+= pata_ali.o
 obj-$(CONFIG_PATA_AMD)		+= pata_amd.o
 obj-$(CONFIG_PATA_ARTOP)	+= pata_artop.o
+obj-$(CONFIG_PATA_ATP867X)	+= pata_atp867x.o
 obj-$(CONFIG_PATA_AT32)		+= pata_at32.o
 obj-$(CONFIG_PATA_ATIIXP)	+= pata_atiixp.o
 obj-$(CONFIG_PATA_CMD640_PCI)	+= pata_cmd640.o
 
@@ -2930,8 +2930,8 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 	if (ahci_sb600_32bit_only(pdev))
 		hpriv->flags |= AHCI_HFLAG_32BIT_ONLY;
 
-	if (!(hpriv->flags & AHCI_HFLAG_NO_MSI))
-		pci_enable_msi(pdev);
+	if ((hpriv->flags & AHCI_HFLAG_NO_MSI) || pci_enable_msi(pdev))
+		pci_intx(pdev, 1);
 
 	/* save initial config */
 	ahci_save_initial_config(pdev, hpriv);
 
@@ -5024,8 +5024,6 @@ void ata_qc_complete(struct ata_queued_cmd *qc)
 		struct ata_device *dev = qc->dev;
 		struct ata_eh_info *ehi = &dev->link->eh_info;
 
-		WARN_ON_ONCE(ap->pflags & ATA_PFLAG_FROZEN);
-
 		if (unlikely(qc->err_mask))
 			qc->flags |= ATA_QCFLAG_FAILED;
 
@@ -5038,6 +5036,8 @@ void ata_qc_complete(struct ata_queued_cmd *qc)
 			}
 		}
 
+		WARN_ON_ONCE(ap->pflags & ATA_PFLAG_FROZEN);
+
 		/* read result TF if requested */
 		if (qc->flags & ATA_QCFLAG_RESULT_TF)
 			fill_result_tf(qc);
 
@@ -307,6 +307,9 @@ static unsigned long nv_mode_filter(struct ata_device *dev,
 		limit |= ATA_MASK_PIO;
 	if (!(limit & (ATA_MASK_MWDMA | ATA_MASK_UDMA)))
 		limit |= ATA_MASK_MWDMA | ATA_MASK_UDMA;
+	/* PIO4, MWDMA2, UDMA2 should always be supported regardless of
+	   cable detection result */
+	limit |= ata_pack_xfermask(ATA_PIO4, ATA_MWDMA2, ATA_UDMA2);
 
 	ata_port_printk(ap, KERN_DEBUG, "nv_mode_filter: 0x%lx&0x%lx->0x%lx, "
 			"BIOS=0x%lx (0x%x) ACPI=0x%lx%s\n",
Original file line number	Diff line number	Diff line change
`@@ -5024,8 +5024,6 @@ void ata_qc_complete(struct ata_queued_cmd *qc)`
`5024`	`5024`	`struct ata_device *dev = qc->dev;`
`5025`	`5025`	`struct ata_eh_info *ehi = &dev->link->eh_info;`
`5026`	`5026`
`5027`		`- WARN_ON_ONCE(ap->pflags & ATA_PFLAG_FROZEN);`
`5028`		`-`
`5029`	`5027`	`if (unlikely(qc->err_mask))`
`5030`	`5028`	`qc->flags \|= ATA_QCFLAG_FAILED;`
`5031`	`5029`
`@@ -5038,6 +5036,8 @@ void ata_qc_complete(struct ata_queued_cmd *qc)`
`5038`	`5036`	`}`
`5039`	`5037`	`}`
`5040`	`5038`
	`5039`	`+ WARN_ON_ONCE(ap->pflags & ATA_PFLAG_FROZEN);`
	`5040`	`+`
`5041`	`5041`	`/* read result TF if requested */`
`5042`	`5042`	`if (qc->flags & ATA_QCFLAG_RESULT_TF)`
`5043`	`5043`	`fill_result_tf(qc);`