Feng Kan wrote:
Signed-off-by: Feng Kan <f...@amcc.com>
Signed-off-by: Mark Miesfeld <miesf...@gmail.com>
---
 drivers/ata/Kconfig    |   10 +
 drivers/ata/Makefile   |    1 +
 drivers/ata/sata_dwc.c | 2053 ++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 2064 insertions(+), 0 deletions(-)
 create mode 100644 drivers/ata/sata_dwc.c

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 0bcf264..c3d0b24 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -72,6 +72,16 @@ config SATA_FSL
If unsure, say N. +config SATA_DWC
+       tristate "DesignWare Cores SATA support"
+       depends on 460EX
+       help
+         This option enables support for the Synopsys DesignWare Cores SATA
+         controller.
+         It can be found on the AMCC 460EX.
+
+         If unsure, say N.
+
 config ATA_SFF
        bool "ATA SFF support"
        default y
diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile
index 7f1ecf9..3d41fc7 100644
--- a/drivers/ata/Makefile
+++ b/drivers/ata/Makefile
@@ -18,6 +18,7 @@ obj-$(CONFIG_SATA_MV)         += sata_mv.o
 obj-$(CONFIG_SATA_INIC162X)    += sata_inic162x.o
 obj-$(CONFIG_PDC_ADMA)         += pdc_adma.o
 obj-$(CONFIG_SATA_FSL)         += sata_fsl.o
+obj-$(CONFIG_SATA_DWC)          += sata_dwc.o
obj-$(CONFIG_PATA_ALI) += pata_ali.o
 obj-$(CONFIG_PATA_AMD)         += pata_amd.o
diff --git a/drivers/ata/sata_dwc.c b/drivers/ata/sata_dwc.c
new file mode 100644
index 0000000..672f91f
--- /dev/null
+++ b/drivers/ata/sata_dwc.c
@@ -0,0 +1,2053 @@
+/*
+ * drivers/ata/sata_dwc.c
+ *
+ * Synopsys DesignWare Cores (DWC) SATA host driver
+ *
+ * Author: Mark Miesfeld <mmiesf...@amcc.com>
+ *
+ * Ported from 2.6.19.2 to 2.6.25/26 by Stefan Roese <s...@denx.de>
+ * Copyright 2008 DENX Software Engineering
+ *
+ * Based on versions provided by AMCC and Synopsys which are:
+ *          Copyright 2006 Applied Micro Circuits Corporation
+ *          COPYRIGHT (C) 2005  SYNOPSYS, INC.  ALL RIGHTS RESERVED
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ *
+ */
+#ifdef CONFIG_SATA_DWC_DEBUG
+#define DEBUG
+#endif
+
+#ifdef CONFIG_SATA_DWC_VDEBUG
+#define VERBOSE_DEBUG
+#define DEBUG_NCQ
+#endif
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include <linux/libata.h>
+
+#include <scsi/scsi_host.h>
+#include <scsi/scsi_cmnd.h>
+
+#define DRV_NAME        "sata-dwc"
+#define DRV_VERSION     "1.0"
+
+/* SATA DMA driver Globals */
+#define DMA_NUM_CHANS                  1
+#define DMA_NUM_CHAN_REGS              8
+
+/* SATA DMA Register definitions */
+#define AHB_DMA_BRST_DFLT              64      /* 16 data items burst length */
+
+struct dmareg {
+       u32 low;                /* Low bits 0-31 */
+       u32 high;               /* High bits 32-63 */
+};
+
+/* DMA Per Channel registers */
+
+struct dma_chan_regs {
+       struct dmareg sar;      /* Source Address */
+       struct dmareg dar;      /* Destination address */
+       struct dmareg llp;      /* Linked List Pointer */
+       struct dmareg ctl;      /* Control */
+       struct dmareg sstat;    /* Source Status not implemented in core */
+       struct dmareg dstat;    /* Destination Status not implemented in core */
+       struct dmareg sstatar;  /* Source Status Address not impl in core */
+       struct dmareg dstatar;  /* Destination Status Address not implemented */
+       struct dmareg cfg;      /* Config */
+       struct dmareg sgr;      /* Source Gather */
+       struct dmareg dsr;      /* Destination Scatter */
+};
+
+/* Generic Interrupt Registers */
+struct dma_interrupt_regs {
+       struct dmareg tfr;      /* Transfer Interrupt */
+       struct dmareg block;    /* Block Interrupt */
+       struct dmareg srctran;  /* Source Transfer Interrupt */
+       struct dmareg dsttran;  /* Dest Transfer Interrupt */
+       struct dmareg error;    /* Error */
+};
+
+struct ahb_dma_regs {
+       struct dma_chan_regs    chan_regs[DMA_NUM_CHAN_REGS];
+       struct dma_interrupt_regs interrupt_raw;        /* Raw Interrupt */
+       struct dma_interrupt_regs interrupt_status;     /* Interrupt Status */
+       struct dma_interrupt_regs interrupt_mask;       /* Interrupt Mask */
+       struct dma_interrupt_regs interrupt_clear;      /* Interrupt Clear */
+       struct dmareg           statusInt;              /* Interrupt combined */
+       struct dmareg           rq_srcreg;              /* Src Trans Req */
+       struct dmareg           rq_dstreg;              /* Dst Trans Req */
+       struct dmareg           rq_sgl_srcreg;          /* Sngl Src Trans Req */
+       struct dmareg           rq_sgl_dstreg;          /* Sngl Dst Trans Req */
+       struct dmareg           rq_lst_srcreg;          /* Last Src Trans Req */
+       struct dmareg           rq_lst_dstreg;          /* Last Dst Trans Req */
+       struct dmareg           dma_cfg;                /* DMA Config */
+       struct dmareg           dma_chan_en;            /* DMA Channel Enable */
+       struct dmareg           dma_id;                 /* DMA ID */
+       struct dmareg           dma_test;               /* DMA Test */
+       struct dmareg           res1;                   /* reserved */
+       struct dmareg           res2;                   /* reserved */
+
+       /* DMA Comp Params
+        * Param 6 = dma_param[0], Param 5 = dma_param[1],
+        * Param 4 = dma_param[2] ...
+        */
+       struct dmareg           dma_params[6];
+};
+
+/* Data structure for linked list item */
+struct lli {
+       u32             sar;            /* Source Address */
+       u32             dar;            /* Destination address */
+       u32             llp;            /* Linked List Pointer */
+       struct dmareg   ctl;            /* Control */
+       struct dmareg   dstat;          /* Destination Status */
+};
+
+#define SATA_DWC_DMAC_LLI_SZ           (sizeof(struct lli))
+#define SATA_DWC_DMAC_LLI_NUM          256
+#define SATA_DWC_DMAC_TWIDTH_BYTES     4
+#define SATA_DWC_DMAC_LLI_TBL_SZ       \
+       (SATA_DWC_DMAC_LLI_SZ * SATA_DWC_DMAC_LLI_NUM)
+#define SATA_DWC_DMAC_CTRL_TSIZE_MAX   \
+       (0x00000800 * SATA_DWC_DMAC_TWIDTH_BYTES)
+
+/* DMA Register Operation Bits */
+#define DMA_EN                 0x00000001              /* Enable AHB DMA */
+#define DMA_CHANNEL(ch)                (0x00000001 << (ch))      /* Select 
channel */
+#define DMA_ENABLE_CHAN(ch)    ((0x00000001 << (ch)) |                   \
+                                ((0x000000001 << (ch)) << 8))
+#define DMA_DISABLE_CHAN(ch)   (0x00000000 | ((0x000000001 << (ch)) << 8))
+
+/* Channel Control Register */
+#define DMA_CTL_BLK_TS(size)   ((size) & 0x000000FFF)      /* Blk Transfer 
size */
+#define DMA_CTL_LLP_SRCEN      0x10000000      /* Blk chain enable Src */
+#define DMA_CTL_LLP_DSTEN      0x08000000      /* Blk chain enable Dst */
+/*
+ * This define is used to set block chaining disabled in the control low
+ * register.  It is already in little endian format so it can be &'d dirctly.
+ * It is essentially: cpu_to_le32(~(DMA_CTL_LLP_SRCEN | DMA_CTL_LLP_DSTEN))
+ */
+#define DMA_CTL_LLP_DISABLE_LE32 0xffffffe7
+#define DMA_CTL_SMS(num)       ((num & 0x3) << 25)   /*Src Master Select*/
+#define DMA_CTL_DMS(num)       ((num & 0x3) << 23)   /*Dst Master Select*/
+#define DMA_CTL_TTFC(type)     ((type & 0x7) << 20)  /*Type&Flow cntr*/
+#define DMA_CTL_TTFC_P2M_DMAC  0x00000002              /*Per mem,DMAC cntr*/
+#define DMA_CTL_TTFC_M2P_PER   0x00000003              /*Mem per,peri cntr*/
+#define DMA_CTL_SRC_MSIZE(size)        ((size & 0x7) << 14)  /*Src Burst Len*/
+#define DMA_CTL_DST_MSIZE(size)        ((size & 0x7) << 11)  /*Dst Burst Len*/
+#define DMA_CTL_SINC_INC       0x00000000              /*Src addr incr*/
+#define DMA_CTL_SINC_DEC       0x00000200
+#define DMA_CTL_SINC_NOCHANGE  0x00000400
+#define DMA_CTL_DINC_INC       0x00000000              /*Dst addr incr*/
+#define DMA_CTL_DINC_DEC       0x00000080
+#define DMA_CTL_DINC_NOCHANGE  0x00000100
+#define DMA_CTL_SRC_TRWID(size)        ((size & 0x7) << 4)   /*Src Trnsfr 
Width*/
+#define DMA_CTL_DST_TRWID(size)        ((size & 0x7) << 1)   /*Dst Trnsfr 
Width*/
+#define DMA_CTL_INT_EN         0x00000001              /*Interrupt Enable*/
+
+/* Channel Configuration Register high bits */
+#define DMA_CFG_FCMOD_REQ      0x00000001              /*Flow cntrl req*/
+#define DMA_CFG_PROTCTL                (0x00000003 << 2) /*Protection cntrl*/
+
+/* Channel Configuration Register low bits */
+#define DMA_CFG_RELD_DST       0x80000000              /*Reload Dst/Src Addr*/
+#define DMA_CFG_RELD_SRC       0x40000000
+#define DMA_CFG_HS_SELSRC      0x00000800              /*SW hndshk Src/Dst*/
+#define DMA_CFG_HS_SELDST      0x00000400
+#define DMA_CFG_FIFOEMPTY       (0x00000001 << 9)        /*FIFO Empty bit*/
+
+/* Assign hardware handshaking interface (x) to dst / sre peripheral */
+#define DMA_CFG_HW_HS_DEST(int_num)    ((int_num & 0xF) << 11)
+#define DMA_CFG_HW_HS_SRC(int_num)     ((int_num & 0xF) << 7)
+
+/* Channel Linked List Pointer Register */
+#define DMA_LLP_LMS(addr, master)      (((addr) & 0xfffffffc) | (master))
+#define DMA_LLP_AHBMASTER1             0       /* List Master Select */
+#define DMA_LLP_AHBMASTER2             1
+
+#define SATA_DWC_MAX_PORTS     1
+
+#define SATA_DWC_SCR_OFFSET    0x24
+#define SATA_DWC_REG_OFFSET    0x64

