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

Commit e0bd0f8c authored by Dan Williams's avatar Dan Williams
Browse files

dw_dmac: implement a private tx_list 



Drop dw_dmac's use of tx_list from struct dma_async_tx_descriptor in
preparation for removal of this field.

Cc: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent e12c4fa3

drivers/dma/dw_dmac.c

+10 −9
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static void dwc_sync_desc_for_cpu(struct dw_dma_chan *dwc, struct dw_desc *desc) 
{

	struct dw_desc	*child;



	list_for_each_entry(child, &desc->txd.tx_list, desc_node)

	list_for_each_entry(child, &desc->tx_list, desc_node)

		dma_sync_single_for_cpu(chan2parent(&dwc->chan),

				child->txd.phys, sizeof(child->lli),

				DMA_TO_DEVICE);
@@ -137,11 +137,11 @@ static void dwc_desc_put(struct dw_dma_chan *dwc, struct dw_desc *desc) 
		dwc_sync_desc_for_cpu(dwc, desc);



		spin_lock_bh(&dwc->lock);

		list_for_each_entry(child, &desc->txd.tx_list, desc_node)

		list_for_each_entry(child, &desc->tx_list, desc_node)

			dev_vdbg(chan2dev(&dwc->chan),

					"moving child desc %p to freelist\n",

					child);

		list_splice_init(&desc->txd.tx_list, &dwc->free_list);

		list_splice_init(&desc->tx_list, &dwc->free_list);

		dev_vdbg(chan2dev(&dwc->chan), "moving desc %p to freelist\n", desc);

		list_add(&desc->desc_node, &dwc->free_list);

		spin_unlock_bh(&dwc->lock);
@@ -209,7 +209,7 @@ dwc_descriptor_complete(struct dw_dma_chan *dwc, struct dw_desc *desc) 
	param = txd->callback_param;



	dwc_sync_desc_for_cpu(dwc, desc);

	list_splice_init(&txd->tx_list, &dwc->free_list);

	list_splice_init(&desc->tx_list, &dwc->free_list);

	list_move(&desc->desc_node, &dwc->free_list);



	/*
@@ -289,7 +289,7 @@ static void dwc_scan_descriptors(struct dw_dma *dw, struct dw_dma_chan *dwc) 
			/* This one is currently in progress */

			return;



		list_for_each_entry(child, &desc->txd.tx_list, desc_node)

		list_for_each_entry(child, &desc->tx_list, desc_node)

			if (child->lli.llp == llp)

				/* Currently in progress */

				return;
@@ -356,7 +356,7 @@ static void dwc_handle_error(struct dw_dma *dw, struct dw_dma_chan *dwc) 
	dev_printk(KERN_CRIT, chan2dev(&dwc->chan),

			"  cookie: %d\n", bad_desc->txd.cookie);

	dwc_dump_lli(dwc, &bad_desc->lli);

	list_for_each_entry(child, &bad_desc->txd.tx_list, desc_node)

	list_for_each_entry(child, &bad_desc->tx_list, desc_node)

		dwc_dump_lli(dwc, &child->lli);



	/* Pretend the descriptor completed successfully */
@@ -608,7 +608,7 @@ dwc_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src, 
					prev->txd.phys, sizeof(prev->lli),

					DMA_TO_DEVICE);

			list_add_tail(&desc->desc_node,

					&first->txd.tx_list);

					&first->tx_list);

		}

		prev = desc;

	}
@@ -700,7 +700,7 @@ dwc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, 
						sizeof(prev->lli),

						DMA_TO_DEVICE);

				list_add_tail(&desc->desc_node,

						&first->txd.tx_list);

						&first->tx_list);

			}

			prev = desc;

			total_len += len;
@@ -746,7 +746,7 @@ dwc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, 
						sizeof(prev->lli),

						DMA_TO_DEVICE);

				list_add_tail(&desc->desc_node,

						&first->txd.tx_list);

						&first->tx_list);

			}

			prev = desc;

			total_len += len;
@@ -902,6 +902,7 @@ static int dwc_alloc_chan_resources(struct dma_chan *chan) 
			break;

		}



		INIT_LIST_HEAD(&desc->tx_list);

		dma_async_tx_descriptor_init(&desc->txd, chan);

		desc->txd.tx_submit = dwc_tx_submit;

		desc->txd.flags = DMA_CTRL_ACK;

drivers/dma/dw_dmac_regs.h

+1 −0
Original line number Diff line number Diff line
@@ -217,6 +217,7 @@ struct dw_desc { 


	/* THEN values for driver housekeeping */

	struct list_head		desc_node;

	struct list_head		tx_list;

	struct dma_async_tx_descriptor	txd;

	size_t				len;

};