Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 61 insertions, 25 deletions

diff --git a/drivers/ata/sata_dwc_460ex.c b/drivers/ata/sata_dwc_460ex.c
index 6cf57c5c2b5f..dc88a39e7db8 100644
--- a/drivers/ata/sata_dwc_460ex.c
+++ b/drivers/ata/sata_dwc_460ex.c
@@ -40,8 +40,11 @@
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_cmnd.h>
 
+/* These two are defined in "libata.h" */
+#undef  DRV_NAME
+#undef  DRV_VERSION
 #define DRV_NAME        "sata-dwc"
-#define DRV_VERSION     "1.0"
+#define DRV_VERSION     "1.3"
 
 /* SATA DMA driver Globals */
 #define DMA_NUM_CHANS           1
@@ -333,11 +336,47 @@ static int dma_dwc_xfer_setup(struct scatterlist *sg, int num_elems,
                               void __iomem *addr, int dir);
 static void dma_dwc_xfer_start(int dma_ch);
 
+static const char *get_prot_descript(u8 protocol)
+{
+        switch ((enum ata_tf_protocols)protocol) {
+        case ATA_PROT_NODATA:
+                return "ATA no data";
+        case ATA_PROT_PIO:
+                return "ATA PIO";
+        case ATA_PROT_DMA:
+                return "ATA DMA";
+        case ATA_PROT_NCQ:
+                return "ATA NCQ";
+        case ATAPI_PROT_NODATA:
+                return "ATAPI no data";
+        case ATAPI_PROT_PIO:
+                return "ATAPI PIO";
+        case ATAPI_PROT_DMA:
+                return "ATAPI DMA";
+        default:
+                return "unknown";
+        }
+}
+
+static const char *get_dma_dir_descript(int dma_dir)
+{
+        switch ((enum dma_data_direction)dma_dir) {
+        case DMA_BIDIRECTIONAL:
+                return "bidirectional";
+        case DMA_TO_DEVICE:
+                return "to device";
+        case DMA_FROM_DEVICE:
+                return "from device";
+        default:
+                return "none";
+        }
+}
+
 static void sata_dwc_tf_dump(struct ata_taskfile *tf)
 {
         dev_vdbg(host_pvt.dwc_dev, "taskfile cmd: 0x%02x protocol: %s flags:"
-                "0x%lx device: %x\n", tf->command, ata_get_cmd_descript\
-                (tf->protocol), tf->flags, tf->device);
+                "0x%lx device: %x\n", tf->command,
+                get_prot_descript(tf->protocol), tf->flags, tf->device);
         dev_vdbg(host_pvt.dwc_dev, "feature: 0x%02x nsect: 0x%x lbal: 0x%x "
                 "lbam: 0x%x lbah: 0x%x\n", tf->feature, tf->nsect, tf->lbal,
                  tf->lbam, tf->lbah);
@@ -350,7 +389,7 @@ static void sata_dwc_tf_dump(struct ata_taskfile *tf)
 /*
  * Function: get_burst_length_encode
  * arguments: datalength: length in bytes of data
- * returns value to be programmed in register corrresponding to data length
+ * returns value to be programmed in register corresponding to data length
  * This value is effectively the log(base 2) of the length
  */
 static  int get_burst_length_encode(int datalength)
