5 files changed, 62 insertions, 13 deletions

diff --git a/drivers/ata/ahci_sunxi.c b/drivers/ata/ahci_sunxi.c
index e44d675a30ec..b5aedca5ea3c 100644
--- a/drivers/ata/ahci_sunxi.c
+++ b/drivers/ata/ahci_sunxi.c
@@ -27,6 +27,12 @@
 #include <linux/regulator/consumer.h>
 #include "ahci.h"
 
+/* Insmod parameters */
+static bool enable_pmp;
+module_param(enable_pmp, bool, 0);
+MODULE_PARM_DESC(enable_pmp,
+        "Enable support for sata port multipliers, only use if you use a pmp!");
+
 #define AHCI_BISTAFR    0x00a0
 #define AHCI_BISTCR     0x00a4
 #define AHCI_BISTFCTR   0x00a8
@@ -184,7 +190,15 @@ static int ahci_sunxi_probe(struct platform_device *pdev)
                 goto disable_resources;
 
         hpriv->flags = AHCI_HFLAG_32BIT_ONLY | AHCI_HFLAG_NO_MSI |
-                       AHCI_HFLAG_NO_PMP | AHCI_HFLAG_YES_NCQ;
+                       AHCI_HFLAG_YES_NCQ;
+
+        /*
+         * The sunxi sata controller seems to be unable to successfully do a
+         * soft reset if no pmp is attached, so disable pmp use unless
+         * requested, otherwise directly attached disks do not work.
+         */
+        if (!enable_pmp)
+                hpriv->flags |= AHCI_HFLAG_NO_PMP;
 
         rc = ahci_platform_init_host(pdev, hpriv, &ahci_sunxi_port_info);
         if (rc)
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index c5ba15af87d3..5c84fb5c3372 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -1043,8 +1043,8 @@ const char *sata_spd_string(unsigned int spd)
  *      None.
  *
  *      RETURNS:
- *      Device type, %ATA_DEV_ATA, %ATA_DEV_ATAPI, %ATA_DEV_PMP or
- *      %ATA_DEV_UNKNOWN the event of failure.
+ *      Device type, %ATA_DEV_ATA, %ATA_DEV_ATAPI, %ATA_DEV_PMP,
+ *      %ATA_DEV_ZAC, or %ATA_DEV_UNKNOWN the event of failure.
  */
 unsigned int ata_dev_classify(const struct ata_taskfile *tf)
 {
@@ -1089,6 +1089,11 @@ unsigned int ata_dev_classify(const struct ata_taskfile *tf)
                 return ATA_DEV_SEMB;
         }
 
+        if ((tf->lbam == 0xcd) && (tf->lbah == 0xab)) {
+                DPRINTK("found ZAC device by sig\n");
+                return ATA_DEV_ZAC;
+        }
+
         DPRINTK("unknown device\n");
         return ATA_DEV_UNKNOWN;
 }
@@ -1329,7 +1334,7 @@ static int ata_hpa_resize(struct ata_device *dev)
         int rc;
 
         /* do we need to do it? */
