Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (21 commits)
  libata: bump transfer chunk size if it's odd
  libata: Return proper ATA INT status in pata_bf54x driver
  pata_ali: trim trailing whitespace (fix checkpatch complaints)
  pata_isapnp: Polled devices
  pata_hpt37x: Fix cable detect bug spotted by Sergei
  pata_ali: Lots of problems still showing up with small ATAPI DMA
  pata_ali: Add Mitac 8317 and derivatives
  libata-core: List more documentation sources for reference
  ata_piix: Invalid use of writel/readl with iomap
  sata_sil24: fix sg table sizing
  pata_jmicron: fix disabled port handling in jmicron_pre_reset()
  pata_sil680: kill bogus reset code (take 2)
  ata_piix: port enable for the first SATA controller of ICH8 is 0xf not 0x3
  ata_piix: only enable the first port on apple macbook pro
  ata_piix: reorganize controller IDs
  pata_sis.c: Add Packard Bell EasyNote K5305 to laptops
  libata-scsi: be tolerant of 12-byte ATAPI commands in 16-byte CDBs
  libata: use ATA_HORKAGE_STUCK_ERR for ATAPI tape drives
  libata: workaround DRQ=1 ERR=1 for ATAPI tape drives
  libata: remove unused functions
  ...

1 files changed, 20 insertions, 0 deletions

diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c
index 364534e7aff4..8caf9afc8b90 100644
--- a/drivers/ata/pata_ali.c
+++ b/drivers/ata/pata_ali.c
@@ -63,6 +63,9 @@ static int ali_cable_override(struct pci_dev *pdev)
         /* Fujitsu P2000 */
         if (pdev->subsystem_vendor == 0x10CF && pdev->subsystem_device == 0x10AF)
                 return 1;
+        /* Mitac 8317 (Winbook-A) and relatives */
+        if (pdev->subsystem_vendor == 0x1071  && pdev->subsystem_device == 0x8317)
+                return 1;
         /* Systems by DMI */
         if (dmi_check_system(cable_dmi_table))
                 return 1;
@@ -282,6 +285,21 @@ static void ali_lock_sectors(struct ata_device *adev)
         adev->max_sectors = 255;
 }
 
+/**
+ *      ali_check_atapi_dma     -       DMA check for most ALi controllers
+ *      @adev: Device
+ *
+ *      Called to decide whether commands should be sent by DMA or PIO
+ */
+
+static int ali_check_atapi_dma(struct ata_queued_cmd *qc)
+{
+        /* If its not a media command, its not worth it */
+        if (qc->nbytes < 2048)
+                return -EOPNOTSUPP;
+        return 0;
+}
+
 static struct scsi_host_template ali_sht = {
         .module                 = THIS_MODULE,
         .name                   = DRV_NAME,
@@ -378,6 +396,7 @@ static struct ata_port_operations ali_c2_port_ops = {
         .mode_filter    = ata_pci_default_filter,
         .tf_load        = ata_tf_load,
         .tf_read        = ata_tf_read,
+        .check_atapi_dma = ali_check_atapi_dma,
         .check_status   = ata_check_status,
         .exec_command   = ata_exec_command,
         .dev_select     = ata_std_dev_select,
@@ -415,6 +434,7 @@ static struct ata_port_operations ali_c5_port_ops = {
         .mode_filter    = ata_pci_default_filter,
         .tf_load        = ata_tf_load,
         .tf_read        = ata_tf_read,
+        .check_atapi_dma = ali_check_atapi_dma,
         .check_status   = ata_check_status,
         .exec_command   = ata_exec_command,
         .dev_select     = ata_std_dev_select,