1 files changed, 21 insertions, 19 deletions

diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index 01964b6e6f6b..b0882cddfd4c 100644
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -20,19 +20,9 @@
 
 #include <acpi/acpi_bus.h>
 
-enum {
-        ATA_ACPI_FILTER_SETXFER = 1 << 0,
-        ATA_ACPI_FILTER_LOCK    = 1 << 1,
-        ATA_ACPI_FILTER_DIPM    = 1 << 2,
-
-        ATA_ACPI_FILTER_DEFAULT = ATA_ACPI_FILTER_SETXFER |
-                                  ATA_ACPI_FILTER_LOCK |
-                                  ATA_ACPI_FILTER_DIPM,
-};
-
-static unsigned int ata_acpi_gtf_filter = ATA_ACPI_FILTER_DEFAULT;
+unsigned int ata_acpi_gtf_filter = ATA_ACPI_FILTER_DEFAULT;
 module_param_named(acpi_gtf_filter, ata_acpi_gtf_filter, int, 0644);
-MODULE_PARM_DESC(acpi_gtf_filter, "filter mask for ACPI _GTF commands, set to filter out (0x1=set xfermode, 0x2=lock/freeze lock, 0x4=DIPM)");
+MODULE_PARM_DESC(acpi_gtf_filter, "filter mask for ACPI _GTF commands, set to filter out (0x1=set xfermode, 0x2=lock/freeze lock, 0x4=DIPM, 0x8=FPDMA non-zero offset, 0x10=FPDMA DMA Setup FIS auto-activate)");
 
 #define NO_PORT_MULT            0xffff
 #define SATA_ADR(root, pmp)     (((root) << 16) | (pmp))
@@ -613,10 +603,11 @@ static void ata_acpi_gtf_to_tf(struct ata_device *dev,
         tf->command = gtf->tf[6];       /* 0x1f7 */
 }
 
-static int ata_acpi_filter_tf(const struct ata_taskfile *tf,
+static int ata_acpi_filter_tf(struct ata_device *dev,
+                              const struct ata_taskfile *tf,
                               const struct ata_taskfile *ptf)
 {
-        if (ata_acpi_gtf_filter & ATA_ACPI_FILTER_SETXFER) {
+        if (dev->gtf_filter & ATA_ACPI_FILTER_SETXFER) {
                 /* libata doesn't use ACPI to configure transfer mode.
                  * It will only confuse device configuration.  Skip.
                  */
@@ -625,7 +616,7 @@ static int ata_acpi_filter_tf(const struct ata_taskfile *tf,
                         return 1;
         }
 
-        if (ata_acpi_gtf_filter & ATA_ACPI_FILTER_LOCK) {
+        if (dev->gtf_filter & ATA_ACPI_FILTER_LOCK) {
                 /* BIOS writers, sorry but we don't wanna lock
                  * features unless the user explicitly said so.
                  */
@@ -647,12 +638,23 @@ static int ata_acpi_filter_tf(const struct ata_taskfile *tf,
                         return 1;
         }
 
-        if (ata_acpi_gtf_filter & ATA_ACPI_FILTER_DIPM) {
+        if (tf->command == ATA_CMD_SET_FEATURES &&
+            tf->feature == SETFEATURES_SATA_ENABLE) {
                 /* inhibit enabling DIPM */
-                if (tf->command == ATA_CMD_SET_FEATURES &&
-                    tf->feature == SETFEATURES_SATA_ENABLE &&
+                if (dev->gtf_filter & ATA_ACPI_FILTER_DIPM &&
                     tf->nsect == SATA_DIPM)
                         return 1;
+
+                /* inhibit FPDMA non-zero offset */
+                if (dev->gtf_filter & ATA_ACPI_FILTER_FPDMA_OFFSET &&
+                    (tf->nsect == SATA_FPDMA_OFFSET ||
+                     tf->nsect == SATA_FPDMA_IN_ORDER))
+                        return 1;
+
+                /* inhibit FPDMA auto activation */
+                if (dev->gtf_filter & ATA_ACPI_FILTER_FPDMA_AA &&
+                    tf->nsect == SATA_FPDMA_AA)
+                        return 1;
         }
 
         return 0;
@@ -704,7 +706,7 @@ static int ata_acpi_run_tf(struct ata_device *dev,
                 pptf = &ptf;
         }
 
-        if (!ata_acpi_filter_tf(&tf, pptf)) {
+        if (!ata_acpi_filter_tf(dev, &tf, pptf)) {
                 rtf = tf;
                 err_mask = ata_exec_internal(dev, &rtf, NULL,
                                              DMA_NONE, NULL, 0, 0);