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

Commit 4ab54f69 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Vinod Koul
Browse files

dmaengine: edma: Read channel mapping support only once from HW 



Instead of directly reading it from CCCFG register take the information out
once when we set up the configuration from the HW.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent e4402a12

drivers/dma/edma.c

+6 −2
Original line number Diff line number Diff line
@@ -223,6 +223,7 @@ struct edma_cc { 
	unsigned			num_region;

	unsigned			num_slots;

	unsigned			num_tc;

	bool				chmap_exist;

	enum dma_event_q		default_queue;



	bool				unused_chan_list_done;
@@ -1930,11 +1931,14 @@ static int edma_setup_from_hw(struct device *dev, struct edma_soc_info *pdata, 
	value = GET_NUM_EVQUE(cccfg);

	ecc->num_tc = value + 1;



	ecc->chmap_exist = (cccfg & CHMAP_EXIST) ? true : false;



	dev_dbg(dev, "eDMA3 CC HW configuration (cccfg: 0x%08x):\n", cccfg);

	dev_dbg(dev, "num_region: %u\n", ecc->num_region);

	dev_dbg(dev, "num_channels: %u\n", ecc->num_channels);

	dev_dbg(dev, "num_slots: %u\n", ecc->num_slots);

	dev_dbg(dev, "num_tc: %u\n", ecc->num_tc);

	dev_dbg(dev, "chmap_exist: %s\n", ecc->chmap_exist ? "yes" : "no");



	/* Nothing need to be done if queue priority is provided */

	if (pdata->queue_priority_mapping)
@@ -2223,7 +2227,7 @@ static int edma_probe(struct platform_device *pdev) 
					      queue_priority_mapping[i][1]);



	/* Map the channel to param entry if channel mapping logic exist */

	if (edma_read(ecc, EDMA_CCCFG) & CHMAP_EXIST)

	if (ecc->chmap_exist)

		edma_direct_dmach_to_param_mapping(ecc);



	for (i = 0; i < ecc->num_region; i++) {
@@ -2293,7 +2297,7 @@ static int edma_pm_resume(struct device *dev) 
					      queue_priority_mapping[i][1]);



	/* Map the channel to param entry if channel mapping logic */

	if (edma_read(ecc, EDMA_CCCFG) & CHMAP_EXIST)

	if (ecc->chmap_exist)

		edma_direct_dmach_to_param_mapping(ecc);



	for (i = 0; i < ecc->num_channels; i++) {