aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma/ioat/dma.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/dma/ioat/dma.c')
-rw-r--r--drivers/dma/ioat/dma.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/dma/ioat/dma.c b/drivers/dma/ioat/dma.c
index 5173ba97ba31..6dd0af194b8a 100644
--- a/drivers/dma/ioat/dma.c
+++ b/drivers/dma/ioat/dma.c
@@ -452,7 +452,6 @@ static int ioat1_dma_alloc_chan_resources(struct dma_chan *c)
452 struct ioat_dma_chan *ioat = to_ioat_chan(c); 452 struct ioat_dma_chan *ioat = to_ioat_chan(c);
453 struct ioat_chan_common *chan = &ioat->base; 453 struct ioat_chan_common *chan = &ioat->base;
454 struct ioat_desc_sw *desc; 454 struct ioat_desc_sw *desc;
455 u16 chanctrl;
456 u32 chanerr; 455 u32 chanerr;
457 int i; 456 int i;
458 LIST_HEAD(tmp_list); 457 LIST_HEAD(tmp_list);
@@ -462,10 +461,7 @@ static int ioat1_dma_alloc_chan_resources(struct dma_chan *c)
462 return ioat->desccount; 461 return ioat->desccount;
463 462
464 /* Setup register to interrupt and write completion status on error */ 463 /* Setup register to interrupt and write completion status on error */
465 chanctrl = IOAT_CHANCTRL_ERR_INT_EN | 464 writew(IOAT_CHANCTRL_RUN, chan->reg_base + IOAT_CHANCTRL_OFFSET);
466 IOAT_CHANCTRL_ANY_ERR_ABORT_EN |
467 IOAT_CHANCTRL_ERR_COMPLETION_EN;
468 writew(chanctrl, chan->reg_base + IOAT_CHANCTRL_OFFSET);
469 465
470 chanerr = readl(chan->reg_base + IOAT_CHANERR_OFFSET); 466 chanerr = readl(chan->reg_base + IOAT_CHANERR_OFFSET);
471 if (chanerr) { 467 if (chanerr) {
@@ -672,9 +668,9 @@ ioat1_dma_prep_memcpy(struct dma_chan *c, dma_addr_t dma_dest,
672static void ioat1_cleanup_tasklet(unsigned long data) 668static void ioat1_cleanup_tasklet(unsigned long data)
673{ 669{
674 struct ioat_dma_chan *chan = (void *)data; 670 struct ioat_dma_chan *chan = (void *)data;
671
675 ioat1_cleanup(chan); 672 ioat1_cleanup(chan);
676 writew(IOAT_CHANCTRL_INT_DISABLE, 673 writew(IOAT_CHANCTRL_RUN, chan->base.reg_base + IOAT_CHANCTRL_OFFSET);
677 chan->base.reg_base + IOAT_CHANCTRL_OFFSET);
678} 674}
679 675
680static void ioat_unmap(struct pci_dev *pdev, dma_addr_t addr, size_t len, 676static void ioat_unmap(struct pci_dev *pdev, dma_addr_t addr, size_t len,