Messages in this thread Patch in this message | | | Subject | Re: [PATCH v6 03/10] ASoC: qcom: Add register definition for codec rddma and wrdma | From | Srinivas Kandagatla <> | Date | Wed, 1 Dec 2021 14:51:40 +0000 |
| |
On 26/11/2021 12:04, Srinivasa Rao Mandadapu wrote: > This patch adds register definitions for codec read dma and write dma > lpass interface. > > Signed-off-by: Srinivasa Rao Mandadapu <srivasam@codeaurora.org> > Co-developed-by: Venkata Prasad Potturu <potturu@codeaurora.org> > Signed-off-by: Venkata Prasad Potturu <potturu@codeaurora.org> > --- > sound/soc/qcom/lpass-lpaif-reg.h | 103 ++++++++++++++++++++++++++++++++++++--- > 1 file changed, 97 insertions(+), 6 deletions(-) > > diff --git a/sound/soc/qcom/lpass-lpaif-reg.h b/sound/soc/qcom/lpass-lpaif-reg.h > index 2eb03ad..697a11f 100644 > --- a/sound/soc/qcom/lpass-lpaif-reg.h > +++ b/sound/soc/qcom/lpass-lpaif-reg.h > @@ -74,6 +74,16 @@ > #define LPAIF_IRQSTAT_REG(v, port) LPAIF_IRQ_REG_ADDR(v, 0x4, (port)) > #define LPAIF_IRQCLEAR_REG(v, port) LPAIF_IRQ_REG_ADDR(v, 0xC, (port)) > > +/* LPAIF RXTX IRQ */ > +#define LPAIF_RXTX_IRQ_REG_ADDR(v, addr, port, dai_id) \ > + ((dai_id == LPASS_CDC_DMA_RX0 || dai_id == LPASS_CDC_DMA_TX3) ? \ > + (v->rxtx_irq_reg_base + (addr) + v->rxtx_irq_reg_stride * (port)) : \ > + (v->va_irq_reg_base + (addr) + v->va_irq_reg_stride * (port))) > + > +#define LPAIF_RXTX_IRQEN_REG(v, port, dai_id) LPAIF_RXTX_IRQ_REG_ADDR(v, 0x0, port, dai_id) > +#define LPAIF_RXTX_IRQSTAT_REG(v, port, dai_id) LPAIF_RXTX_IRQ_REG_ADDR(v, 0x4, port, dai_id) > +#define LPAIF_RXTX_IRQCLEAR_REG(v, port, dai_id) LPAIF_RXTX_IRQ_REG_ADDR(v, 0xC, port, dai_id) > +
How about doing like this:
/* LPAIF RXTX IRQ */ #define LPAIF_RXTX_IRQ_REG_ADDR(v, addr, port) \ (v->rxtx_irq_reg_base + (addr) + v->rxtx_irq_reg_stride * (port))
#define LPAIF_RXTX_IRQEN_REG(v, port, dai_id) LPAIF_RXTX_IRQ_REG_ADDR(v, 0x0, port) #define LPAIF_RXTX_IRQSTAT_REG(v, port, dai_id) LPAIF_RXTX_IRQ_REG_ADDR(v, 0x4, port) #define LPAIF_RXTX_IRQCLEAR_REG(v, port, dai_id) LPAIF_RXTX_IRQ_REG_ADDR(v, 0xC, port)
/* LPAIF VA IRQ */ #define LPAIF_VA_IRQ_REG_ADDR(v, addr, port) \ (v->va_irq_reg_base + (addr) + v->va_irq_reg_stride * (port))
#define LPAIF_VA_IRQEN_REG(v, port, dai_id) LPAIF_VA_IRQ_REG_ADDR(v, 0x0, port) #define LPAIF_VA_IRQSTAT_REG(v, port, dai_id) LPAIF_VA_IRQ_REG_ADDR(v, 0x4, port) #define LPAIF_VA_IRQCLEAR_REG(v, port, dai_id) LPAIF_VA_IRQ_REG_ADDR(v, 0xC, port)
> > #define LPASS_HDMITX_APP_IRQ_REG_ADDR(v, addr) \ > ((v->hdmi_irq_reg_base) + (addr)) > @@ -139,12 +149,93 @@ > (LPAIF_INTFDMA_REG(v, chan, reg, dai_id)) : \ > LPAIF_WRDMA##reg##_REG(v, chan)) > > -#define LPAIF_DMACTL_REG(v, chan, dir, dai_id) __LPAIF_DMA_REG(v, chan, dir, CTL, dai_id) > -#define LPAIF_DMABASE_REG(v, chan, dir, dai_id) __LPAIF_DMA_REG(v, chan, dir, BASE, dai_id) > -#define LPAIF_DMABUFF_REG(v, chan, dir, dai_id) __LPAIF_DMA_REG(v, chan, dir, BUFF, dai_id) > -#define LPAIF_DMACURR_REG(v, chan, dir, dai_id) __LPAIF_DMA_REG(v, chan, dir, CURR, dai_id) > -#define LPAIF_DMAPER_REG(v, chan, dir, dai_id) __LPAIF_DMA_REG(v, chan, dir, PER, dai_id) > -#define LPAIF_DMAPERCNT_REG(v, chan, dir, dai_id) __LPAIF_DMA_REG(v, chan, dir, PERCNT, dai_id) > +#define LPAIF_DMACTL_REG(v, chan, dir, dai_id) \ > + (((dai_id == LPASS_CDC_DMA_RX0) || \ > + (dai_id == LPASS_CDC_DMA_TX3) || \ > + (dai_id == LPASS_CDC_DMA_VA_TX0)) ? \ > + __LPAIF_CDC_DMA_REG(v, chan, dir, CTL, dai_id) : \ > + __LPAIF_DMA_REG(v, chan, dir, CTL, dai_id))
How about:
#define LPAIF_DMACTL_REG(v, chan, dir, dai_id) \ is_cdc_dma_port(dai_id) ? \ __LPAIF_CDC_DMA_REG(v, chan, dir, CTL, dai_id) : \ __LPAIF_DMA_REG(v, chan, dir, CTL, dai_id)
simillar comments to most of the macros in this patch that are directly comparing the dai_ids.
> +#define LPAIF_DMABASE_REG(v, chan, dir, dai_id) \ > + ((dai_id == LPASS_CDC_DMA_RX0 || \ > + dai_id == LPASS_CDC_DMA_TX3 || \ > + dai_id == LPASS_CDC_DMA_VA_TX0) ? \ > + __LPAIF_CDC_DMA_REG(v, chan, dir, BASE, dai_id) : \ > + __LPAIF_DMA_REG(v, chan, dir, BASE, dai_id)) > +#define LPAIF_DMABUFF_REG(v, chan, dir, dai_id) \ > + ((dai_id == LPASS_CDC_DMA_RX0 || \ > + dai_id == LPASS_CDC_DMA_TX3 || \ > + dai_id == LPASS_CDC_DMA_VA_TX0) ? \ > + __LPAIF_CDC_DMA_REG(v, chan, dir, BUFF, dai_id) : \ > + __LPAIF_DMA_REG(v, chan, dir, BUFF, dai_id)) > +#define LPAIF_DMACURR_REG(v, chan, dir, dai_id) \ > + ((dai_id == LPASS_CDC_DMA_RX0 || \ > + dai_id == LPASS_CDC_DMA_TX3 || \ > + dai_id == LPASS_CDC_DMA_VA_TX0) ? \ > + __LPAIF_CDC_DMA_REG(v, chan, dir, CURR, dai_id) : \ > + __LPAIF_DMA_REG(v, chan, dir, CURR, dai_id)) > +#define LPAIF_DMAPER_REG(v, chan, dir, dai_id) \ > + ((dai_id == LPASS_CDC_DMA_RX0 || \ > + dai_id == LPASS_CDC_DMA_TX3 || \ > + dai_id == LPASS_CDC_DMA_VA_TX0) ? \ > + __LPAIF_CDC_DMA_REG(v, chan, dir, PER, dai_id) : \ > + __LPAIF_DMA_REG(v, chan, dir, PER, dai_id)) > +#define LPAIF_DMAPERCNT_REG(v, chan, dir, dai_id) \ > + ((dai_id == LPASS_CDC_DMA_RX0 || \ > + dai_id == LPASS_CDC_DMA_TX3 || \ > + dai_id == LPASS_CDC_DMA_VA_TX0) ? \ > + __LPAIF_CDC_DMA_REG(v, chan, dir, PERCNT, dai_id) : \ > + __LPAIF_DMA_REG(v, chan, dir, PERCNT, dai_id)) > + > +#define LPAIF_CDC_RDMA_REG_ADDR(v, addr, chan, dai_id) \ > + ((dai_id == LPASS_CDC_DMA_RX0 || dai_id == LPASS_CDC_DMA_TX3) ? \ > + (v->rxtx_rdma_reg_base + (addr) + v->rxtx_rdma_reg_stride * (chan)) : \ > + (v->va_rdma_reg_base + (addr) + v->va_rdma_reg_stride * (chan))) > + > +#define LPAIF_CDC_RDMACTL_REG(v, chan, dai_id) LPAIF_CDC_RDMA_REG_ADDR(v, 0x00, (chan), dai_id) > +#define LPAIF_CDC_RDMABASE_REG(v, chan, dai_id) LPAIF_CDC_RDMA_REG_ADDR(v, 0x04, (chan), dai_id) > +#define LPAIF_CDC_RDMABUFF_REG(v, chan, dai_id) LPAIF_CDC_RDMA_REG_ADDR(v, 0x08, (chan), dai_id) > +#define LPAIF_CDC_RDMACURR_REG(v, chan, dai_id) LPAIF_CDC_RDMA_REG_ADDR(v, 0x0C, (chan), dai_id) > +#define LPAIF_CDC_RDMAPER_REG(v, chan, dai_id) LPAIF_CDC_RDMA_REG_ADDR(v, 0x10, (chan), dai_id) > + > +#define LPAIF_CDC_RDMA_INTF_REG(v, chan, dai_id) \ > + LPAIF_CDC_RDMA_REG_ADDR(v, 0x50, (chan), dai_id) > + > +#define LPAIF_CDC_WRDMA_REG_ADDR(v, addr, chan, dai_id) \ > + ((dai_id == LPASS_CDC_DMA_RX0 || dai_id == LPASS_CDC_DMA_TX3) ? \ > + (v->rxtx_wrdma_reg_base + (addr) + \ > + v->rxtx_wrdma_reg_stride * (chan - v->rxtx_wrdma_channel_start)) : \ > + (v->va_wrdma_reg_base + (addr) + \ > + v->va_wrdma_reg_stride * (chan - v->va_wrdma_channel_start)))
Can we split this to LPAIF_CDC_TXRX_WRDMA_REG_ADDR and LPAIF_CDC_VA_WRDMA_REG_ADDR macros?
--srini
> + > +#define LPAIF_CDC_WRDMACTL_REG(v, chan, dai_id) \ > + LPAIF_CDC_WRDMA_REG_ADDR(v, 0x00, (chan), dai_id) > +#define LPAIF_CDC_WRDMABASE_REG(v, chan, dai_id) \ > + LPAIF_CDC_WRDMA_REG_ADDR(v, 0x04, (chan), dai_id) > +#define LPAIF_CDC_WRDMABUFF_REG(v, chan, dai_id) \ > + LPAIF_CDC_WRDMA_REG_ADDR(v, 0x08, (chan), dai_id) > +#define LPAIF_CDC_WRDMACURR_REG(v, chan, dai_id) \ > + LPAIF_CDC_WRDMA_REG_ADDR(v, 0x0C, (chan), dai_id) > +#define LPAIF_CDC_WRDMAPER_REG(v, chan, dai_id) \ > + LPAIF_CDC_WRDMA_REG_ADDR(v, 0x10, (chan), dai_id) > +#define LPAIF_CDC_WRDMA_INTF_REG(v, chan, dai_id) \ > + LPAIF_CDC_WRDMA_REG_ADDR(v, 0x50, (chan), dai_id) > + > +#define __LPAIF_CDC_DMA_REG(v, chan, dir, reg, dai_id) \ > + ((dir == SNDRV_PCM_STREAM_PLAYBACK) ? \ > + (LPAIF_CDC_RDMA##reg##_REG(v, chan, dai_id)) : \ > + LPAIF_CDC_WRDMA##reg##_REG(v, chan, dai_id)) > + > +#define LPAIF_CDC_INTF_REG(v, chan, dir, dai_id) \ > + ((dir == SNDRV_PCM_STREAM_PLAYBACK) ? \ > + LPAIF_CDC_RDMA_INTF_REG(v, chan, dai_id) : \ > + LPAIF_CDC_WRDMA_INTF_REG(v, chan, dai_id)) > + > +#define LPAIF_INTF_REG(v, chan, dir, dai_id) \ > + ((dai_id == LPASS_CDC_DMA_RX0 || \ > + dai_id == LPASS_CDC_DMA_TX3 || \ > + dai_id == LPASS_CDC_DMA_VA_TX0) ? \ > + LPAIF_CDC_INTF_REG(v, chan, dir, dai_id) : \ > + LPAIF_DMACTL_REG(v, chan, dir, dai_id)) > > #define LPAIF_DMACTL_BURSTEN_SINGLE 0 > #define LPAIF_DMACTL_BURSTEN_INCR4 1 >
| |