Merge branch 'for-3.19-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...

09c32aaa3683 ("ahci_xgene: Fix the dma state machine lockup for the
ATA_CMD_SMART PIO mode command.") missed 3.19 release.  Fold it into
for-3.20.

Signed-off-by: Tejun Heo <tj@kernel.org>

diff --cc drivers/ata/Kconfig
Simple merge

diff --cc drivers/ata/ahci_xgene.c
index e3b8750,f752c30..2e8bb60
--- 1/drivers/ata/ahci_xgene.c
--- 2/drivers/ata/ahci_xgene.c
+++ b/drivers/ata/ahci_xgene.c
@@@ -198,22 -137,10 +198,23 @@@ static unsigned int xgene_ahci_qc_issue
        struct ahci_host_priv *hpriv = ap->host->private_data;
        struct xgene_ahci_context *ctx = hpriv->plat_data;
        int rc = 0;
 +      u32 port_fbs;
 +      void *port_mmio = ahci_port_base(ap);
 +
 +      /*
 +       * Write the pmp value to PxFBS.DEV
 +       * for case of Port Mulitplier.
 +       */
 +      if (ctx->class[ap->port_no] == ATA_DEV_PMP) {
 +              port_fbs = readl(port_mmio + PORT_FBS);
 +              port_fbs &= ~PORT_FBS_DEV_MASK;
 +              port_fbs |= qc->dev->link->pmp << PORT_FBS_DEV_OFFSET;
 +              writel(port_fbs, port_mmio + PORT_FBS);
 +      }
  
        if (unlikely((ctx->last_cmd[ap->port_no] == ATA_CMD_ID_ATA) ||
-           (ctx->last_cmd[ap->port_no] == ATA_CMD_PACKET)))
+           (ctx->last_cmd[ap->port_no] == ATA_CMD_PACKET) ||
+           (ctx->last_cmd[ap->port_no] == ATA_CMD_SMART)))
                xgene_ahci_restart_engine(ap);
  
        rc = ahci_qc_issue(qc);

diff --cc drivers/ata/libata-core.c
Simple merge

diff --cc drivers/ata/libata-scsi.c
Simple merge

diff --cc include/linux/libata.h
Simple merge