Use 'enum' rather than pre-processor #defines, for creating constants, as we do in the rest of libata. This gives more debugger and compiler symbol visibility, and makes pre-processed source much easier to read.


+/* DWC SATA Registers */
+struct sata_dwc_regs {
+       u32 fptagr;             /* 1st party DMA tag */
+       u32 fpbor;              /* 1st party DMA buffer offset */
+       u32 fptcr;              /* 1st party DMA Xfr count */
+       u32 dmacr;              /* DMA Control */
+       u32 dbtsr;              /* DMA Burst Transac size */
+       u32 intpr;              /* Interrupt Pending */
+       u32 intmr;              /* Interrupt Mask */
+       u32 errmr;              /* Error Mask */
+       u32 llcr;               /* Link Layer Control */
+       u32 phycr;              /* PHY Control */
+       u32 physr;              /* PHY Status */
+       u32 rxbistpd;           /* Recvd BIST pattern def register */
+       u32 rxbistpd1;          /* Recvd BIST data dword1 */
+       u32 rxbistpd2;          /* Recvd BIST pattern data dword2 */
+       u32 txbistpd;           /* Trans BIST pattern def register */
+       u32 txbistpd1;          /* Trans BIST data dword1 */
+       u32 txbistpd2;          /* Trans BIST data dword2 */
+       u32 bistcr;             /* BIST Control Register */
+       u32 bistfctr;           /* BIST FIS Count Register */
+       u32 bistsr;             /* BIST Status Register */
+       u32 bistdecr;           /* BIST Dword Error count register */
+       u32 res[15];            /* Reserved locations */
+       u32 testr;              /* Test Register */
+       u32 versionr;           /* Version Register */
+       u32 idr;                /* ID Register */
+       u32 unimpl[192];        /* Unimplemented */
+       u32 dmadr[256]; /* FIFO Locations in DMA Mode */
+};
+
+#define SCR_SCONTROL_DET_ENABLE                0x00000001
+#define SCR_SSTATUS_DET_PRESENT                0x00000001
+#define SCR_SERROR_DIAG_X              0x04000000
+
+/* DWC SATA Register Operations */
+#define        SATA_DWC_TXFIFO_DEPTH           0x01FF
+#define        SATA_DWC_RXFIFO_DEPTH           0x01FF
+
+#define SATA_DWC_DMACR_TMOD_TXCHEN     0x00000004
+#define        SATA_DWC_DMACR_TXCHEN           (0x00000001 | \
+                                               SATA_DWC_DMACR_TMOD_TXCHEN)
+#define        SATA_DWC_DMACR_RXCHEN           (0x00000002 | \
+                                               SATA_DWC_DMACR_TMOD_TXCHEN)
+#define SATA_DWC_DMACR_TX_CLEAR(v)     (((v) & ~SATA_DWC_DMACR_TXCHEN) | \
+                                               SATA_DWC_DMACR_TMOD_TXCHEN)
+#define SATA_DWC_DMACR_RX_CLEAR(v)     (((v) & ~SATA_DWC_DMACR_RXCHEN) | \
+                                               SATA_DWC_DMACR_TMOD_TXCHEN)
+#define SATA_DWC_DMACR_TXRXCH_CLEAR    SATA_DWC_DMACR_TMOD_TXCHEN
+
+#define SATA_DWC_DBTSR_MWR(size)       ((size/4) & \
+                                               SATA_DWC_TXFIFO_DEPTH)
+#define SATA_DWC_DBTSR_MRD(size)       (((size/4) & \
+                                               SATA_DWC_RXFIFO_DEPTH) << 16)
+#define        SATA_DWC_INTPR_DMAT             0x00000001
+#define SATA_DWC_INTPR_NEWFP           0x00000002
+#define SATA_DWC_INTPR_PMABRT          0x00000004
+#define SATA_DWC_INTPR_ERR             0x00000008
+#define SATA_DWC_INTPR_NEWBIST         0x00000010
+#define SATA_DWC_INTPR_IPF             0x10000000
+#define        SATA_DWC_INTMR_DMATM            0x00000001
+#define SATA_DWC_INTMR_NEWFPM          0x00000002
+#define SATA_DWC_INTMR_PMABRTM         0x00000004
+#define SATA_DWC_INTMR_ERRM            0x00000008
+#define SATA_DWC_INTMR_NEWBISTM                0x00000010
+#define SATA_DWC_LLCR_SCRAMEN          0x00000001
+#define SATA_DWC_LLCR_DESCRAMEN                0x00000002
+#define SATA_DWC_LLCR_RPDEN            0x00000004

