diff options
| author | Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> | 2013-05-21 23:07:54 +0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2013-05-22 08:39:20 +0900 |
| commit | df7e131f6359f20ed8f0a37db039c4f6420a18c2 (patch) | |
| tree | cc850e7b524bc90c7e17ee881caf3aeccf0bf601 /drivers/ata | |
| parent | e771451c0a831d96a7c14b0ca8a8ec671d98567b (diff) | |
| download | linux-3.10-df7e131f6359f20ed8f0a37db039c4f6420a18c2.tar.gz linux-3.10-df7e131f6359f20ed8f0a37db039c4f6420a18c2.tar.bz2 linux-3.10-df7e131f6359f20ed8f0a37db039c4f6420a18c2.zip | |
sata_rcar: clear STOP bit in bmdma_start() method
Iff bmdma_setup() has to stop a DMA transfer before starting a new
one, then the STOP bit in the ATAPI_CONTROL1 register will remain set
(it's only cleared when setting the START bit to 1) and then
bmdma_start() method will set both START and STOP bits simultaneously
which should abort the transfer being just started. Avoid that by
explicitly clearing the STOP bit in bmdma_start() method (in this case
it will be ignored on write).
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/sata_rcar.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ata/sata_rcar.c b/drivers/ata/sata_rcar.c index 4799868bd73..a8e091aafdd 100644 --- a/drivers/ata/sata_rcar.c +++ b/drivers/ata/sata_rcar.c @@ -549,6 +549,7 @@ static void sata_rcar_bmdma_start(struct ata_queued_cmd *qc) /* start host DMA transaction */ dmactl = ioread32(priv->base + ATAPI_CONTROL1_REG); + dmactl &= ~ATAPI_CONTROL1_STOP; dmactl |= ATAPI_CONTROL1_START; iowrite32(dmactl, priv->base + ATAPI_CONTROL1_REG); } |