| Message ID | 20200313101627.1561365-8-vkoul@kernel.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [RESEND,v2,1/9] ALSA: compress: add wma codec profiles | expand |
On 13/03/2020 10:16, Vinod Koul wrote: > Qualcomm DSPs expect ALAC and APE configs to be send for decoders, > so add the API to program the respective config to the DSP. > > Signed-off-by: Vinod Koul <vkoul@kernel.org> Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > --- > sound/soc/qcom/qdsp6/q6asm.c | 118 +++++++++++++++++++++++++++++++++++ > sound/soc/qcom/qdsp6/q6asm.h | 32 ++++++++++ > 2 files changed, 150 insertions(+) > > diff --git a/sound/soc/qcom/qdsp6/q6asm.c b/sound/soc/qcom/qdsp6/q6asm.c > index 4cec95c657ba..0e0e8f7a460a 100644 > --- a/sound/soc/qcom/qdsp6/q6asm.c > +++ b/sound/soc/qcom/qdsp6/q6asm.c > @@ -48,6 +48,8 @@ > #define ASM_STREAM_CMD_OPEN_READ_V3 0x00010DB4 > #define ASM_DATA_EVENT_READ_DONE_V2 0x00010D9A > #define ASM_STREAM_CMD_OPEN_READWRITE_V2 0x00010D8D > +#define ASM_MEDIA_FMT_ALAC 0x00012f31 > +#define ASM_MEDIA_FMT_APE 0x00012f32 > > > #define ASM_LEGACY_STREAM_SESSION 0 > @@ -133,6 +135,36 @@ struct asm_wmaprov10_fmt_blk_v2 { > u32 advanced_enc_options2; > } __packed; > > +struct asm_alac_fmt_blk_v2 { > + struct asm_data_cmd_media_fmt_update_v2 fmt_blk; > + u32 frame_length; > + u8 compatible_version; > + u8 bit_depth; > + u8 pb; > + u8 mb; > + u8 kb; > + u8 num_channels; > + u16 max_run; > + u32 max_frame_bytes; > + u32 avg_bit_rate; > + u32 sample_rate; > + u32 channel_layout_tag; > +} __packed; > + > +struct asm_ape_fmt_blk_v2 { > + struct asm_data_cmd_media_fmt_update_v2 fmt_blk; > + u16 compatible_version; > + u16 compression_level; > + u32 format_flags; > + u32 blocks_per_frame; > + u32 final_frame_blocks; > + u32 total_frames; > + u16 bits_per_sample; > + u16 num_channels; > + u32 sample_rate; > + u32 seek_table_present; > +} __packed; > + > struct asm_stream_cmd_set_encdec_param { > u32 param_id; > u32 param_size; > @@ -941,6 +973,12 @@ int q6asm_open_write(struct audio_client *ac, uint32_t format, > goto err; > } > break; > + case SND_AUDIOCODEC_ALAC: > + open->dec_fmt_id = ASM_MEDIA_FMT_ALAC; > + break; > + case SND_AUDIOCODEC_APE: > + open->dec_fmt_id = ASM_MEDIA_FMT_APE; > + break; > default: > dev_err(ac->dev, "Invalid format 0x%x\n", format); > rc = -EINVAL; > @@ -1198,6 +1236,86 @@ int q6asm_stream_media_format_block_wma_v10(struct audio_client *ac, > } > EXPORT_SYMBOL_GPL(q6asm_stream_media_format_block_wma_v10); > > +int q6asm_stream_media_format_block_alac(struct audio_client *ac, > + struct q6asm_alac_cfg *cfg) > +{ > + struct asm_alac_fmt_blk_v2 *fmt; > + struct apr_pkt *pkt; > + void *p; > + int rc, pkt_size; > + > + pkt_size = APR_HDR_SIZE + sizeof(*fmt); > + p = kzalloc(pkt_size, GFP_KERNEL); > + if (!p) > + return -ENOMEM; > + > + pkt = p; > + fmt = p + APR_HDR_SIZE; > + > + q6asm_add_hdr(ac, &pkt->hdr, pkt_size, true, ac->stream_id); > + > + pkt->hdr.opcode = ASM_DATA_CMD_MEDIA_FMT_UPDATE_V2; > + fmt->fmt_blk.fmt_blk_size = sizeof(*fmt) - sizeof(fmt->fmt_blk); > + > + fmt->frame_length = cfg->frame_length; > + fmt->compatible_version = cfg->compatible_version; > + fmt->bit_depth = cfg->bit_depth; > + fmt->num_channels = cfg->num_channels; > + fmt->max_run = cfg->max_run; > + fmt->max_frame_bytes = cfg->max_frame_bytes; > + fmt->avg_bit_rate = cfg->avg_bit_rate; > + fmt->sample_rate = cfg->sample_rate; > + fmt->channel_layout_tag = cfg->channel_layout_tag; > + fmt->pb = cfg->pb; > + fmt->mb = cfg->mb; > + fmt->kb = cfg->kb; > + > + rc = q6asm_ac_send_cmd_sync(ac, pkt); > + kfree(pkt); > + > + return rc; > +} > +EXPORT_SYMBOL_GPL(q6asm_stream_media_format_block_alac); > + > +int q6asm_stream_media_format_block_ape(struct audio_client *ac, > + struct q6asm_ape_cfg *cfg) > +{ > + struct asm_ape_fmt_blk_v2 *fmt; > + struct apr_pkt *pkt; > + void *p; > + int rc, pkt_size; > + > + pkt_size = APR_HDR_SIZE + sizeof(*fmt); > + p = kzalloc(pkt_size, GFP_KERNEL); > + if (!p) > + return -ENOMEM; > + > + pkt = p; > + fmt = p + APR_HDR_SIZE; > + > + q6asm_add_hdr(ac, &pkt->hdr, pkt_size, true, ac->stream_id); > + > + pkt->hdr.opcode = ASM_DATA_CMD_MEDIA_FMT_UPDATE_V2; > + fmt->fmt_blk.fmt_blk_size = sizeof(*fmt) - sizeof(fmt->fmt_blk); > + > + fmt->compatible_version = cfg->compatible_version; > + fmt->compression_level = cfg->compression_level; > + fmt->format_flags = cfg->format_flags; > + fmt->blocks_per_frame = cfg->blocks_per_frame; > + fmt->final_frame_blocks = cfg->final_frame_blocks; > + fmt->total_frames = cfg->total_frames; > + fmt->bits_per_sample = cfg->bits_per_sample; > + fmt->num_channels = cfg->num_channels; > + fmt->sample_rate = cfg->sample_rate; > + fmt->seek_table_present = cfg->seek_table_present; > + > + rc = q6asm_ac_send_cmd_sync(ac, pkt); > + kfree(pkt); > + > + return rc; > +} > +EXPORT_SYMBOL_GPL(q6asm_stream_media_format_block_ape); > + > /** > * q6asm_enc_cfg_blk_pcm_format_support() - setup pcm configuration for capture > * > diff --git a/sound/soc/qcom/qdsp6/q6asm.h b/sound/soc/qcom/qdsp6/q6asm.h > index 5d9fbc75688c..38a207d6cd95 100644 > --- a/sound/soc/qcom/qdsp6/q6asm.h > +++ b/sound/soc/qcom/qdsp6/q6asm.h > @@ -58,6 +58,34 @@ struct q6asm_wma_cfg { > u32 adv_enc_options2; > }; > > +struct q6asm_alac_cfg { > + u32 frame_length; > + u8 compatible_version; > + u8 bit_depth; > + u8 pb; > + u8 mb; > + u8 kb; > + u8 num_channels; > + u16 max_run; > + u32 max_frame_bytes; > + u32 avg_bit_rate; > + u32 sample_rate; > + u32 channel_layout_tag; > +}; > + > +struct q6asm_ape_cfg { > + u16 compatible_version; > + u16 compression_level; > + u32 format_flags; > + u32 blocks_per_frame; > + u32 final_frame_blocks; > + u32 total_frames; > + u16 bits_per_sample; > + u16 num_channels; > + u32 sample_rate; > + u32 seek_table_present; > +}; > + > typedef void (*q6asm_cb) (uint32_t opcode, uint32_t token, > void *payload, void *priv); > struct audio_client; > @@ -86,6 +114,10 @@ int q6asm_stream_media_format_block_wma_v9(struct audio_client *ac, > struct q6asm_wma_cfg *cfg); > int q6asm_stream_media_format_block_wma_v10(struct audio_client *ac, > struct q6asm_wma_cfg *cfg); > +int q6asm_stream_media_format_block_alac(struct audio_client *ac, > + struct q6asm_alac_cfg *cfg); > +int q6asm_stream_media_format_block_ape(struct audio_client *ac, > + struct q6asm_ape_cfg *cfg); > int q6asm_run(struct audio_client *ac, uint32_t flags, uint32_t msw_ts, > uint32_t lsw_ts); > int q6asm_run_nowait(struct audio_client *ac, uint32_t flags, uint32_t msw_ts, >
diff --git a/sound/soc/qcom/qdsp6/q6asm.c b/sound/soc/qcom/qdsp6/q6asm.c index 4cec95c657ba..0e0e8f7a460a 100644 --- a/sound/soc/qcom/qdsp6/q6asm.c +++ b/sound/soc/qcom/qdsp6/q6asm.c @@ -48,6 +48,8 @@ #define ASM_STREAM_CMD_OPEN_READ_V3 0x00010DB4 #define ASM_DATA_EVENT_READ_DONE_V2 0x00010D9A #define ASM_STREAM_CMD_OPEN_READWRITE_V2 0x00010D8D +#define ASM_MEDIA_FMT_ALAC 0x00012f31 +#define ASM_MEDIA_FMT_APE 0x00012f32 #define ASM_LEGACY_STREAM_SESSION 0 @@ -133,6 +135,36 @@ struct asm_wmaprov10_fmt_blk_v2 { u32 advanced_enc_options2; } __packed; +struct asm_alac_fmt_blk_v2 { + struct asm_data_cmd_media_fmt_update_v2 fmt_blk; + u32 frame_length; + u8 compatible_version; + u8 bit_depth; + u8 pb; + u8 mb; + u8 kb; + u8 num_channels; + u16 max_run; + u32 max_frame_bytes; + u32 avg_bit_rate; + u32 sample_rate; + u32 channel_layout_tag; +} __packed; + +struct asm_ape_fmt_blk_v2 { + struct asm_data_cmd_media_fmt_update_v2 fmt_blk; + u16 compatible_version; + u16 compression_level; + u32 format_flags; + u32 blocks_per_frame; + u32 final_frame_blocks; + u32 total_frames; + u16 bits_per_sample; + u16 num_channels; + u32 sample_rate; + u32 seek_table_present; +} __packed; + struct asm_stream_cmd_set_encdec_param { u32 param_id; u32 param_size; @@ -941,6 +973,12 @@ int q6asm_open_write(struct audio_client *ac, uint32_t format, goto err; } break; + case SND_AUDIOCODEC_ALAC: + open->dec_fmt_id = ASM_MEDIA_FMT_ALAC; + break; + case SND_AUDIOCODEC_APE: + open->dec_fmt_id = ASM_MEDIA_FMT_APE; + break; default: dev_err(ac->dev, "Invalid format 0x%x\n", format); rc = -EINVAL; @@ -1198,6 +1236,86 @@ int q6asm_stream_media_format_block_wma_v10(struct audio_client *ac, } EXPORT_SYMBOL_GPL(q6asm_stream_media_format_block_wma_v10); +int q6asm_stream_media_format_block_alac(struct audio_client *ac, + struct q6asm_alac_cfg *cfg) +{ + struct asm_alac_fmt_blk_v2 *fmt; + struct apr_pkt *pkt; + void *p; + int rc, pkt_size; + + pkt_size = APR_HDR_SIZE + sizeof(*fmt); + p = kzalloc(pkt_size, GFP_KERNEL); + if (!p) + return -ENOMEM; + + pkt = p; + fmt = p + APR_HDR_SIZE; + + q6asm_add_hdr(ac, &pkt->hdr, pkt_size, true, ac->stream_id); + + pkt->hdr.opcode = ASM_DATA_CMD_MEDIA_FMT_UPDATE_V2; + fmt->fmt_blk.fmt_blk_size = sizeof(*fmt) - sizeof(fmt->fmt_blk); + + fmt->frame_length = cfg->frame_length; + fmt->compatible_version = cfg->compatible_version; + fmt->bit_depth = cfg->bit_depth; + fmt->num_channels = cfg->num_channels; + fmt->max_run = cfg->max_run; + fmt->max_frame_bytes = cfg->max_frame_bytes; + fmt->avg_bit_rate = cfg->avg_bit_rate; + fmt->sample_rate = cfg->sample_rate; + fmt->channel_layout_tag = cfg->channel_layout_tag; + fmt->pb = cfg->pb; + fmt->mb = cfg->mb; + fmt->kb = cfg->kb; + + rc = q6asm_ac_send_cmd_sync(ac, pkt); + kfree(pkt); + + return rc; +} +EXPORT_SYMBOL_GPL(q6asm_stream_media_format_block_alac); + +int q6asm_stream_media_format_block_ape(struct audio_client *ac, + struct q6asm_ape_cfg *cfg) +{ + struct asm_ape_fmt_blk_v2 *fmt; + struct apr_pkt *pkt; + void *p; + int rc, pkt_size; + + pkt_size = APR_HDR_SIZE + sizeof(*fmt); + p = kzalloc(pkt_size, GFP_KERNEL); + if (!p) + return -ENOMEM; + + pkt = p; + fmt = p + APR_HDR_SIZE; + + q6asm_add_hdr(ac, &pkt->hdr, pkt_size, true, ac->stream_id); + + pkt->hdr.opcode = ASM_DATA_CMD_MEDIA_FMT_UPDATE_V2; + fmt->fmt_blk.fmt_blk_size = sizeof(*fmt) - sizeof(fmt->fmt_blk); + + fmt->compatible_version = cfg->compatible_version; + fmt->compression_level = cfg->compression_level; + fmt->format_flags = cfg->format_flags; + fmt->blocks_per_frame = cfg->blocks_per_frame; + fmt->final_frame_blocks = cfg->final_frame_blocks; + fmt->total_frames = cfg->total_frames; + fmt->bits_per_sample = cfg->bits_per_sample; + fmt->num_channels = cfg->num_channels; + fmt->sample_rate = cfg->sample_rate; + fmt->seek_table_present = cfg->seek_table_present; + + rc = q6asm_ac_send_cmd_sync(ac, pkt); + kfree(pkt); + + return rc; +} +EXPORT_SYMBOL_GPL(q6asm_stream_media_format_block_ape); + /** * q6asm_enc_cfg_blk_pcm_format_support() - setup pcm configuration for capture * diff --git a/sound/soc/qcom/qdsp6/q6asm.h b/sound/soc/qcom/qdsp6/q6asm.h index 5d9fbc75688c..38a207d6cd95 100644 --- a/sound/soc/qcom/qdsp6/q6asm.h +++ b/sound/soc/qcom/qdsp6/q6asm.h @@ -58,6 +58,34 @@ struct q6asm_wma_cfg { u32 adv_enc_options2; }; +struct q6asm_alac_cfg { + u32 frame_length; + u8 compatible_version; + u8 bit_depth; + u8 pb; + u8 mb; + u8 kb; + u8 num_channels; + u16 max_run; + u32 max_frame_bytes; + u32 avg_bit_rate; + u32 sample_rate; + u32 channel_layout_tag; +}; + +struct q6asm_ape_cfg { + u16 compatible_version; + u16 compression_level; + u32 format_flags; + u32 blocks_per_frame; + u32 final_frame_blocks; + u32 total_frames; + u16 bits_per_sample; + u16 num_channels; + u32 sample_rate; + u32 seek_table_present; +}; + typedef void (*q6asm_cb) (uint32_t opcode, uint32_t token, void *payload, void *priv); struct audio_client; @@ -86,6 +114,10 @@ int q6asm_stream_media_format_block_wma_v9(struct audio_client *ac, struct q6asm_wma_cfg *cfg); int q6asm_stream_media_format_block_wma_v10(struct audio_client *ac, struct q6asm_wma_cfg *cfg); +int q6asm_stream_media_format_block_alac(struct audio_client *ac, + struct q6asm_alac_cfg *cfg); +int q6asm_stream_media_format_block_ape(struct audio_client *ac, + struct q6asm_ape_cfg *cfg); int q6asm_run(struct audio_client *ac, uint32_t flags, uint32_t msw_ts, uint32_t lsw_ts); int q6asm_run_nowait(struct audio_client *ac, uint32_t flags, uint32_t msw_ts,
Qualcomm DSPs expect ALAC and APE configs to be send for decoders, so add the API to program the respective config to the DSP. Signed-off-by: Vinod Koul <vkoul@kernel.org> --- sound/soc/qcom/qdsp6/q6asm.c | 118 +++++++++++++++++++++++++++++++++++ sound/soc/qcom/qdsp6/q6asm.h | 32 ++++++++++ 2 files changed, 150 insertions(+)