@@ -715,7 +754,7 @@ static int dma_dwc_xfer_setup(struct scatterlist *sg, int num_elems,
         /* Program the CTL register with src enable / dst enable */
         out_le32(&(host_pvt.sata_dma_regs->chan_regs[dma_ch].ctl.low),
                  DMA_CTL_LLP_SRCEN | DMA_CTL_LLP_DSTEN);
-        return 0;
+        return dma_ch;
 }
 
 /*
@@ -967,7 +1006,7 @@ static irqreturn_t sata_dwc_isr(int irq, void *dev_instance)
                 }
 
                 dev_dbg(ap->dev, "%s non-NCQ cmd interrupt, protocol: %s\n",
-                        __func__, ata_get_cmd_descript(qc->tf.protocol));
+                        __func__, get_prot_descript(qc->tf.protocol));
 DRVSTILLBUSY:
                 if (ata_is_dma(qc->tf.protocol)) {
                         /*
@@ -1057,7 +1096,7 @@ DRVSTILLBUSY:
 
                 /* Process completed command */
                 dev_dbg(ap->dev, "%s NCQ command, protocol: %s\n", __func__,
-                        ata_get_cmd_descript(qc->tf.protocol));
+                        get_prot_descript(qc->tf.protocol));
                 if (ata_is_dma(qc->tf.protocol)) {
                         host_pvt.dma_interrupt_count++;
                         if (hsdevp->dma_pending[tag] == \
@@ -1142,8 +1181,8 @@ static void sata_dwc_dma_xfer_complete(struct ata_port *ap, u32 check_status)
         if (tag > 0) {
                 dev_info(ap->dev, "%s tag=%u cmd=0x%02x dma dir=%s proto=%s "
                          "dmacr=0x%08x\n", __func__, qc->tag, qc->tf.command,
-                         ata_get_cmd_descript(qc->dma_dir),
-                         ata_get_cmd_descript(qc->tf.protocol),
+                         get_dma_dir_descript(qc->dma_dir),
+                         get_prot_descript(qc->tf.protocol),
                          in_le32(&(hsdev->sata_dwc_regs->dmacr)));
         }
 #endif
@@ -1354,7 +1393,7 @@ static void sata_dwc_exec_command_by_tag(struct ata_port *ap,
         struct sata_dwc_device_port *hsdevp = HSDEVP_FROM_AP(ap);
 
         dev_dbg(ap->dev, "%s cmd(0x%02x): %s tag=%d\n", __func__, tf->command,
-                ata_get_cmd_descript(tf), tag);
+                ata_get_cmd_descript(tf->command), tag);
 
         spin_lock_irqsave(&ap->host->lock, flags);
         hsdevp->cmd_issued[tag] = cmd_issued;
@@ -1413,7 +1452,7 @@ static void sata_dwc_bmdma_start_by_tag(struct ata_queued_cmd *qc, u8 tag)
 
         dev_dbg(ap->dev, "%s qc=%p tag: %x cmd: 0x%02x dma_dir: %s "
                 "start_dma? %x\n", __func__, qc, tag, qc->tf.command,
-                ata_get_cmd_descript(qc->dma_dir), start_dma);
+                get_dma_dir_descript(qc->dma_dir), start_dma);
         sata_dwc_tf_dump(&(qc->tf));
 
         if (start_dma) {
@@ -1462,10 +1501,9 @@ static void sata_dwc_qc_prep_by_tag(struct ata_queued_cmd *qc, u8 tag)
         int dma_chan;
         struct sata_dwc_device *hsdev = HSDEV_FROM_AP(ap);
         struct sata_dwc_device_port *hsdevp = HSDEVP_FROM_AP(ap);
-        int err;
 
         dev_dbg(ap->dev, "%s: port=%d dma dir=%s n_elem=%d\n",
-                __func__, ap->port_no, ata_get_cmd_descript(qc->dma_dir),
+                __func__, ap->port_no, get_dma_dir_descript(qc->dma_dir),
                  qc->n_elem);
 
         dma_chan = dma_dwc_xfer_setup(sg, qc->n_elem, hsdevp->llit[tag],
@@ -1474,7 +1512,7 @@ static void sata_dwc_qc_prep_by_tag(struct ata_queued_cmd *qc, u8 tag)
                                       dmadr), qc->dma_dir);
         if (dma_chan < 0) {
                 dev_err(ap->dev, "%s: dma_dwc_xfer_setup returns err %d\n",
-                        __func__, err);
+                        __func__, dma_chan);
                 return;
         }
         hsdevp->dma_chan[tag] = dma_chan;
@@ -1491,8 +1529,8 @@ static unsigned int sata_dwc_qc_issue(struct ata_queued_cmd *qc)
                 dev_info(ap->dev, "%s ap id=%d cmd(0x%02x)=%s qc tag=%d "
                          "prot=%s ap active_tag=0x%08x ap sactive=0x%08x\n",
                          __func__, ap->print_id, qc->tf.command,
-                         ata_get_cmd_descript(&qc->tf),
-                         qc->tag, ata_get_cmd_descript(qc->tf.protocol),
+                         ata_get_cmd_descript(qc->tf.command),
+                         qc->tag, get_prot_descript(qc->tf.protocol),
                          ap->link.active_tag, ap->link.sactive);
 #endif
 
@@ -1533,7 +1571,7 @@ static void sata_dwc_qc_prep(struct ata_queued_cmd *qc)
 #ifdef DEBUG_NCQ
         if (qc->tag > 0)
                 dev_info(qc->ap->dev, "%s: qc->tag=%d ap->active_tag=0x%08x\n",
-                         __func__, tag, qc->ap->link.active_tag);
+                         __func__, qc->tag, qc->ap->link.active_tag);
 
         return ;
 #endif
@@ -1580,16 +1618,14 @@ static struct ata_port_operations sata_dwc_ops = {
 
 static const struct ata_port_info sata_dwc_port_info[] = {
         {
-                .flags          = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
-                                  ATA_FLAG_MMIO | ATA_FLAG_NCQ,
-                .pio_mask       = 0x1f, /* pio 0-4 */
+                .flags          = ATA_FLAG_SATA | ATA_FLAG_NCQ,
+                .pio_mask       = ATA_PIO4,
                 .udma_mask      = ATA_UDMA6,
                 .port_ops       = &sata_dwc_ops,
         },
 };
 
-static int sata_dwc_probe(struct platform_device *ofdev,
-                        const struct of_device_id *match)
+static int sata_dwc_probe(struct platform_device *ofdev)
 {
         struct sata_dwc_device *hsdev;
         u32 idr, versionr;
@@ -1727,7 +1763,7 @@ static const struct of_device_id sata_dwc_match[] = {
 };
 MODULE_DEVICE_TABLE(of, sata_dwc_match);
 
-static struct of_platform_driver sata_dwc_driver = {
+static struct platform_driver sata_dwc_driver = {
         .driver = {
                 .name = DRV_NAME,
                 .owner = THIS_MODULE,
@@ -1739,12 +1775,12 @@ static struct of_platform_driver sata_dwc_driver = {
 
 static int __init sata_dwc_init(void)
 {
-        return  of_register_platform_driver(&sata_dwc_driver);
+        return platform_driver_register(&sata_dwc_driver);
 }
 
 static void __exit sata_dwc_exit(void)
 {
-        of_unregister_platform_driver(&sata_dwc_driver);
+        platform_driver_unregister(&sata_dwc_driver);
 }
 
 module_init(sata_dwc_init);