[Sound-open-firmware] [PATCH 2/2] cnl: dma: refine dma interrupt processing on cnl

Liam Girdwood liam.r.girdwood at linux.intel.com
Tue Mar 6 12:40:23 CET 2018


On Tue, 2018-03-06 at 13:26 +0800, Rander Wang wrote: 
> +/*All the dma share the same interrupt on CNL, so check each dma*/
> +/*controller when interrupt coming, then do the work            */
> +static void dw_dma_irq_cnl(void *data)
> +{
> +	struct dma *dma;
> +	uint32_t status_intr;
> +
> +	/*check interrupt status of DMA controller 0*/
> +	dma = dma_get(DMA_GP_LP_DMAC0);
> +	status_intr = dw_read(dma, DW_INTR_STATUS);
> +	if (status_intr)
> +		dw_dma_irq_handler(dma);
> +
> +	/*check interrupt status of DMA controller 1*/
> +	dma = dma_get(DMA_GP_LP_DMAC1);
> +	status_intr = dw_read(dma, DW_INTR_STATUS);
> +	if (status_intr)
> +		dw_dma_irq_handler(dma);


Btw, shouldn't the CNL IRQ hanler be using the same code as APL since
the DMAC is second level on both APL and CNL ?

> +}
> +
>  static int dw_dma_probe(struct dma *dma)
>  {
>  	struct dma_pdata *dw_pdata;
> @@ -1157,7 +1177,11 @@ static int dw_dma_probe(struct dma *dma)
>  	}
>  
>  	/* register our IRQ handler */
> +#ifdef CONFIG_CANNONLAKE
> +	interrupt_register(dma_irq(dma), dw_dma_irq_cnl, dma);
> +#else
>  	interrupt_register(dma_irq(dma), dw_dma_irq_handler, dma);
> +#endif

You dont need this #ifdef if both IRQ handler functions have the same
name (and we select the correct one at build time).

Liam

>  	interrupt_enable(dma_irq(dma));
>  
>  	return 0;


More information about the Sound-open-firmware mailing list