| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Wed, 1 Dec 2021 14:52:02 +0000
From: Srinivas Kandagatla <srinivas.kandagatla@...aro.org>
To: Srinivasa Rao Mandadapu <srivasam@...eaurora.org>,
agross@...nel.org, bjorn.andersson@...aro.org, lgirdwood@...il.com,
broonie@...nel.org, robh+dt@...nel.org, plai@...eaurora.org,
bgoswami@...eaurora.org, perex@...ex.cz, tiwai@...e.com,
rohitkr@...eaurora.org, linux-arm-msm@...r.kernel.org,
alsa-devel@...a-project.org, devicetree@...r.kernel.org,
linux-kernel@...r.kernel.org, swboyd@...omium.org,
judyhsiao@...omium.org
Cc: Venkata Prasad Potturu <potturu@...eaurora.org>
Subject: Re: [PATCH v6 02/10] ASoC: qcom: lpass: Add dma fields for codec dma
lpass interface
On 26/11/2021 12:04, Srinivasa Rao Mandadapu wrote:
> Add lpass interface memebers to support audio path over codec dma.
>
> Signed-off-by: Srinivasa Rao Mandadapu <srivasam@...eaurora.org>
> Co-developed-by: Venkata Prasad Potturu <potturu@...eaurora.org>
> Signed-off-by: Venkata Prasad Potturu <potturu@...eaurora.org>
Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@...aro.org>
> ---
> sound/soc/qcom/lpass.h | 133 +++++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 133 insertions(+)
>
> diff --git a/sound/soc/qcom/lpass.h b/sound/soc/qcom/lpass.h
> index 63aaa6f..4142f12 100644
> --- a/sound/soc/qcom/lpass.h
> +++ b/sound/soc/qcom/lpass.h
> @@ -19,6 +19,17 @@
> #define LPASS_MAX_MI2S_PORTS (8)
> #define LPASS_MAX_DMA_CHANNELS (8)
> #define LPASS_MAX_HDMI_DMA_CHANNELS (4)
> +#define LPASS_MAX_CDC_DMA_CHANNELS (8)
> +#define LPASS_MAX_VA_CDC_DMA_CHANNELS (8)
> +#define LPASS_CDC_DMA_INTF_ONE_CHANNEL (0x01)
> +#define LPASS_CDC_DMA_INTF_TWO_CHANNEL (0x03)
> +#define LPASS_CDC_DMA_INTF_FOUR_CHANNEL (0x0F)
> +#define LPASS_CDC_DMA_INTF_SIX_CHANNEL (0x3F)
> +#define LPASS_CDC_DMA_INTF_EIGHT_CHANNEL (0xFF)
> +
> +#define LPASS_MAX_CDC_CLKS (9)
> +#define LPASS_ACTIVE_PDS (4)
> +#define LPASS_PROXY_PDS (8)
>
> #define QCOM_REGMAP_FIELD_ALLOC(d, m, f, mf) \
> do { \
> @@ -50,6 +61,12 @@ struct lpaif_dmactl {
> struct regmap_field *burst8;
> struct regmap_field *burst16;
> struct regmap_field *dynburst;
> + struct regmap_field *codec_enable;
> + struct regmap_field *codec_pack;
> + struct regmap_field *codec_intf;
> + struct regmap_field *codec_fs_sel;
> + struct regmap_field *codec_channel;
> + struct regmap_field *codec_fs_delay;
> };
>
> /* Both the CPU DAI and platform drivers will access this data */
> @@ -64,6 +81,25 @@ struct lpass_data {
> /* MI2S bit clock (derived from system clock by a divider */
> struct clk *mi2s_bit_clk[LPASS_MAX_MI2S_PORTS];
>
> + struct clk *cdc_dma_clks[LPASS_MAX_CDC_CLKS];
> +
> + struct clk *xo;
> + struct clk *gcc_cfg_noc_lpass;
> + struct clk *core_cc_core;
> + struct clk *aon_cc_audio_hm_h;
> + struct clk *core_cc_sysnoc_mport_core;
> + struct clk *audio_cc_ext_mclk0;
> + struct clk *audio_cc_ext_mclk1;
> + struct clk *core_cc_lpm_core;
> + struct clk *core_cc_lpm_mem0_core;
> + struct clk *audio_cc_codec_mem;
> + struct clk *audio_cc_codec_mem0;
> + struct clk *audio_cc_codec_mem1;
> + struct clk *audio_cc_codec_mem2;
> + struct clk *audio_cc_rx_mclk_2x;
> + struct clk *audio_cc_rx_mclk;
> + struct clk *aon_cc_va_mem0;
> +
> /* MI2S SD lines to use for playback/capture */
> unsigned int mi2s_playback_sd_mode[LPASS_MAX_MI2S_PORTS];
> unsigned int mi2s_capture_sd_mode[LPASS_MAX_MI2S_PORTS];
> @@ -72,38 +108,61 @@ struct lpass_data {
> bool mi2s_was_prepared[LPASS_MAX_MI2S_PORTS];
>
> int hdmi_port_enable;
> + int codec_dma_enable;
>
> /* low-power audio interface (LPAIF) registers */
> void __iomem *lpaif;
> void __iomem *hdmiif;
> + void __iomem *rxtx_lpaif;
> + void __iomem *va_lpaif;
> +
> + u32 rxtx_cdc_dma_lpm_buf;
> + u32 va_cdc_dma_lpm_buf;
>
> /* regmap backed by the low-power audio interface (LPAIF) registers */
> struct regmap *lpaif_map;
> struct regmap *hdmiif_map;
> + struct regmap *rxtx_lpaif_map;
> + struct regmap *va_lpaif_map;
>
> /* interrupts from the low-power audio interface (LPAIF) */
> int lpaif_irq;
> int hdmiif_irq;
> + int rxtxif_irq;
> + int vaif_irq;
> +
> /* SOC specific variations in the LPASS IP integration */
> struct lpass_variant *variant;
>
> /* bit map to keep track of static channel allocations */
> unsigned long dma_ch_bit_map;
> unsigned long hdmi_dma_ch_bit_map;
> + unsigned long rxtx_dma_ch_bit_map;
> + unsigned long va_dma_ch_bit_map;
>
> /* used it for handling interrupt per dma channel */
> struct snd_pcm_substream *substream[LPASS_MAX_DMA_CHANNELS];
> struct snd_pcm_substream *hdmi_substream[LPASS_MAX_HDMI_DMA_CHANNELS];
> + struct snd_pcm_substream *rxtx_substream[LPASS_MAX_CDC_DMA_CHANNELS];
> + struct snd_pcm_substream *va_substream[LPASS_MAX_CDC_DMA_CHANNELS];
>
> /* SOC specific clock list */
> struct clk_bulk_data *clks;
> int num_clks;
> + struct clk_bulk_data *cdc_clks;
> + int cdc_num_clks;
>
> /* Regmap fields of I2SCTL & DMACTL registers bitfields */
> struct lpaif_i2sctl *i2sctl;
> struct lpaif_dmactl *rd_dmactl;
> struct lpaif_dmactl *wr_dmactl;
> struct lpaif_dmactl *hdmi_rd_dmactl;
> +
> + /* Regmap fields of CODEC DMA CTRL registers*/
> + struct lpaif_dmactl *rxtx_rd_dmactl;
> + struct lpaif_dmactl *rxtx_wr_dmactl;
> + struct lpaif_dmactl *va_wr_dmactl;
> +
> /* Regmap fields of HDMI_CTRL registers*/
> struct regmap_field *hdmitx_legacy_en;
> struct regmap_field *hdmitx_parity_calc_en;
> @@ -130,6 +189,24 @@ struct lpass_variant {
> u32 wrdma_reg_base;
> u32 wrdma_reg_stride;
> u32 wrdma_channels;
> + u32 rxtx_irq_reg_base;
> + u32 rxtx_irq_reg_stride;
> + u32 rxtx_irq_ports;
> + u32 rxtx_rdma_reg_base;
> + u32 rxtx_rdma_reg_stride;
> + u32 rxtx_rdma_channels;
> + u32 rxtx_wrdma_reg_base;
> + u32 rxtx_wrdma_reg_stride;
> + u32 rxtx_wrdma_channels;
> + u32 va_irq_reg_base;
> + u32 va_irq_reg_stride;
> + u32 va_irq_ports;
> + u32 va_rdma_reg_base;
> + u32 va_rdma_reg_stride;
> + u32 va_rdma_channels;
> + u32 va_wrdma_reg_base;
> + u32 va_wrdma_reg_stride;
> + u32 va_wrdma_channels;
> u32 i2sctrl_reg_base;
> u32 i2sctrl_reg_stride;
> u32 i2s_ports;
> @@ -233,12 +310,66 @@ struct lpass_variant {
> struct reg_field wrdma_enable;
> struct reg_field wrdma_dyncclk;
>
> + /*CDC RXTX RD_DMA */
> + struct reg_field rxtx_rdma_intf;
> + struct reg_field rxtx_rdma_bursten;
> + struct reg_field rxtx_rdma_wpscnt;
> + struct reg_field rxtx_rdma_fifowm;
> + struct reg_field rxtx_rdma_enable;
> + struct reg_field rxtx_rdma_dyncclk;
> + struct reg_field rxtx_rdma_burst8;
> + struct reg_field rxtx_rdma_burst16;
> + struct reg_field rxtx_rdma_dynburst;
> + struct reg_field rxtx_rdma_codec_enable;
> + struct reg_field rxtx_rdma_codec_pack;
> + struct reg_field rxtx_rdma_codec_intf;
> + struct reg_field rxtx_rdma_codec_fs_sel;
> + struct reg_field rxtx_rdma_codec_ch;
> + struct reg_field rxtx_rdma_codec_fs_delay;
> +
> + /*CDC RXTX WR_DMA */
> + struct reg_field rxtx_wrdma_intf;
> + struct reg_field rxtx_wrdma_bursten;
> + struct reg_field rxtx_wrdma_wpscnt;
> + struct reg_field rxtx_wrdma_fifowm;
> + struct reg_field rxtx_wrdma_enable;
> + struct reg_field rxtx_wrdma_dyncclk;
> + struct reg_field rxtx_wrdma_burst8;
> + struct reg_field rxtx_wrdma_burst16;
> + struct reg_field rxtx_wrdma_dynburst;
> + struct reg_field rxtx_wrdma_codec_enable;
> + struct reg_field rxtx_wrdma_codec_pack;
> + struct reg_field rxtx_wrdma_codec_intf;
> + struct reg_field rxtx_wrdma_codec_fs_sel;
> + struct reg_field rxtx_wrdma_codec_ch;
> + struct reg_field rxtx_wrdma_codec_fs_delay;
> +
> + /*CDC VA WR_DMA */
> + struct reg_field va_wrdma_intf;
> + struct reg_field va_wrdma_bursten;
> + struct reg_field va_wrdma_wpscnt;
> + struct reg_field va_wrdma_fifowm;
> + struct reg_field va_wrdma_enable;
> + struct reg_field va_wrdma_dyncclk;
> + struct reg_field va_wrdma_burst8;
> + struct reg_field va_wrdma_burst16;
> + struct reg_field va_wrdma_dynburst;
> + struct reg_field va_wrdma_codec_enable;
> + struct reg_field va_wrdma_codec_pack;
> + struct reg_field va_wrdma_codec_intf;
> + struct reg_field va_wrdma_codec_fs_sel;
> + struct reg_field va_wrdma_codec_ch;
> + struct reg_field va_wrdma_codec_fs_delay;
> +
> /**
> * on SOCs like APQ8016 the channel control bits start
> * at different offset to ipq806x
> **/
> u32 dmactl_audif_start;
> u32 wrdma_channel_start;
> + u32 rxtx_wrdma_channel_start;
> + u32 va_wrdma_channel_start;
> +
> /* SOC specific initialization like clocks */
> int (*init)(struct platform_device *pdev);
> int (*exit)(struct platform_device *pdev);
> @@ -250,10 +381,12 @@ struct lpass_variant {
> int num_dai;
> const char * const *dai_osr_clk_names;
> const char * const *dai_bit_clk_names;
> + const char * const *cdc_dma_clk_names;
>
> /* SOC specific clocks configuration */
> const char **clk_name;
> int num_clks;
> + int cdc_dma_num_clks;
> };
>
> struct lpass_pcm_data {
>
Powered by blists - more mailing lists