Commit d6ecf0c2 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Tejun Heo

ata: sata_dwc_460ex: supply physical address of FIFO to DMA

DMA operates with physical addresses which is not exactly the same as ioremap()
returns.

Introduce variable to keep physical address of the SATA FIFO register and
supply it when prepare DMA channel.
Tested-by: default avatarChristian Lamparter <chunkeey@googlemail.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 73ec1b5a
...@@ -143,6 +143,7 @@ struct sata_dwc_device { ...@@ -143,6 +143,7 @@ struct sata_dwc_device {
u32 sactive_issued; u32 sactive_issued;
u32 sactive_queued; u32 sactive_queued;
struct phy *phy; struct phy *phy;
phys_addr_t dmadr;
#ifdef CONFIG_SATA_DWC_OLD_DMA #ifdef CONFIG_SATA_DWC_OLD_DMA
struct dw_dma_chip *dma; struct dw_dma_chip *dma;
#endif #endif
...@@ -368,15 +369,14 @@ static struct dma_async_tx_descriptor *dma_dwc_xfer_setup(struct ata_queued_cmd ...@@ -368,15 +369,14 @@ static struct dma_async_tx_descriptor *dma_dwc_xfer_setup(struct ata_queued_cmd
struct ata_port *ap = qc->ap; struct ata_port *ap = qc->ap;
struct sata_dwc_device_port *hsdevp = HSDEVP_FROM_AP(ap); struct sata_dwc_device_port *hsdevp = HSDEVP_FROM_AP(ap);
struct sata_dwc_device *hsdev = HSDEV_FROM_AP(ap); struct sata_dwc_device *hsdev = HSDEV_FROM_AP(ap);
dma_addr_t addr = (dma_addr_t)&hsdev->sata_dwc_regs->dmadr;
struct dma_slave_config sconf; struct dma_slave_config sconf;
struct dma_async_tx_descriptor *desc; struct dma_async_tx_descriptor *desc;
if (qc->dma_dir == DMA_DEV_TO_MEM) { if (qc->dma_dir == DMA_DEV_TO_MEM) {
sconf.src_addr = addr; sconf.src_addr = hsdev->dmadr;
sconf.device_fc = false; sconf.device_fc = false;
} else { /* DMA_MEM_TO_DEV */ } else { /* DMA_MEM_TO_DEV */
sconf.dst_addr = addr; sconf.dst_addr = hsdev->dmadr;
sconf.device_fc = false; sconf.device_fc = false;
} }
...@@ -399,8 +399,8 @@ static struct dma_async_tx_descriptor *dma_dwc_xfer_setup(struct ata_queued_cmd ...@@ -399,8 +399,8 @@ static struct dma_async_tx_descriptor *dma_dwc_xfer_setup(struct ata_queued_cmd
desc->callback = dma_dwc_xfer_done; desc->callback = dma_dwc_xfer_done;
desc->callback_param = hsdev; desc->callback_param = hsdev;
dev_dbg(hsdev->dev, "%s sg: 0x%p, count: %d addr: %pad\n", dev_dbg(hsdev->dev, "%s sg: 0x%p, count: %d addr: %pa\n", __func__,
__func__, qc->sg, qc->n_elem, &addr); qc->sg, qc->n_elem, &hsdev->dmadr);
return desc; return desc;
} }
...@@ -1234,6 +1234,7 @@ static int sata_dwc_probe(struct platform_device *ofdev) ...@@ -1234,6 +1234,7 @@ static int sata_dwc_probe(struct platform_device *ofdev)
/* Synopsys DWC SATA specific Registers */ /* Synopsys DWC SATA specific Registers */
hsdev->sata_dwc_regs = base + SATA_DWC_REG_OFFSET; hsdev->sata_dwc_regs = base + SATA_DWC_REG_OFFSET;
hsdev->dmadr = res->start + SATA_DWC_REG_OFFSET + offsetof(struct sata_dwc_regs, dmadr);
/* Setup port */ /* Setup port */
host->ports[0]->ioaddr.cmd_addr = base; host->ports[0]->ioaddr.cmd_addr = base;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment