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

Commit 1d455437 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Vinod Koul
Browse files

dw_dmac: introduce dwc_dump_chan_regs to dump registers 



There is three places where values of the most significant registers were
printed. Make such piece of code as separate function.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarViresh Kumar <viresh.linux@gmail.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@linux.intel.com>
parent 2f45d613

drivers/dma/dw_dmac.c

+16 −21
Original line number Diff line number Diff line
@@ -191,6 +191,19 @@ static void dwc_initialize(struct dw_dma_chan *dwc) 


/*----------------------------------------------------------------------*/



static void dwc_dump_chan_regs(struct dw_dma_chan *dwc)

{

	dev_err(chan2dev(&dwc->chan),

		"  SAR: 0x%x DAR: 0x%x LLP: 0x%x CTL: 0x%x:%08x\n",

		channel_readl(dwc, SAR),

		channel_readl(dwc, DAR),

		channel_readl(dwc, LLP),

		channel_readl(dwc, CTL_HI),

		channel_readl(dwc, CTL_LO));

}



/*----------------------------------------------------------------------*/



/* Called with dwc->lock held and bh disabled */

static void dwc_dostart(struct dw_dma_chan *dwc, struct dw_desc *first)

{
@@ -200,13 +213,7 @@ static void dwc_dostart(struct dw_dma_chan *dwc, struct dw_desc *first) 
	if (dma_readl(dw, CH_EN) & dwc->mask) {

		dev_err(chan2dev(&dwc->chan),

			"BUG: Attempted to start non-idle channel\n");

		dev_err(chan2dev(&dwc->chan),

			"  SAR: 0x%x DAR: 0x%x LLP: 0x%x CTL: 0x%x:%08x\n",

			channel_readl(dwc, SAR),

			channel_readl(dwc, DAR),

			channel_readl(dwc, LLP),

			channel_readl(dwc, CTL_HI),

			channel_readl(dwc, CTL_LO));

		dwc_dump_chan_regs(dwc);



		/* The tasklet will hopefully advance the queue... */

		return;
@@ -490,13 +497,7 @@ static void dwc_handle_cyclic(struct dw_dma *dw, struct dw_dma_chan *dwc, 


		spin_lock_irqsave(&dwc->lock, flags);



		dev_err(chan2dev(&dwc->chan),

			"  SAR: 0x%x DAR: 0x%x LLP: 0x%x CTL: 0x%x:%08x\n",

			channel_readl(dwc, SAR),

			channel_readl(dwc, DAR),

			channel_readl(dwc, LLP),

			channel_readl(dwc, CTL_HI),

			channel_readl(dwc, CTL_LO));

		dwc_dump_chan_regs(dwc);



		channel_clear_bit(dw, CH_EN, dwc->mask);

		while (dma_readl(dw, CH_EN) & dwc->mask)
@@ -1131,13 +1132,7 @@ int dw_dma_cyclic_start(struct dma_chan *chan) 
	if (dma_readl(dw, CH_EN) & dwc->mask) {

		dev_err(chan2dev(&dwc->chan),

			"BUG: Attempted to start non-idle channel\n");

		dev_err(chan2dev(&dwc->chan),

			"  SAR: 0x%x DAR: 0x%x LLP: 0x%x CTL: 0x%x:%08x\n",

			channel_readl(dwc, SAR),

			channel_readl(dwc, DAR),

			channel_readl(dwc, LLP),

			channel_readl(dwc, CTL_HI),

			channel_readl(dwc, CTL_LO));

		dwc_dump_chan_regs(dwc);

		spin_unlock_irqrestore(&dwc->lock, flags);

		return -EBUSY;

	}