Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 96099
b: refs/heads/master
c: ab5b023
h: refs/heads/master
i:
  96097: 3a1af50
  96095: ac6e388
v: v3
  • Loading branch information
Tejun Heo authored and Jeff Garzik committed May 6, 2008
1 parent c1f102b commit f983e78
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 99 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3ad400a92e9c7d2f7caa6c6f811dad9b7d3f333c
refs/heads/master: ab5b0235c4e819c9bc45fa62c99f9fe49e73e701
103 changes: 5 additions & 98 deletions trunk/drivers/ata/sata_inic162x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,7 @@ enum {
PIRQ_PENDING = (1 << 7), /* port IRQ pending (STAT only) */

PIRQ_ERR = PIRQ_OFFLINE | PIRQ_ONLINE | PIRQ_FATAL,

PIRQ_MASK_DMA_READ = PIRQ_REPLY | PIRQ_ATA,
PIRQ_MASK_OTHER = PIRQ_REPLY | PIRQ_COMPLETE,
PIRQ_MASK_DEFAULT = PIRQ_REPLY,
PIRQ_MASK_FREEZE = 0xff,

/* PORT_PRD_CTL bits */
Expand Down Expand Up @@ -206,13 +204,11 @@ struct inic_port_priv {
dma_addr_t pkt_dma;
u32 *cpb_tbl;
dma_addr_t cpb_tbl_dma;
u8 dfl_prdctl;
u8 cached_prdctl;
u8 cached_pirq_mask;
};

static struct scsi_host_template inic_sht = {
ATA_BMDMA_SHT(DRV_NAME),
ATA_BASE_SHT(DRV_NAME),
.sg_tablesize = LIBATA_MAX_PRD, /* maybe it can be larger? */
.dma_boundary = INIC_DMA_BOUNDARY,
};

Expand All @@ -227,23 +223,6 @@ static void __iomem *inic_port_base(struct ata_port *ap)
return ap->host->iomap[MMIO_BAR] + ap->port_no * PORT_SIZE;
}

static void __inic_set_pirq_mask(struct ata_port *ap, u8 mask)
{
void __iomem *port_base = inic_port_base(ap);
struct inic_port_priv *pp = ap->private_data;

writeb(mask, port_base + PORT_IRQ_MASK);
pp->cached_pirq_mask = mask;
}

static void inic_set_pirq_mask(struct ata_port *ap, u8 mask)
{
struct inic_port_priv *pp = ap->private_data;

if (pp->cached_pirq_mask != mask)
__inic_set_pirq_mask(ap, mask);
}

static void inic_reset_port(void __iomem *port_base)
{
void __iomem *idma_ctl = port_base + PORT_IDMA_CTL;
Expand Down Expand Up @@ -297,63 +276,6 @@ static int inic_scr_write(struct ata_port *ap, unsigned sc_reg, u32 val)
return 0;
}

/*
* In TF mode, inic162x is very similar to SFF device. TF registers
* function the same. DMA engine behaves similary using the same PRD
* format as BMDMA but different command register, interrupt and event
* notification methods are used. The following inic_bmdma_*()
* functions do the impedance matching.
*/
static void inic_bmdma_setup(struct ata_queued_cmd *qc)
{
struct ata_port *ap = qc->ap;
struct inic_port_priv *pp = ap->private_data;
void __iomem *port_base = inic_port_base(ap);
int rw = qc->tf.flags & ATA_TFLAG_WRITE;

/* make sure device sees PRD table writes */
wmb();

/* load transfer length */
writel(qc->nbytes, port_base + PORT_PRD_XFERLEN);

/* turn on DMA and specify data direction */
pp->cached_prdctl = pp->dfl_prdctl | PRD_CTL_DMAEN;
if (!rw)
pp->cached_prdctl |= PRD_CTL_WR;
writeb(pp->cached_prdctl, port_base + PORT_PRD_CTL);

/* issue r/w command */
ap->ops->sff_exec_command(ap, &qc->tf);
}

