mirror of
https://github.com/torvalds/linux.git
synced 2026-11-07 06:17:02 +01:00
crypto: atmel-tdes - consolidate transfer setup
atmel_tdes_crypt_pdc() and atmel_tdes_crypt_dma() store the transfer length in dd->dma_size and synchronize the bounce buffers before a slow transfer. Move the shared code to atmel_tdes_crypt_start() and use dd->dma_size in atmel_tdes_crypt_pdc() and atmel_tdes_crypt_dma() instead of passing the length separately. Signed-off-by: Thorsten Blum <blum@kernel.org> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
parent
9fa551ef51
commit
bbdc0b7a8e
|
|
@ -349,20 +349,9 @@ static void atmel_tdes_buff_cleanup(struct atmel_tdes_dev *dd)
|
|||
|
||||
static int atmel_tdes_crypt_pdc(struct atmel_tdes_dev *dd,
|
||||
dma_addr_t dma_addr_in,
|
||||
dma_addr_t dma_addr_out, int length)
|
||||
dma_addr_t dma_addr_out)
|
||||
{
|
||||
int len32;
|
||||
|
||||
dd->dma_size = length;
|
||||
|
||||
if (!(dd->flags & TDES_FLAGS_FAST)) {
|
||||
dma_sync_single_for_device(dd->dev, dma_addr_in, length,
|
||||
DMA_TO_DEVICE);
|
||||
dma_sync_single_for_device(dd->dev, dma_addr_out, length,
|
||||
DMA_FROM_DEVICE);
|
||||
}
|
||||
|
||||
len32 = DIV_ROUND_UP(length, sizeof(u32));
|
||||
u32 len32 = DIV_ROUND_UP(dd->dma_size, sizeof(u32));
|
||||
|
||||
atmel_tdes_write(dd, TDES_PTCR, TDES_PTCR_TXTDIS|TDES_PTCR_RXTDIS);
|
||||
atmel_tdes_write(dd, TDES_TPR, dma_addr_in);
|
||||
|
|
@ -381,21 +370,12 @@ static int atmel_tdes_crypt_pdc(struct atmel_tdes_dev *dd,
|
|||
|
||||
static int atmel_tdes_crypt_dma(struct atmel_tdes_dev *dd,
|
||||
dma_addr_t dma_addr_in,
|
||||
dma_addr_t dma_addr_out, int length)
|
||||
dma_addr_t dma_addr_out)
|
||||
{
|
||||
struct scatterlist sg[2];
|
||||
struct dma_async_tx_descriptor *in_desc, *out_desc;
|
||||
enum dma_slave_buswidth addr_width;
|
||||
|
||||
dd->dma_size = length;
|
||||
|
||||
if (!(dd->flags & TDES_FLAGS_FAST)) {
|
||||
dma_sync_single_for_device(dd->dev, dma_addr_in, length,
|
||||
DMA_TO_DEVICE);
|
||||
dma_sync_single_for_device(dd->dev, dma_addr_out, length,
|
||||
DMA_FROM_DEVICE);
|
||||
}
|
||||
|
||||
addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
|
||||
|
||||
dd->dma_lch_in.dma_conf.dst_addr_width = addr_width;
|
||||
|
|
@ -408,11 +388,11 @@ static int atmel_tdes_crypt_dma(struct atmel_tdes_dev *dd,
|
|||
|
||||
sg_init_table(&sg[0], 1);
|
||||
sg_dma_address(&sg[0]) = dma_addr_in;
|
||||
sg_dma_len(&sg[0]) = length;
|
||||
sg_dma_len(&sg[0]) = dd->dma_size;
|
||||
|
||||
sg_init_table(&sg[1], 1);
|
||||
sg_dma_address(&sg[1]) = dma_addr_out;
|
||||
sg_dma_len(&sg[1]) = length;
|
||||
sg_dma_len(&sg[1]) = dd->dma_size;
|
||||
|
||||
in_desc = dmaengine_prep_slave_sg(dd->dma_lch_in.chan, &sg[0],
|
||||
1, DMA_MEM_TO_DEV,
|
||||
|
|
@ -486,11 +466,17 @@ static int atmel_tdes_crypt_start(struct atmel_tdes_dev *dd)
|
|||
}
|
||||
|
||||
dd->total -= count;
|
||||
dd->dma_size = count;
|
||||
|
||||
if (!fast) {
|
||||
dma_sync_single_for_device(dd->dev, addr_in, dd->dma_size, DMA_TO_DEVICE);
|
||||
dma_sync_single_for_device(dd->dev, addr_out, dd->dma_size, DMA_FROM_DEVICE);
|
||||
}
|
||||
|
||||
if (dd->caps.has_dma)
|
||||
err = atmel_tdes_crypt_dma(dd, addr_in, addr_out, count);
|
||||
err = atmel_tdes_crypt_dma(dd, addr_in, addr_out);
|
||||
else
|
||||
err = atmel_tdes_crypt_pdc(dd, addr_in, addr_out, count);
|
||||
err = atmel_tdes_crypt_pdc(dd, addr_in, addr_out);
|
||||
|
||||
if (err && (dd->flags & TDES_FLAGS_FAST)) {
|
||||
dma_unmap_sg(dd->dev, dd->in_sg, 1, DMA_TO_DEVICE);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user