-        if (dev->class != ATA_DEV_ATA ||
+        if ((dev->class != ATA_DEV_ATA && dev->class != ATA_DEV_ZAC) ||
             !ata_id_has_lba(dev->id) || !ata_id_hpa_enabled(dev->id) ||
             (dev->horkage & ATA_HORKAGE_BROKEN_HPA))
                 return 0;
@@ -1889,6 +1894,7 @@ retry:
         case ATA_DEV_SEMB:
                 class = ATA_DEV_ATA;    /* some hard drives report SEMB sig */
         case ATA_DEV_ATA:
+        case ATA_DEV_ZAC:
                 tf.command = ATA_CMD_ID_ATA;
                 break;
         case ATA_DEV_ATAPI:
@@ -1980,7 +1986,7 @@ retry:
         rc = -EINVAL;
         reason = "device reports invalid type";
 
-        if (class == ATA_DEV_ATA) {
+        if (class == ATA_DEV_ATA || class == ATA_DEV_ZAC) {
                 if (!ata_id_is_ata(id) && !ata_id_is_cfa(id))
                         goto err_out;
                 if (ap->host->flags & ATA_HOST_IGNORE_ATA &&
@@ -2015,7 +2021,8 @@ retry:
                         goto retry;
         }
 
-        if ((flags & ATA_READID_POSTRESET) && class == ATA_DEV_ATA) {
+        if ((flags & ATA_READID_POSTRESET) &&
+            (class == ATA_DEV_ATA || class == ATA_DEV_ZAC)) {
                 /*
                  * The exact sequence expected by certain pre-ATA4 drives is:
                  * SRST RESET
@@ -2280,7 +2287,7 @@ int ata_dev_configure(struct ata_device *dev)
                         sizeof(modelbuf));
 
         /* ATA-specific feature tests */
-        if (dev->class == ATA_DEV_ATA) {
+        if (dev->class == ATA_DEV_ATA || dev->class == ATA_DEV_ZAC) {
                 if (ata_id_is_cfa(id)) {
                         /* CPRM may make this media unusable */
                         if (id[ATA_ID_CFA_KEY_MGMT] & 1)
@@ -4033,6 +4040,7 @@ int ata_dev_revalidate(struct ata_device *dev, unsigned int new_class,
         if (ata_class_enabled(new_class) &&
             new_class != ATA_DEV_ATA &&
             new_class != ATA_DEV_ATAPI &&
+            new_class != ATA_DEV_ZAC &&
             new_class != ATA_DEV_SEMB) {
                 ata_dev_info(dev, "class mismatch %u != %u\n",
                              dev->class, new_class);
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index dad83df555c4..3dbec8954c86 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -1809,6 +1809,7 @@ static unsigned int ata_eh_analyze_tf(struct ata_queued_cmd *qc,
 
         switch (qc->dev->class) {
         case ATA_DEV_ATA:
+        case ATA_DEV_ZAC:
                 if (err & ATA_ICRC)
                         qc->err_mask |= AC_ERR_ATA_BUS;
                 if (err & (ATA_UNC | ATA_AMNF))
@@ -3792,7 +3793,8 @@ int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset,
                                 struct ata_eh_context *ehc = &link->eh_context;
                                 unsigned long tmp;
 
-                                if (dev->class != ATA_DEV_ATA)
+                                if (dev->class != ATA_DEV_ATA &&
+                                    dev->class != ATA_DEV_ZAC)
                                         continue;
                                 if (!(ehc->i.dev_action[dev->devno] &
                                       ATA_EH_PARK))
@@ -3873,7 +3875,8 @@ int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset,
 
                 /* retry flush if necessary */
                 ata_for_each_dev(dev, link, ALL) {
-                        if (dev->class != ATA_DEV_ATA)
+                        if (dev->class != ATA_DEV_ATA &&
+                            dev->class != ATA_DEV_ZAC)
                                 continue;
                         rc = ata_eh_maybe_retry_flush(dev);
                         if (rc)
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index dd45c6a03e5d..e364e86e84d7 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -235,7 +235,8 @@ static ssize_t ata_scsi_park_store(struct device *device,
                 rc = -ENODEV;
                 goto unlock;
         }
-        if (dev->class != ATA_DEV_ATA) {
+        if (dev->class != ATA_DEV_ATA &&
+            dev->class != ATA_DEV_ZAC) {
                 rc = -EOPNOTSUPP;
                 goto unlock;
         }
@@ -1961,6 +1962,7 @@ static void ata_scsi_rbuf_fill(struct ata_scsi_args *args,
 static unsigned int ata_scsiop_inq_std(struct ata_scsi_args *args, u8 *rbuf)
 {
         const u8 versions[] = {
+                0x00,
                 0x60,   /* SAM-3 (no version claimed) */
 
                 0x03,
@@ -1969,6 +1971,20 @@ static unsigned int ata_scsiop_inq_std(struct ata_scsi_args *args, u8 *rbuf)
                 0x02,
                 0x60    /* SPC-3 (no version claimed) */
         };
+        const u8 versions_zbc[] = {
+                0x00,
+                0xA0,   /* SAM-5 (no version claimed) */
+
+                0x04,
+                0xC0,   /* SBC-3 (no version claimed) */
+
+                0x04,
+                0x60,   /* SPC-4 (no version claimed) */
+
+                0x60,
+                0x20,   /* ZBC (no version claimed) */
+        };
+
         u8 hdr[] = {
                 TYPE_DISK,
                 0,
@@ -1983,6 +1999,11 @@ static unsigned int ata_scsiop_inq_std(struct ata_scsi_args *args, u8 *rbuf)
         if (ata_id_removeable(args->id))
                 hdr[1] |= (1 << 7);
 
+        if (args->dev->class == ATA_DEV_ZAC) {
+                hdr[0] = TYPE_ZBC;
+                hdr[2] = 0x6; /* ZBC is defined in SPC-4 */
+        }
+
         memcpy(rbuf, hdr, sizeof(hdr));
         memcpy(&rbuf[8], "ATA     ", 8);
         ata_id_string(args->id, &rbuf[16], ATA_ID_PROD, 16);
@@ -1995,7 +2016,10 @@ static unsigned int ata_scsiop_inq_std(struct ata_scsi_args *args, u8 *rbuf)
         if (rbuf[32] == 0 || rbuf[32] == ' ')
                 memcpy(&rbuf[32], "n/a ", 4);
 
-        memcpy(rbuf + 59, versions, sizeof(versions));
+        if (args->dev->class == ATA_DEV_ZAC)
+                memcpy(rbuf + 58, versions_zbc, sizeof(versions_zbc));
+        else
+                memcpy(rbuf + 58, versions, sizeof(versions));
 
         return 0;
 }
@@ -2564,7 +2588,6 @@ static void atapi_request_sense(struct ata_queued_cmd *qc)
 
         DPRINTK("ATAPI request sense\n");
 
-        /* FIXME: is this needed? */
         memset(cmd->sense_buffer, 0, SCSI_SENSE_BUFFERSIZE);
 
 #ifdef CONFIG_ATA_SFF
@@ -3405,7 +3428,7 @@ static inline int __ata_scsi_queuecmd(struct scsi_cmnd *scmd,
         ata_xlat_func_t xlat_func;
         int rc = 0;
 
-        if (dev->class == ATA_DEV_ATA) {
+        if (dev->class == ATA_DEV_ATA || dev->class == ATA_DEV_ZAC) {
                 if (unlikely(!scmd->cmd_len || scmd->cmd_len > dev->cdb_len))
                         goto bad_cdb_len;
 
diff --git a/drivers/ata/libata-transport.c b/drivers/ata/libata-transport.c
index e37413228228..3227b7c8a05f 100644
--- a/drivers/ata/libata-transport.c
+++ b/drivers/ata/libata-transport.c
@@ -143,6 +143,7 @@ static struct {
         { ATA_DEV_PMP_UNSUP,            "pmp" },
         { ATA_DEV_SEMB,                 "semb" },
         { ATA_DEV_SEMB_UNSUP,           "semb" },
+        { ATA_DEV_ZAC,                  "zac" },
         { ATA_DEV_NONE,                 "none" }
 };
 ata_bitfield_name_search(class, ata_class_names)