Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83544ae9 authored by Dan Williams's avatar Dan Williams
Browse files

dmaengine, async_tx: support alignment checks 



Some engines have transfer size and address alignment restrictions.  Add
a per-operation alignment property to struct dma_device that the async
routines and dmatest can use to check alignment capabilities.

Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 9308add6

crypto/async_tx/async_memcpy.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ async_memcpy(struct page *dest, struct page *src, unsigned int dest_offset, 
	struct dma_device *device = chan ? chan->device : NULL;

	struct dma_async_tx_descriptor *tx = NULL;



	if (device) {

	if (device && is_dma_copy_aligned(device, src_offset, dest_offset, len)) {

		dma_addr_t dma_dest, dma_src;

		unsigned long dma_prep_flags = 0;

crypto/async_tx/async_memset.c

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ async_memset(struct page *dest, int val, unsigned int offset, size_t len, 
	struct dma_device *device = chan ? chan->device : NULL;

	struct dma_async_tx_descriptor *tx = NULL;



	if (device) {

	if (device && is_dma_fill_aligned(device, offset, 0, len)) {

		dma_addr_t dma_dest;

		unsigned long dma_prep_flags = 0;

crypto/async_tx/async_pq.c

+4 −2
Original line number Diff line number Diff line
@@ -211,7 +211,8 @@ async_gen_syndrome(struct page **blocks, unsigned int offset, int disks, 


	if (dma_src && device &&

	    (src_cnt <= dma_maxpq(device, 0) ||

	     dma_maxpq(device, DMA_PREP_CONTINUE) > 0)) {

	     dma_maxpq(device, DMA_PREP_CONTINUE) > 0) &&

	    is_dma_pq_aligned(device, offset, 0, len)) {

		/* run the p+q asynchronously */

		pr_debug("%s: (async) disks: %d len: %zu\n",

			 __func__, disks, len);
@@ -274,7 +275,8 @@ async_syndrome_val(struct page **blocks, unsigned int offset, int disks, 
	else if (sizeof(dma_addr_t) <= sizeof(struct page *))

		dma_src = (dma_addr_t *) blocks;



	if (dma_src && device && disks <= dma_maxpq(device, 0)) {

	if (dma_src && device && disks <= dma_maxpq(device, 0) &&

	    is_dma_pq_aligned(device, offset, 0, len)) {

		struct device *dev = device->dev;

		dma_addr_t *pq = &dma_src[disks-2];

		int i;

crypto/async_tx/async_xor.c

+3 −2
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ async_xor(struct page *dest, struct page **src_list, unsigned int offset, 
	else if (sizeof(dma_addr_t) <= sizeof(struct page *))

		dma_src = (dma_addr_t *) src_list;



	if (dma_src && chan) {

	if (dma_src && chan && is_dma_xor_aligned(chan->device, offset, 0, len)) {

		/* run the xor asynchronously */

		pr_debug("%s (async): len: %zu\n", __func__, len);
@@ -265,7 +265,8 @@ async_xor_val(struct page *dest, struct page **src_list, unsigned int offset, 
	else if (sizeof(dma_addr_t) <= sizeof(struct page *))

		dma_src = (dma_addr_t *) src_list;



	if (dma_src && device && src_cnt <= device->max_xor) {

	if (dma_src && device && src_cnt <= device->max_xor &&

	    is_dma_xor_aligned(device, offset, 0, len)) {

		unsigned long dma_prep_flags = 0;

		int i;

drivers/dma/dmatest.c

+14 −0
Original line number Diff line number Diff line
@@ -288,6 +288,7 @@ static int dmatest_func(void *data) 
		dma_addr_t dma_dsts[dst_cnt];

		struct completion cmp;

		unsigned long tmo = msecs_to_jiffies(3000);

		u8 align = 0;



		total_tests++;
@@ -295,6 +296,18 @@ static int dmatest_func(void *data) 
		src_off = dmatest_random() % (test_buf_size - len + 1);

		dst_off = dmatest_random() % (test_buf_size - len + 1);



		/* honor alignment restrictions */

		if (thread->type == DMA_MEMCPY)

			align = dev->copy_align;

		else if (thread->type == DMA_XOR)

			align = dev->xor_align;

		else if (thread->type == DMA_PQ)

			align = dev->pq_align;



		len = (len >> align) << align;

		src_off = (src_off >> align) << align;

		dst_off = (dst_off >> align) << align;



		dmatest_init_srcs(thread->srcs, src_off, len);

		dmatest_init_dsts(thread->dsts, dst_off, len);
@@ -311,6 +324,7 @@ static int dmatest_func(void *data) 
						     DMA_BIDIRECTIONAL);

		}





		if (thread->type == DMA_MEMCPY)

			tx = dev->device_prep_dma_memcpy(chan,

							 dma_dsts[0] + dst_off,