ditto


+struct sata_dwc_device {
+       struct device           *dev;           /* generic device struct */
+       struct ata_probe_ent    *pe;            /* ptr to probe-ent */
+       struct ata_host         *host;
+       u8                      *reg_base;
+       struct sata_dwc_regs    *sata_dwc_regs; /* DW Synopsys SATA specific */
+       int                     irq_dma;
+};

I think this is missing __iomem notations and 'sparse' checks (Documentation/sparse.txt)


+ */
+static u32 sata_dwc_sactive_issued;    /* issued queued ops */
+static u32 sata_dwc_sactive_queued;    /* queued ops */
+static struct ahb_dma_regs *sata_dma_regs;
+static u32 dma_interrupt_count;
+static void *scr_addr_sstatus;
+static struct device *dwc_dev;

create a host-private struct, do not use global variables.

Global variables are discouraged because they create a barrier to supporting multiple controller instances in a single driver -- and also because people look at existing driver code for examples, and this creates a poor example


+static void sata_dwc_bmdma_start_by_tag(struct ata_queued_cmd *qc, u8 tag);
+static int sata_dwc_qc_complete(struct ata_port *ap, struct ata_queued_cmd *qc,
+                               u32 check_status);
+static void sata_dwc_dma_xfer_complete(struct ata_port *ap, u32 check_status);
+static void sata_dwc_port_stop(struct ata_port *ap);
+static void sata_dwc_clear_dmacr(struct sata_dwc_device_port *hsdevp, u8 tag);
+
+static int dma_dwc_init(struct sata_dwc_device *hsdev, struct resource *res,
+                       int irq);
+static void dma_dwc_exit(struct sata_dwc_device *hsdev);
+static int dma_dwc_xfer_setup(struct scatterlist *sg, int num_elems,
+                             struct lli *lli, dma_addr_t dma_lli,
+                             void __iomem *addr, int dir);
+static void dma_dwc_xfer_start(int dma_ch);
+static void dma_dwc_terminate_dma(int dma_ch);
+
+static const char *dir_2_txt(enum dma_data_direction dir)
+{
+       switch (dir) {
+       case DMA_BIDIRECTIONAL:
+               return "bi";
+       case DMA_FROM_DEVICE:
+               return "from";
+       case DMA_TO_DEVICE:
+               return "to";
+       case DMA_NONE:
+               return "none";
+       default:
+               return "err";
+       }
+}
+
+static const char *prot_2_txt(enum ata_tf_protocols protocol)
+{
+       switch (protocol) {
+       case ATA_PROT_UNKNOWN:
+               return "unknown";
+       case ATA_PROT_NODATA:
+               return "nodata";
+       case ATA_PROT_PIO:
+               return "pio";
+       case ATA_PROT_DMA:
+               return "dma";
+       case ATA_PROT_NCQ:
+               return "ncq";
+       case ATAPI_PROT_PIO:
+               return "atapi pio";
+       case ATAPI_PROT_NODATA:
+               return "atapi nodata";
+       case ATAPI_PROT_DMA:
+               return "atapi dma";
+       default:
+               return "err";
+       }
+}
+
+inline const char *ata_cmd_2_txt(const struct ata_taskfile *tf)
+{
+       switch (tf->command) {
+       case ATA_CMD_CHK_POWER:
+               return "ATA_CMD_CHK_POWER";
+       case ATA_CMD_EDD:
+               return "ATA_CMD_EDD";
+       case ATA_CMD_FLUSH:
+               return "ATA_CMD_FLUSH";
+       case ATA_CMD_FLUSH_EXT:
+               return "ATA_CMD_FLUSH_EXT";
+       case ATA_CMD_ID_ATA:
+               return "ATA_CMD_ID_ATA";
+       case ATA_CMD_ID_ATAPI:
+               return "ATA_CMD_ID_ATAPI";
+       case ATA_CMD_FPDMA_READ:
+               return "ATA_CMD_FPDMA_READ";
+       case ATA_CMD_FPDMA_WRITE:
+               return "ATA_CMD_FPDMA_WRITE";
+       case ATA_CMD_READ:
+               return "ATA_CMD_READ";
+       case ATA_CMD_READ_EXT:
+               return "ATA_CMD_READ_EXT";
+       case ATA_CMD_WRITE:
+               return "ATA_CMD_WRITE";
+       case ATA_CMD_WRITE_EXT:
+               return "ATA_CMD_WRITE_EXT";
+       case ATA_CMD_PIO_READ:
+               return "ATA_CMD_PIO_READ";
+       case ATA_CMD_PIO_READ_EXT:
+               return "ATA_CMD_PIO_READ_EXT";
+       case ATA_CMD_PIO_WRITE:
+               return "ATA_CMD_PIO_WRITE";
+       case ATA_CMD_PIO_WRITE_EXT:
+               return "ATA_CMD_PIO_WRITE_EXT";
+       case ATA_CMD_SET_FEATURES:
+               return "ATA_CMD_SET_FEATURES";
+       case ATA_CMD_PACKET:
+               return "ATA_CMD_PACKET";
+       default:
+               return "ATA_CMD_???";

libata already has debugging facilties. we don't need this generic dump stuff in a specific driver.


+static void sata_dwc_tf_dump(struct ata_taskfile *tf)
+{
+       dev_vdbg(dwc_dev, "taskfile cmd: 0x%02x protocol: %s flags: 0x%lx"
+                       "device: %x\n", tf->command, prot_2_txt(tf->protocol),
+                       tf->flags, tf->device);
+       dev_vdbg(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);
+       dev_vdbg(dwc_dev, "hob_feature: 0x%02x hob_nsect: 0x%x hob_lbal: 0x%x "
+                       "hob_lbam: 0x%x hob_lbah: 0x%x\n", tf->hob_feature,
+                       tf->hob_nsect, tf->hob_lbal, tf->hob_lbam,
+                       tf->hob_lbah);

ditto


+ * Function: get_burst_length_encode
+ * arguments: datalength: length in bytes of data
+ * returns value to be programmed in register corrresponding to data length
+ * This value is effectively the log(base 2) of the length
+ */
+static inline int get_burst_length_encode(int datalength)
+{
+       int items = datalength >> 2;      /* div by 4 to get lword count */
+
+       if (items >= 64)
+               return 5;
+
+       if (items >= 32)
+               return 4;
+
+       if (items >= 16)
+               return 3;
+
+       if (items >= 8)
+               return 2;
+
+       if (items >= 4)
+               return 1;
+
+       return 0;
+}
+
+static inline void clear_chan_interrupts(int c)
+{
+       out_le32(&(sata_dma_regs->interrupt_clear.tfr.low), DMA_CHANNEL(c));
+       out_le32(&(sata_dma_regs->interrupt_clear.block.low), DMA_CHANNEL(c));
+       out_le32(&(sata_dma_regs->interrupt_clear.srctran.low), DMA_CHANNEL(c));
+       out_le32(&(sata_dma_regs->interrupt_clear.dsttran.low), DMA_CHANNEL(c));
+       out_le32(&(sata_dma_regs->interrupt_clear.error.low), DMA_CHANNEL(c));
+}
+
+/*
+ * Function: dma_request_channel
+ * arguments: None
+ * returns channel number if available else -1
+ * This function assigns the next available DMA channel from the list to the
+ * requester
+ */
+static int dma_request_channel(void)
+{
+       int i;
+       struct ahb_dma_regs *pdma;
+
+       pdma = sata_dma_regs;
+       for (i = 0; i < DMA_NUM_CHANS; i++) {
+               if (!(in_le32(&(pdma->dma_chan_en.low)) & DMA_CHANNEL(i)))
+                       return i;
+       }
+
+       dev_err(dwc_dev, "%s NO channel chan_en: 0x%08x\n", __func__,
+               in_le32(&(pdma->dma_chan_en.low)));
+
+       return -1;
+}
+
+/*
+ * Function: dma_dwc_interrupt
+ * arguments: irq, dev_id, pt_regs
+ * returns channel number if available else -1
+ * Interrupt Handler for DW AHB SATA DMA
+ */
+static irqreturn_t dma_dwc_interrupt(int irq, void *hsdev_instance)
+{
+       int chan;
+       u32 tfr_reg, err_reg;
+       unsigned long flags;
+       struct sata_dwc_device *hsdev =
+               (struct sata_dwc_device *)hsdev_instance;
+       struct ata_host *host = (struct ata_host *)hsdev->host;
+       struct ata_port *ap;
+       struct sata_dwc_device_port *hsdevp;
+       u8 tag = 0;
+       unsigned int port = 0;
+
+       spin_lock_irqsave(&host->lock, flags);
+
+       ap = host->ports[port];
+       hsdevp = HSDEVP_FROM_AP(ap);
+       tag = ap->link.active_tag;
+
+       tfr_reg = in_le32(&(sata_dma_regs->interrupt_status.tfr.low));
+       err_reg = in_le32(&(sata_dma_regs->interrupt_status.error.low));
+
+       dev_dbg(ap->dev, "eot=0x%08x err=0x%08x pending=%d active port=%d\n",
+               tfr_reg, err_reg, hsdevp->dma_pending[tag], port);
+
+       for (chan = 0; chan < DMA_NUM_CHANS; chan++) {
+               /* Check for end-of-transfer interrupt. */
+               if (tfr_reg & DMA_CHANNEL(chan)) {
+ /* + *Each DMA command produces 2 interrupts. Only
+                        * complete the command after both interrupts have been
+                        * seen. (See sata_dwc_isr())
+                        */
+                       dma_interrupt_count++;
+
+                       sata_dwc_clear_dmacr(hsdevp, tag);
+
+                       if (hsdevp->dma_pending[tag] == 0) {
+                               dev_err(ap->dev, "DMA not pending eot=0x%08x "
+                                       "err=0x%08x tag=0x%02x pending=%d\n",
+                                       tfr_reg, err_reg, tag,
+                                       hsdevp->dma_pending[tag]);
+                       }
+
+                       if ((dma_interrupt_count % 2) == 0)
+                               sata_dwc_dma_xfer_complete(ap, 1);
+
+                       /* Clear the interrupt */
+                       out_le32(&(sata_dma_regs->interrupt_clear.tfr.low),
+                                DMA_CHANNEL(chan));
+               }
+
+               /* Check for error interrupt. */
+               if (err_reg & DMA_CHANNEL(chan)) {
+                       /* TODO Need error handler ! */
+                       dev_err(ap->dev, "error interrupt err_reg=0x%08x\n",
+                                       err_reg);
+
+                       /* Clear the interrupt. */
+                       out_le32(&(sata_dma_regs->interrupt_clear.error.low),
+                                DMA_CHANNEL(chan));
+               }
+       }
+
+       spin_unlock_irqrestore(&host->lock, flags);


spin_lock_irqsave() is most likely expensive overkill. Use spin_lock() unless you have concrete justification for something else.


+/*
+ * Function: dma_request_interrupts
+ * arguments: hsdev
+ * returns status
+ * This function registers ISR for a particular DMA channel interrupt
+ */
+static int dma_request_interrupts(struct sata_dwc_device *hsdev, int irq)
+{
+       int retval = 0;
+       int chan;
+
+       for (chan = 0; chan < DMA_NUM_CHANS; chan++) {
+               /* Unmask error interrupt */
+               out_le32(&sata_dma_regs->interrupt_mask.error.low,
+                        DMA_ENABLE_CHAN(chan));
+
+               /* Unmask end-of-transfer interrupt */
+               out_le32(&sata_dma_regs->interrupt_mask.tfr.low,
+                        DMA_ENABLE_CHAN(chan));
+       }
+
+       retval = request_irq(irq, dma_dwc_interrupt, 0, "SATA DMA", hsdev);
+       if (retval) {
+               dev_err(dwc_dev, "%s: could not get IRQ %d\n", __func__, irq);
+               return -ENODEV;
+       }
+
+       /* Mark this interrupt as requested */
+       hsdev->irq_dma = irq;
+
+       return 0;
+}
+
+/*
+ * Function: map_sg_to_lli
+ * arguments: sg: scatter/gather list(sg)
+ *           num_elems: no of elements in sg list
+ *           dma_lli: LLI table
+ *           dest: destination address
+ *           read: whether the transfer is read or write
+ * returns array of AHB DMA Linked List Items
+ * This function creates a list of LLIs for DMA Xfr and returns the number
+ * of elements in the DMA linked list.
+ *
+ * Note that the Synopsis driver has a comment proposing that better 
performance
+ * is possible by only enabling interrupts on the last item in the linked list.
+ * However, it seems that could be a problem if an error happened on one of the
+ * first items.  The transfer would halt, but no error interrupt would occur.
+ *
+ * Currently this function sets interrupts enabled for each linked list item:
+ * DMA_CTL_INT_EN.
+ */
+static int map_sg_to_lli(struct scatterlist *sg, int num_elems, struct lli 
*lli,
+                        dma_addr_t dma_lli, void __iomem *dmadr_addr, int dir)
+{
+       int i, idx = 0;
+       int fis_len = 0;
+       dma_addr_t next_llp;
+       int bl;
+       unsigned int dma_ts = 0;
+
+       dev_dbg(dwc_dev, "%s: sg=%p nelem=%d lli=%p dma_lli=0x%08x "
+               "dmadr=0x%08x\n", __func__, sg, num_elems, lli, (u32)dma_lli,
+               (u32)dmadr_addr);
+
+       bl = get_burst_length_encode(AHB_DMA_BRST_DFLT);
+
+       for (i = 0; i < num_elems; i++, sg++) {
+               u32 addr, offset;
+               u32 sg_len, len;
+
+               addr = (u32) sg_dma_address(sg);
+               sg_len = sg_dma_len(sg);
+
+               dev_dbg(dwc_dev, "%s: elem=%d sg_addr=0x%x sg_len=%d\n",
+                       __func__, i, addr, sg_len);
+
+               while (sg_len) {
+
+                       if (idx >= SATA_DWC_DMAC_LLI_NUM) {
+                               /* The LLI table is not large enough. */
+                               dev_err(dwc_dev, "LLI table overrun (idx=%d)\n",
+                                               idx);
+                               break;
+                       }
+                       len = (sg_len > SATA_DWC_DMAC_CTRL_TSIZE_MAX) ?
+                               SATA_DWC_DMAC_CTRL_TSIZE_MAX : sg_len;
+
+                       offset = addr & 0xffff;
+                       if ((offset + sg_len) > 0x10000)
+                               len = 0x10000 - offset;
+
+                       /*
+                        * Make sure a LLI block is not created that will span a
+                        * 8K max FIS boundary.  If the block spans such a FIS
+                        * boundary, there is a chance that a DMA burst will
+                        * cross that boundary -- this results in an error in
+                        * the host controller.
+                        */
+                       if (fis_len + len > 8192) {
+                               dev_dbg(dwc_dev, "SPLITTING: fis_len=%d(0x%x) "
+                                       "len=%d(0x%x)\n", fis_len, fis_len,
+                                       len, len);
+                               len = 8192 - fis_len;
+                               fis_len = 0;
+                       } else {
+                               fis_len += len;
+                       }
+                       if (fis_len == 8192)
+                               fis_len = 0;
+
+                       /*
+                        * Set DMA addresses and lower half of control register
+                        * based on direction.
+                        */
+                       if (dir == DMA_FROM_DEVICE) {
+                               lli[idx].dar = cpu_to_le32(addr);
+                               lli[idx].sar = cpu_to_le32((u32)dmadr_addr);
+
+                               lli[idx].ctl.low = cpu_to_le32(
+                                       DMA_CTL_TTFC(DMA_CTL_TTFC_P2M_DMAC) |
+                                       DMA_CTL_SMS(0) |
+                                       DMA_CTL_DMS(1) |
+                                       DMA_CTL_SRC_MSIZE(bl) |
+                                       DMA_CTL_DST_MSIZE(bl) |
+                                       DMA_CTL_SINC_NOCHANGE |
+                                       DMA_CTL_SRC_TRWID(2) |
+                                       DMA_CTL_DST_TRWID(2) |
+                                       DMA_CTL_INT_EN |
+                                       DMA_CTL_LLP_SRCEN |
+                                       DMA_CTL_LLP_DSTEN);
+                       } else {        /* DMA_TO_DEVICE */
+                               lli[idx].sar = cpu_to_le32(addr);
+                               lli[idx].dar = cpu_to_le32((u32)dmadr_addr);
+
+                               lli[idx].ctl.low = cpu_to_le32(
+                                       DMA_CTL_TTFC(DMA_CTL_TTFC_M2P_PER) |
+                                       DMA_CTL_SMS(1) |
+                                       DMA_CTL_DMS(0) |
+                                       DMA_CTL_SRC_MSIZE(bl) |
+                                       DMA_CTL_DST_MSIZE(bl) |
+                                       DMA_CTL_DINC_NOCHANGE |
+                                       DMA_CTL_SRC_TRWID(2) |
+                                       DMA_CTL_DST_TRWID(2) |
+                                       DMA_CTL_INT_EN |
+                                       DMA_CTL_LLP_SRCEN |
+                                       DMA_CTL_LLP_DSTEN);
+                       }
+
+                       dev_dbg(dwc_dev, "%s setting ctl.high len: 0x%08x val: "
+                                       "0x%08x\n", __func__, len,
+                                       DMA_CTL_BLK_TS(len / 4));
+
+                       /* Program the LLI CTL high register */
+                       dma_ts = DMA_CTL_BLK_TS(len / 4);
+                       lli[idx].ctl.high = cpu_to_le32(dma_ts);
+
+ /* + *Program the next pointer. The next pointer must be
+                        * the physical address, not the virtual address.
+                        */
+                       next_llp = (dma_lli + ((idx + 1) * sizeof(struct lli)));
+
+                       /* The last 2 bits encode the list master select. */
+                       next_llp = DMA_LLP_LMS(next_llp, DMA_LLP_AHBMASTER2);
+
+                       lli[idx].llp = cpu_to_le32(next_llp);
+
+                       idx++;
+                       sg_len -= len;
+                       addr += len;
+               }
+       }
+
+       /*
+        * The last next ptr has to be zero and the last control low register
+        * has to have LLP_SRC_EN and LLP_DST_EN (linked list pointer source
+        * and destination enable) set back to 0 (disabled.)  This is what tells
+        * the core that this is the last item in the linked list.
+        */
+       if (idx) {
+               lli[idx-1].llp = 0x00000000;
+               lli[idx-1].ctl.low &= DMA_CTL_LLP_DISABLE_LE32;
+
+               /* Flush cache to memory */
+               dma_cache_sync(NULL, lli, (sizeof(struct lli) * idx),
+                              DMA_BIDIRECTIONAL);
+       }
+
+       return idx;
+}
+
+/*
+ * Function: dma_dwc_xfer_start
+ * arguments: Channel number
+ * Return : None
+ * Enables the DMA channel
+ */
+static void dma_dwc_xfer_start(int dma_ch)
+{
+       /* Enable the DMA channel */
+       out_le32(&(sata_dma_regs->dma_chan_en.low),
+                in_le32(&(sata_dma_regs->dma_chan_en.low)) |
+                DMA_ENABLE_CHAN(dma_ch));
+}
+
+static int dma_dwc_channel_enabled(int ch)
+{
+       if (in_le32(&(sata_dma_regs->dma_chan_en.low)) & DMA_CHANNEL(ch))
+               return 1;
+
+       return 0;
+}
+
+static void dma_dwc_terminate_dma(int dma_ch)
+{
+       int enabled = dma_dwc_channel_enabled(dma_ch);
+
+       dev_info(dwc_dev, "%s terminate DMA on channel=%d enabled=%d\n",
+                __func__, dma_ch, enabled);
+
+       if (enabled)  {
+               out_le32(&(sata_dma_regs->dma_chan_en.low),
+                        DMA_DISABLE_CHAN(dma_ch));
+
+               do {
+                       enabled = dma_dwc_channel_enabled(dma_ch);
+               } while (enabled);
+       }
+}
+
+static int dma_dwc_xfer_setup(struct scatterlist *sg, int num_elems,
+                             struct lli *lli, dma_addr_t dma_lli,
+                             void __iomem *addr, int dir)
+{
+       int dma_ch;
+       int num_lli;
+
+       /* Acquire DMA channel */
+       dma_ch = dma_request_channel();
+       if (dma_ch == -1) {
+               dev_err(dwc_dev, "%s: dma channel unavailable\n", __func__);
+               return -EAGAIN;
+       }
+
+       /* Convert SG list to linked list of items (LLIs) for AHB DMA */
+       num_lli = map_sg_to_lli(sg, num_elems, lli, dma_lli, addr, dir);
+
+       dev_dbg(dwc_dev, "%s sg: 0x%p, count: %d lli: %p dma_lli: 0x%0xlx addr:"
+               " %p lli count: %d\n", __func__, sg, num_elems, lli,
+               (u32)dma_lli, addr, num_lli);
+
+       /* Clear channel interrupts */
+       clear_chan_interrupts(dma_ch);
+
+       /* Program the CFG register. */
+       out_le32(&(sata_dma_regs->chan_regs[dma_ch].cfg.high),
+                DMA_CFG_PROTCTL | DMA_CFG_FCMOD_REQ);
+       out_le32(&(sata_dma_regs->chan_regs[dma_ch].cfg.low), 0);
+
+       /* Program the address of the linked list */
+       out_le32(&(sata_dma_regs->chan_regs[dma_ch].llp.low),
+                DMA_LLP_LMS(dma_lli, DMA_LLP_AHBMASTER2));
+
+       /* Program the CTL register with src enable / dst enable */
+       out_le32(&(sata_dma_regs->chan_regs[dma_ch].ctl.low),
+                DMA_CTL_LLP_SRCEN | DMA_CTL_LLP_DSTEN);
+
+       return 0;
+}
+

add this is inside a spinlock, at all times, I hope?


+static void dma_dwc_exit(struct sata_dwc_device *hsdev)
+{
+       dev_dbg(dwc_dev, "%s:\n", __func__);
+       if (sata_dma_regs)
+               iounmap(sata_dma_regs);
+
+       if (hsdev->irq_dma)
+               free_irq(hsdev->irq_dma, hsdev);
+}
+
+/*
+ * Function: dma_dwc_init
+ * arguments: hsdev
+ * returns status
+ * This function initializes the SATA DMA driver
+ */
+static int dma_dwc_init(struct sata_dwc_device *hsdev, struct resource *res,
+                       int irq)
+{
+       int err;
+
+       sata_dma_regs = ioremap(res->start, res->end - res->start + 1);
+       if (!sata_dma_regs) {
+               dev_err(dwc_dev, "%s: ioremap failed\n", __func__);
+               err = -ENODEV;
+               goto error_out;
+       }
+
+       err = dma_request_interrupts(hsdev, irq);
+       if (err) {
+               dev_err(dwc_dev, "%s: dma_request_interrupts returns %d\n",
+                       __func__, err);
+               goto error_out;
+       }
+
+       /* Enabe DMA */
+       out_le32(&(sata_dma_regs->dma_cfg.low), DMA_EN);
+
+       dev_notice(dwc_dev, "DMA initialized\n");
+       dev_dbg(dwc_dev, "SATA DMA registers=0x%p\n", sata_dma_regs);
+
+       return 0;
+
+error_out:
+       dma_dwc_exit(hsdev);
+
+       return err;
+}
+
+static int sata_dwc_scr_read(struct ata_link *link, unsigned int scr, u32 *val)
+{
+       if (scr > SCR_NOTIFICATION) {
+               dev_err(link->ap->dev, "%s: Incorrect SCR offset 0x%02x\n",
+                               __func__, scr);
+               return -EINVAL;
+       }
+
+       *val = in_le32((void *)link->ap->ioaddr.scr_addr + (scr * 4));
+       dev_dbg(link->ap->dev, "%s: id=%d reg=%d val=val=0x%08x\n",
+               __func__, link->ap->print_id, scr, *val);
+
+       return 0;
+}
+
+static int sata_dwc_scr_write(struct ata_link *link, unsigned int scr, u32 val)
+{
+       dev_dbg(link->ap->dev, "%s: id=%d reg=%d val=val=0x%08x\n",
+               __func__, link->ap->print_id, scr, val);
+       if (scr > SCR_NOTIFICATION) {
+               dev_err(link->ap->dev, "%s: Incorrect SCR offset 0x%02x\n",
+                               __func__, scr);
+               return -EINVAL;
+       }
+       out_le32((void *)link->ap->ioaddr.scr_addr + (scr * 4), val);
+
+       return 0;
+}
+
+static inline u32 core_scr_read(unsigned int scr)
+{
+       return in_le32((void __iomem *)scr_addr_sstatus + (scr * 4));
+}
+
+static inline void core_scr_write(unsigned int scr, u32 val)
+{
+       out_le32((void __iomem *)scr_addr_sstatus + (scr * 4), val);
+}
+
+static inline void clear_serror(void)
+{
+       out_le32((void __iomem *)scr_addr_sstatus + 4,
+                in_le32((void __iomem *)scr_addr_sstatus + 4));
+}

adding __iomem casts indicates you are _missing_ iomem casts elsewhere



+static inline void clear_intpr(struct sata_dwc_device *hsdev)
+{
+       out_le32(&hsdev->sata_dwc_regs->intpr,
+                in_le32(&hsdev->sata_dwc_regs->intpr));
+}
+
+static inline void clear_interrupt_bit(struct sata_dwc_device *hsdev, u32 bit)
+{
+       out_le32(&hsdev->sata_dwc_regs->intpr,
+                in_le32(&hsdev->sata_dwc_regs->intpr));
+}
+
+static inline void disable_err_irq(struct sata_dwc_device *hsdev)
+{
+       out_le32(&hsdev->sata_dwc_regs->intmr,
+                in_le32(&hsdev->sata_dwc_regs->intmr) & ~SATA_DWC_INTMR_ERRM);
+       out_le32(&hsdev->sata_dwc_regs->errmr, ~SATA_DWC_SERROR_ERR_BITS);
+}
+
+static inline void enable_err_irq(struct sata_dwc_device *hsdev)
+{
+       out_le32(&hsdev->sata_dwc_regs->intmr,
+                in_le32(&hsdev->sata_dwc_regs->intmr) | SATA_DWC_INTMR_ERRM);
+       out_le32(&hsdev->sata_dwc_regs->errmr, SATA_DWC_SERROR_ERR_BITS);
+}
+
+static inline u32 qcmd_tag_to_mask(u8 tag)
+{
+       return 0x00000001 << (tag & 0x1f);
+}
+
+/* See ahci.c */
+static void sata_dwc_error_intr(struct ata_port *ap,
+                               struct sata_dwc_device *hsdev, uint intpr)
+{
+       struct sata_dwc_device_port *hsdevp = HSDEVP_FROM_AP(ap);
+       struct ata_eh_info *ehi = &ap->link.eh_info;
+       unsigned int err_mask = 0, action = 0;
+       struct ata_queued_cmd *qc;
+       u32 serror;
+       u8 status, tag;
+       u32 err_reg;
+
+       ata_ehi_clear_desc(ehi);
+
+       serror = core_scr_read(SCR_ERROR);
+       status = ap->ops->sff_check_status(ap);
+
+       err_reg = in_le32(&(sata_dma_regs->interrupt_status.error.low));
+       tag = ap->link.active_tag;
+
+       dev_err(ap->dev, "%s SCR_ERROR=0x%08x intpr=0x%08x status=0x%08x "
+               "dma_intp=%d pending=%d issued=%d dma_err_status=0x%08x\n",
+               __func__, serror, intpr, status, dma_interrupt_count,
+               hsdevp->dma_pending[tag], hsdevp->cmd_issued[tag], err_reg);
+
+       /* Clear error register and interrupt bit */
+       clear_serror();
+       clear_interrupt_bit(hsdev, SATA_DWC_INTPR_ERR);
+
+       /* This is the only error happening now. */
+       /* TODO check for exact error */
+       err_mask |= AC_ERR_HOST_BUS;
+       action |= ATA_EH_RESET;
+
+       /* Pass this on to EH */
+       ehi->serror |= serror;
+       ehi->action |= action;
+
+       qc = ata_qc_from_tag(ap, tag);
+       if (qc)
+               qc->err_mask |= err_mask;
+       else
+               ehi->err_mask |= err_mask;
+
+       ata_port_abort(ap);
+
+       /*
+         if (irq_stat & PORT_IRQ_FREEZE)
+         ata_port_freeze(ap);
+         else
+         ata_port_abort(ap);
+       */
+}
+
+/*
+ * Function : sata_dwc_isr
+ * arguments : irq, void *dev_instance, struct pt_regs *regs
+ * Return value : irqreturn_t - status of IRQ
+ * This Interrupt handler called via port ops registered function.
+ * .irq_handler = sata_dwc_isr
+ */
+static irqreturn_t sata_dwc_isr(int irq, void *dev_instance)
+{
+       struct ata_host *host = (struct ata_host *)dev_instance;
+       struct sata_dwc_device *hsdev = HSDEV_FROM_HOST(host);
+       struct ata_port *ap;
+       struct ata_queued_cmd *qc;
+       unsigned long flags;
+       u8 status, tag;
+       int handled, num_processed, port = 0;
+       uint intpr, sactive, sactive2, tag_mask;
+       struct sata_dwc_device_port *hsdevp;
+
+       spin_lock_irqsave(&host->lock, flags);
+
+       /* Read the interrupt register */
+       intpr = in_le32(&hsdev->sata_dwc_regs->intpr);
+
+       ap = host->ports[port];
+       hsdevp = HSDEVP_FROM_AP(ap);
+
+       dev_dbg(ap->dev, "%s intpr=0x%08x active_tag=%d\n", __func__, intpr,
+               ap->link.active_tag);
+
+       /* Check for error interrupt */
+       if (intpr & SATA_DWC_INTPR_ERR) {
+               sata_dwc_error_intr(ap, hsdev, intpr);
+               handled = 1;
+               goto done_irqrestore;
+       }
+
+       /* Check for DMA SETUP FIS (FP DMA) interrupt */
+       if (intpr & SATA_DWC_INTPR_NEWFP) {
+               clear_interrupt_bit(hsdev, SATA_DWC_INTPR_NEWFP);
+
+               tag = (u8)(in_le32(&hsdev->sata_dwc_regs->fptagr));
+               dev_dbg(ap->dev, "%s: NEWFP tag=%d\n", __func__, tag);
+               if (hsdevp->cmd_issued[tag] != SATA_DWC_CMD_ISSUED_PEND)
+                       dev_warn(ap->dev, "CMD tag=%d not pending?\n", tag);
+
+               sata_dwc_sactive_issued |= qcmd_tag_to_mask(tag);
+
+               qc = ata_qc_from_tag(ap, tag);
+ /* + * Start FP DMA for NCQ command. At this point the tag is the
+                * active tag.  It is the tag that matches the command about to
+                * be completed.
+                */
+               qc->ap->link.active_tag = tag;
+               sata_dwc_bmdma_start_by_tag(qc, tag);
+
+               handled = 1;
+               goto done_irqrestore;
+       }
+
+       sactive = core_scr_read(SCR_ACTIVE);
+       tag_mask = (sata_dwc_sactive_issued | sactive) ^ sactive;
+
+       /* If no sactive issued and tag_mask is zero then this is not NCQ */
+       if (sata_dwc_sactive_issued == 0 && tag_mask == 0) {
+               tag = 0;
+               qc = ata_qc_from_tag(ap, tag);
+
+               /* DEV interrupt w/ no active qc? */
+               if (unlikely(!qc || (qc->tf.flags & ATA_TFLAG_POLLING))) {
+                       dev_err(ap->dev, "%s intr with no active qc qc=%p\n",
+                               __func__, qc);
+                       ata_sff_check_status(ap);
+                       handled = 1;
+                       goto done_irqrestore;
+               }
+
+               status = ap->ops->sff_check_status(ap);
+
+               qc->ap->link.active_tag = tag;
+               hsdevp->cmd_issued[tag] = SATA_DWC_CMD_ISSUED_NOT;
+
+               if (status & ATA_ERR) {
+                       dev_dbg(ap->dev, "interrupt ATA_ERR (0x%x)\n", status);
+                       sata_dwc_qc_complete(ap, qc, 1);
+                       handled = 1;
+                       goto done_irqrestore;
+               }
+
+               dev_dbg(ap->dev, "%s non-NCQ cmd interrupt, protocol: %s\n",
+                       __func__, prot_2_txt(qc->tf.protocol));
+drv_still_busy:
+               if (ata_is_dma(qc->tf.protocol)) {
+                       int dma_flag = hsdevp->dma_pending[tag];
+ /* + * Each DMA transaction produces 2 interrupts. The DMAC
+                        * transfer complete interrupt and the SATA controller
+                        * operation done interrupt. The command should be
+                        * completed only after both interrupts are seen.
+                        */
+                       dma_interrupt_count++;
+                       if (dma_flag == SATA_DWC_DMA_PEND_NONE) {
+                               dev_err(ap->dev, "%s: DMA not pending "
+                                       "intpr=0x%08x status=0x%08x pend=%d\n",
+                                       __func__, intpr, status, dma_flag);
+                       }
+
+                       if ((dma_interrupt_count % 2) == 0)
+                               sata_dwc_dma_xfer_complete(ap, 1);
+               } else {
+                       if (unlikely(sata_dwc_qc_complete(ap, qc, 1)))
+                               goto drv_still_busy;
+               }
+
+               handled = 1;
+               goto done_irqrestore;
+       }
+
+       /*
+        * This is a NCQ command.  At this point we need to figure out for which
+        * tags we have gotten a completion interrupt.  One interrupt may serve
+        * as completion for more than one operation when commands are queued
+        * (NCQ).  We need to process each completed command.
+        */
+
+process_cmd:  /* process completed commands */
+       sactive = core_scr_read(SCR_ACTIVE);
+       tag_mask = (sata_dwc_sactive_issued | sactive) ^ sactive;
+
+       if (sactive != 0 || sata_dwc_sactive_issued > 1 || tag_mask > 1) {
+               dev_dbg(ap->dev, "%s NCQ: sactive=0x%08x  sactive_issued=0x%08x"
+                       " tag_mask=0x%08x\n", __func__, sactive,
+                       sata_dwc_sactive_issued, tag_mask);
+       }
+
+       if ((tag_mask | sata_dwc_sactive_issued) != sata_dwc_sactive_issued) {
+               dev_warn(ap->dev, "Bad tag mask?  sactive=0x%08x "
+                        "sata_dwc_sactive_issued=0x%08x  tag_mask=0x%08x\n",
+                        sactive, sata_dwc_sactive_issued, tag_mask);
+       }
+
+       /* read just to clear ... not bad if currently still busy */
+       status = ap->ops->sff_check_status(ap);
+       dev_dbg(ap->dev, "%s ATA status register=0x%x\n", __func__, status);
+
+       tag = 0;
+       num_processed = 0;
+       while (tag_mask) {
+               num_processed++;
+               while (!(tag_mask & 0x00000001)) {
+                       tag++;
+                       tag_mask <<= 1;
+               }
+               tag_mask &= (~0x00000001);
+               qc = ata_qc_from_tag(ap, tag);
+
+               /* To be picked up by completion functions */
+               qc->ap->link.active_tag = tag;
+               hsdevp->cmd_issued[tag] = SATA_DWC_CMD_ISSUED_NOT;
+
+               /* Let libata/scsi layers handle error */
+               if (status & ATA_ERR) {
+                       dev_dbg(ap->dev, "%s ATA_ERR (0x%x)\n",
+                                        __func__, status);
+
+                       sata_dwc_qc_complete(ap, qc, 1);
+                       handled = 1;
+                       goto done_irqrestore;
+               }
+
+               /* Process completed command */
+               dev_dbg(ap->dev, "%s NCQ command, protocol: %s\n", __func__,
+                       prot_2_txt(qc->tf.protocol));
+               if (ata_is_dma(qc->tf.protocol)) {
+                       dma_interrupt_count++;
+                       if (hsdevp->dma_pending[tag] == SATA_DWC_DMA_PEND_NONE)
+                               dev_warn(ap->dev,
+                                       "%s: DMA not pending?\n", __func__);
+                       if ((dma_interrupt_count % 2) == 0)
+                               sata_dwc_dma_xfer_complete(ap, 1);
+               } else {
+                       if (unlikely(sata_dwc_qc_complete(ap, qc, 1)))
+                               goto still_busy;
+               }
+               continue;
+
+still_busy:
+               ap->stats.idle_irq++;
+               dev_warn(ap->dev, "STILL BUSY IRQ ata%d: irq trap\n",
+                               ap->print_id);
+       } /* while tag_mask */
+
+       /*
+        * Check to see if any commands completed while we were processing our
+        * initial set of completed commands (reading of status clears
+        * interrupts, so we might miss a completed command interrupt if one
+        * came in while we were processing:
+        * we read status as part of processing a completed command).
+        */
+       sactive2 = core_scr_read(SCR_ACTIVE);
+       if (sactive2 != sactive) {
+               dev_dbg(ap->dev, "More finished - sactive=0x%x sactive2=0x%x\n",
+                       sactive, sactive2);
+               goto process_cmd;
+       }
+       handled = 1;
+
+done_irqrestore:
+       spin_unlock_irqrestore(&host->lock, flags);
+       return IRQ_RETVAL(handled);

1) it is completely silly to have a function this large. break it up into multiple, smaller functions.

2) same comment as above -- spin_lock_irqsave() is both expensive and probably wrong, for this irq handler


+static void sata_dwc_clear_dmacr(struct sata_dwc_device_port *hsdevp, u8 tag)
+{
+       struct sata_dwc_device *hsdev = HSDEV_FROM_HSDEVP(hsdevp);
+
+       if (hsdevp->dma_pending[tag] == SATA_DWC_DMA_PEND_RX) {
+               out_le32(&(hsdev->sata_dwc_regs->dmacr),
+                        SATA_DWC_DMACR_RX_CLEAR(
+                                in_le32(&(hsdev->sata_dwc_regs->dmacr))));
+       } else if (hsdevp->dma_pending[tag] == SATA_DWC_DMA_PEND_TX) {
+               out_le32(&(hsdev->sata_dwc_regs->dmacr),
+                        SATA_DWC_DMACR_TX_CLEAR(
+                                in_le32(&(hsdev->sata_dwc_regs->dmacr))));
+       } else {
+ /* + * This should not happen, it indicates the driver is out of
+                * sync.  If it does happen, clear dmacr anyway.
+                */
+               dev_err(dwc_dev, "%s DMA protocol RX and TX DMA not pending "
+                       "tag=0x%02x pending=%d dmacr: 0x%08x\n",
+                       __func__, tag, hsdevp->dma_pending[tag],
+                       in_le32(&(hsdev->sata_dwc_regs->dmacr)));
+               out_le32(&(hsdev->sata_dwc_regs->dmacr),
+                               SATA_DWC_DMACR_TXRXCH_CLEAR);
+       }
+}
+
+static void sata_dwc_dma_xfer_complete(struct ata_port *ap, u32 check_status)
+{
+       struct ata_queued_cmd *qc;
+       struct sata_dwc_device_port *hsdevp = HSDEVP_FROM_AP(ap);
+       struct sata_dwc_device *hsdev = HSDEV_FROM_AP(ap);
+       u8 tag = 0;
+
+       tag = ap->link.active_tag;
+       qc = ata_qc_from_tag(ap, tag);
+
+#ifdef DEBUG_NCQ
+       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,
+                        dir_2_txt(qc->dma_dir), prot_2_txt(qc->tf.protocol),
+                        in_le32(&(hsdev->sata_dwc_regs->dmacr)));
+       }
+#endif
+
+       if (ata_is_dma(qc->tf.protocol)) {
+               if (hsdevp->dma_pending[tag] == SATA_DWC_DMA_PEND_NONE) {
+                       dev_err(ap->dev, "%s DMA protocol RX and TX DMA not "
+                               "pending dmacr: 0x%08x\n", __func__,
+                               in_le32(&(hsdev->sata_dwc_regs->dmacr)));
+               }
+
+               hsdevp->dma_pending[tag] = SATA_DWC_DMA_PEND_NONE;
+               sata_dwc_qc_complete(ap, qc, check_status);
+               ap->link.active_tag = ATA_TAG_POISON;
+       } else {
+               sata_dwc_qc_complete(ap, qc, check_status);
+       }
+}
+
+static int sata_dwc_qc_complete(struct ata_port *ap, struct ata_queued_cmd *qc,
+                               u32 check_status)
+{
+       u8 status = 0;
+       int i = 0;
+       u32 mask = 0x0;
+       u8 tag = qc->tag;
+       struct sata_dwc_device_port *hsdevp = HSDEVP_FROM_AP(ap);
+       u32 serror;
+
+       dev_dbg(ap->dev, "%s checkstatus? %x\n", __func__, check_status);
+
+       if (hsdevp->dma_pending[tag] == SATA_DWC_DMA_PEND_TX)
+               dev_err(ap->dev, "TX DMA PENDING\n");
+       else if (hsdevp->dma_pending[tag] == SATA_DWC_DMA_PEND_RX)
+               dev_err(ap->dev, "RX DMA PENDING\n");
+
+       if (check_status) {
+               i = 0;
+               do {
+                       /* check main status, clearing INTRQ */
+                       status = ap->ops->sff_check_status(ap);
+                       if (status & ATA_BUSY) {
+                               dev_dbg(ap->dev, "STATUS BUSY (0x%02x) [%d]\n",
+                                               status, i);
+                       }
+                       if (++i > 10)
+                               break;
+               } while (status & ATA_BUSY);
+
+               status = ap->ops->sff_check_status(ap);
+               if (unlikely(status & ATA_BUSY))
+                       dev_err(ap->dev, "QC complete cmd=0x%02x STATUS BUSY "
+                               "(0x%02x) [%d]\n", qc->tf.command, status, i);
+               serror = core_scr_read(SCR_ERROR);
+               if (serror & SATA_DWC_SERROR_ERR_BITS)
+                       dev_err(ap->dev, "****** SERROR=0x%08x ******\n",
+                               serror);
+       }

it is both silly and expensive to call a hook from your own driver. just call the function directly!


+       dev_dbg(ap->dev, "QC complete cmd=0x%02x status=0x%02x ata%u: "
+               "protocol=%d\n", qc->tf.command, status, ap->print_id,
+               qc->tf.protocol);
+
+       /* clear active bit */
+       mask = (~(qcmd_tag_to_mask(tag)));
+       sata_dwc_sactive_queued = sata_dwc_sactive_queued & mask;
+       sata_dwc_sactive_issued = sata_dwc_sactive_issued & mask;
+
+       /* Complete taskfile transaction (does not read SCR registers) */
+       ata_qc_complete(qc);
+
+       return 0;
+}
+
+static void sata_dwc_enable_interrupts(struct sata_dwc_device *hsdev)
+{
+       /* Enable selective interrupts by setting the interrupt mask register */
+       out_le32(&hsdev->sata_dwc_regs->intmr,
+                SATA_DWC_INTMR_ERRM |
+                SATA_DWC_INTMR_NEWFPM |
+                SATA_DWC_INTMR_PMABRTM |
+                SATA_DWC_INTMR_DMATM);
+
+ /* + * Unmask the error bits that should trigger an error interrupt by
+        * setting the error mask register.
+        */
+       out_le32(&hsdev->sata_dwc_regs->errmr, SATA_DWC_SERROR_ERR_BITS);
+
+       dev_dbg(dwc_dev, "%s: INTMR = 0x%08x, ERRMR = 0x%08x\n", __func__,
+               in_le32(&hsdev->sata_dwc_regs->intmr),
+               in_le32(&hsdev->sata_dwc_regs->errmr));
+}
+
+static void sata_dwc_setup_port(struct ata_ioports *port, unsigned long base)
+{
+       port->cmd_addr = (void *)base + 0x00;
+       port->data_addr = (void *)base + 0x00;
+
+       port->error_addr = (void *)base + 0x04;
+       port->feature_addr = (void *)base + 0x04;
+
+       port->nsect_addr = (void *)base + 0x08;
+
+       port->lbal_addr = (void *)base + 0x0c;
+       port->lbam_addr = (void *)base + 0x10;
+       port->lbah_addr = (void *)base + 0x14;
+
+       port->device_addr = (void *)base + 0x18;
+       port->command_addr = (void *)base + 0x1c;
+       port->status_addr = (void *)base + 0x1c;
+
+       port->altstatus_addr = (void *)base + 0x20;
+       port->ctl_addr = (void *)base + 0x20;

casts indicate a C typing bug

_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev

Reply via email to