static void inic_bmdma_start(struct ata_queued_cmd *qc)
{
struct ata_port *ap = qc->ap;
struct inic_port_priv *pp = ap->private_data;
void __iomem *port_base = inic_port_base(ap);

/* start host DMA transaction */
pp->cached_prdctl |= PRD_CTL_START;
writeb(pp->cached_prdctl, port_base + PORT_PRD_CTL);
}

static void inic_bmdma_stop(struct ata_queued_cmd *qc)
{
struct ata_port *ap = qc->ap;
struct inic_port_priv *pp = ap->private_data;
void __iomem *port_base = inic_port_base(ap);

/* stop DMA engine */
writeb(pp->dfl_prdctl, port_base + PORT_PRD_CTL);
}

static u8 inic_bmdma_status(struct ata_port *ap)
{
/* event is already verified by the interrupt handler */
return ATA_DMA_INTR;
}

static void inic_stop_idma(struct ata_port *ap)
{
void __iomem *port_base = inic_port_base(ap);
Expand Down Expand Up @@ -631,8 +553,7 @@ static void inic_freeze(struct ata_port *ap)
{
void __iomem *port_base = inic_port_base(ap);

__inic_set_pirq_mask(ap, PIRQ_MASK_FREEZE);

writeb(PIRQ_MASK_FREEZE, port_base + PORT_IRQ_MASK);
ap->ops->sff_check_status(ap);
writeb(0xff, port_base + PORT_IRQ_STAT);
}
Expand All @@ -643,8 +564,7 @@ static void inic_thaw(struct ata_port *ap)

ap->ops->sff_check_status(ap);
writeb(0xff, port_base + PORT_IRQ_STAT);

__inic_set_pirq_mask(ap, PIRQ_MASK_OTHER);
writeb(PIRQ_MASK_DEFAULT, port_base + PORT_IRQ_MASK);
}

static int inic_check_ready(struct ata_link *link)
Expand Down Expand Up @@ -707,15 +627,13 @@ static int inic_hardreset(struct ata_link *link, unsigned int *class,
static void inic_error_handler(struct ata_port *ap)
{
void __iomem *port_base = inic_port_base(ap);
struct inic_port_priv *pp = ap->private_data;
unsigned long flags;

/* reset PIO HSM and stop DMA engine */
inic_reset_port(port_base);

spin_lock_irqsave(ap->lock, flags);
ap->hsm_task_state = HSM_ST_IDLE;
writeb(pp->dfl_prdctl, port_base + PORT_PRD_CTL);
spin_unlock_irqrestore(ap->lock, flags);

/* PIO and DMA engines have been stopped, perform recovery */
Expand Down Expand Up @@ -765,10 +683,8 @@ static int inic_port_resume(struct ata_port *ap)

static int inic_port_start(struct ata_port *ap)
{
void __iomem *port_base = inic_port_base(ap);
struct device *dev = ap->host->dev;
struct inic_port_priv *pp;
u8 tmp;
int rc;

/* alloc and initialize private data */
Expand All @@ -777,11 +693,6 @@ static int inic_port_start(struct ata_port *ap)
return -ENOMEM;
ap->private_data = pp;

/* default PRD_CTL value, DMAEN, WR and START off */
tmp = readb(port_base + PORT_PRD_CTL);
tmp &= ~(PRD_CTL_DMAEN | PRD_CTL_WR | PRD_CTL_START);
pp->dfl_prdctl = tmp;

/* Alloc resources */
rc = ata_port_start(ap);
if (rc)
Expand All @@ -805,10 +716,6 @@ static int inic_port_start(struct ata_port *ap)
static struct ata_port_operations inic_port_ops = {
.inherits = &ata_sff_port_ops,

.bmdma_setup = inic_bmdma_setup,
.bmdma_start = inic_bmdma_start,
.bmdma_stop = inic_bmdma_stop,
.bmdma_status = inic_bmdma_status,
.qc_prep = inic_qc_prep,
.qc_issue = inic_qc_issue,
.qc_fill_rtf = inic_qc_fill_rtf,
Expand Down

0 comments on commit f983e78

Please sign in to comment.