diff options
| author |   Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> | 2013-05-28 02:45:08 +0400 |
|---|---|---|
| committer |   Tejun Heo <tj@kernel.org> | 2013-05-28 09:18:08 +0900 |
| commit | 8bfbeed58665dbbf63813017712bd0c8e978379e (patch) | |
| tree | 5e7e95f8563e4e4a8aa072b6aeec8029a339ffd7 /drivers/ata | |
| parent | sata_rcar: kill superfluous code in sata_rcar_bmdma_fill_sg() (diff) | |
| download | linux-dev-8bfbeed58665dbbf63813017712bd0c8e978379e.tar.xz linux-dev-8bfbeed58665dbbf63813017712bd0c8e978379e.zip | |
sata_rcar: correct 'sata_rcar_sht'
Using ATA_BMDMA_SHT() to intialize 'sata_rcar_sht' was suboptimal as
the R-Car descriptor table transfer counter is 28 bits wide (bit 1 to
bit 28), so that the 'dma_boundary' field of 0xFFFF is just too small,
as well as the 'sg_tablesize' field of 128. Use ATA_BASE_SHT() to
initialize 'sata_rcar_sht' instead and give proper values to the
'dma_boundary' and 'sg_tablesize' fields explicitly.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/sata_rcar.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/ata/sata_rcar.c b/drivers/ata/sata_rcar.c index 629b07c452c5..178165be0c32 100644 --- a/drivers/ata/sata_rcar.c +++ b/drivers/ata/sata_rcar.c @@ -121,6 +121,8 @@ /* Descriptor table word 0 bit (when DTA32M = 1) */ #define SATA_RCAR_DTEND BIT(0) +#define SATA_RCAR_DMA_BOUNDARY 0x1FFFFFFEUL + struct sata_rcar_priv { void __iomem *base; struct clk *clk; @@ -575,7 +577,14 @@ static u8 sata_rcar_bmdma_status(struct ata_port *ap) } static struct scsi_host_template sata_rcar_sht = { - ATA_BMDMA_SHT(DRV_NAME), + ATA_BASE_SHT(DRV_NAME), + /* + * This controller allows transfer chunks up to 512MB which cross 64KB + * boundaries, therefore the DMA limits are more relaxed than standard + * ATA SFF. + */ + .sg_tablesize = ATA_MAX_PRD, + .dma_boundary = SATA_RCAR_DMA_BOUNDARY, }; static struct ata_port_operations sata_rcar_port_ops = { |