ASoC: SOF: dma-trace: Change trace_init() ops parameter list
Subsystems (3)
Peter Ujfalusi
maintainercover ASoC: SOF: dma-trace: Change trace_init() ops parameter list
Hi,
the DMA trace implementation on AMD platform assumes that the stream_tag pointer is pointing the stream_tag member of struct sof_ipc_dma_trace_params_ext, which is true at the moment, but it can not be guarantied and a change in the dtrace core can cause out of bound accesses for AMD.
For this reason, change the API to pass the struct itself which will remove the assumption and makes it clear from both sides what is expected to be sent via the parameter list.
This opens up a window to clean up the intel and AMD implementation at the same time.
Regards,
Peter
---
Peter Ujfalusi (2):
ASoC: SOF: intel: hda-trace: Pass the dma buffer pointer to
hda_dsp_trace_prepare
ASoC: SOF: dma-trace: Pass pointer to params_ext struct in
trace_init()
sound/soc/sof/amd/acp-trace.c | 38 ++++++++------------------------- sound/soc/sof/amd/acp.h | 3 ++- sound/soc/sof/intel/hda-trace.c | 17 ++++++++------- sound/soc/sof/intel/hda.h | 3 ++- sound/soc/sof/ops.h | 4 ++-- sound/soc/sof/sof-priv.h | 2 +- sound/soc/sof/trace.c | 2 +- 7 files changed, 26 insertions(+), 43 deletions(-)
Signature · 1 line
2.35.0
Peter Ujfalusi
maintainerPATCH 1/2 ASoC: SOF: intel: hda-trace: Pass the dma buffer pointer to hda_dsp_trace_prepare
Pass the snd_dma_buffer pointer as parameter to hda_dsp_trace_prepare() function.
--- sound/soc/sof/intel/hda-trace.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
sound/soc/sof/intel/hda-trace.c +3 -4
@@ -19,16 +19,15 @@#include "../ops.h" #include "hda.h" -static int hda_dsp_trace_prepare (struct snd_sof_dev *sdev) +static int hda_dsp_trace_prepare (struct snd_sof_dev *sdev,struct snd_dma_buffer *dmab) {struct sof_intel_hda_dev *hda = sdev->pdata->hw_pdata;struct hdac_ext_stream *stream = hda->dtrace_stream;struct hdac_stream *hstream = &stream->hstream; -struct snd_dma_buffer *dmab = &sdev->dmatb;int ret; hstream->period_bytes =0 ;/* initialize period_bytes */ - hstream->bufsize = sdev->dmatb.bytes; + hstream->bufsize = dmab->bytes; ret =hda_dsp_stream_hw_params (sdev, stream, dmab,NULL );if (ret <0 )
@@ -57,7 +56,7 @@ int hda_dsp_trace_init(struct snd_sof_dev *sdev, u32 *stream_tag)* initialize capture stream, set BDL address and return corresponding * stream tag which will be sent to the firmware by IPC message. */ - ret =hda_dsp_trace_prepare (sdev); + ret =hda_dsp_trace_prepare (sdev, &sdev->dmatb);if (ret <0 ) {dev_err (sdev->dev,"error: hdac trace init failed: %d\n" , ret);hda_dsp_stream_put (sdev,SNDRV_PCM_STREAM_CAPTURE , *stream_tag);
Signature · 1 line
2.35.0
Peter Ujfalusi
maintainerPATCH 2/2 ASoC: SOF: dma-trace: Pass pointer to params_ext struct in trace_init()
In reply to Peter UjfalusiInstead of passing a pointer to the stream_tag within the struct sof_ipc_dma_trace_params_ext, pass the pointer to the containing struct.
AMD needs to update buffer.phy_addr (and don't really use the stream_tag) for the trace implementation.
--- sound/soc/sof/amd/acp-trace.c | 38 ++++++++------------------------- sound/soc/sof/amd/acp.h | 3 ++- sound/soc/sof/intel/hda-trace.c | 10 +++++---- sound/soc/sof/intel/hda.h | 3 ++- sound/soc/sof/ops.h | 4 ++-- sound/soc/sof/sof-priv.h | 2 +- sound/soc/sof/trace.c | 2 +- 7 files changed, 23 insertions(+), 39 deletions(-)
sound/soc/sof/amd/acp-trace.c +9 -29
@@ -34,51 +34,31 @@ int acp_sof_trace_release(struct snd_sof_dev *sdev) }EXPORT_SYMBOL_NS (acp_sof_trace_release,SND_SOC_SOF_AMD_COMMON ); -static int acp_sof_trace_prepare (struct snd_sof_dev *sdev, -struct sof_ipc_dma_trace_params_ext *params) +int acp_sof_trace_init (struct snd_sof_dev *sdev, +struct sof_ipc_dma_trace_params_ext *dtrace_params) {struct acp_dsp_stream *stream;struct acp_dev_data *adata;int ret; adata = sdev->pdata->hw_pdata; - stream = adata->dtrace_stream; + stream =acp_dsp_stream_get (sdev,ACP_LOGGER_STREAM ); +if (!stream) +return -ENODEV ; + stream->dmab = &sdev->dmatb; stream->num_pages =NUM_PAGES ; ret =acp_dsp_stream_config (sdev, stream);if (ret <0 ) { -dev_err (sdev->dev,"Failed to configure trace stream\n" ); +acp_dsp_stream_put (sdev, stream);return ret; } - params->buffer.phy_addr = stream->reg_offset; - params->stream_tag = stream->stream_tag; - -return 0 ; -} - -int acp_sof_trace_init (struct snd_sof_dev *sdev,u32 *stream_tag) -{ -struct sof_ipc_dma_trace_params_ext *params; -struct acp_dsp_stream *stream; -struct acp_dev_data *adata; -int ret; - - adata = sdev->pdata->hw_pdata; - stream =acp_dsp_stream_get (sdev,ACP_LOGGER_STREAM ); -if (!stream) -return -ENODEV ; - adata->dtrace_stream = stream; - params = container_of(stream_tag, struct sof_ipc_dma_trace_params_ext, stream_tag); - ret =acp_sof_trace_prepare (sdev, params); -if (ret <0 ) { -acp_dsp_stream_put (sdev, stream); -return ret; - } + dtrace_params->stream_tag = stream->stream_tag; + dtrace_params->buffer.phy_addr = stream->reg_offset; - *stream_tag = stream->stream_tag;return 0 ; }EXPORT_SYMBOL_NS (acp_sof_trace_init,SND_SOC_SOF_AMD_COMMON );
sound/soc/sof/amd/acp.h +2 -1
@@ -210,7 +210,8 @@ extern const struct snd_sof_dsp_ops sof_renoir_ops;int snd_amd_acp_find_config (struct pci_dev *pci);/* Trace */ -int acp_sof_trace_init (struct snd_sof_dev *sdev,u32 *stream_tag); +int acp_sof_trace_init (struct snd_sof_dev *sdev, +struct sof_ipc_dma_trace_params_ext *dtrace_params);int acp_sof_trace_release (struct snd_sof_dev *sdev);struct sof_amd_acp_desc {
sound/soc/sof/intel/hda-trace.c +6 -4
@@ -36,7 +36,8 @@ static int hda_dsp_trace_prepare(struct snd_sof_dev *sdev, struct snd_dma_bufferreturn ret; } -int hda_dsp_trace_init (struct snd_sof_dev *sdev,u32 *stream_tag) +int hda_dsp_trace_init (struct snd_sof_dev *sdev, +struct sof_ipc_dma_trace_params_ext *dtrace_params) {struct sof_intel_hda_dev *hda = sdev->pdata->hw_pdata;int ret;
@@ -50,7 +51,7 @@ int hda_dsp_trace_init(struct snd_sof_dev *sdev, u32 *stream_tag)return -ENODEV ; } - *stream_tag = hda->dtrace_stream->hstream.stream_tag; + dtrace_params->stream_tag = hda->dtrace_stream->hstream.stream_tag;/* * initialize capture stream, set BDL address and return corresponding
@@ -59,9 +60,10 @@ int hda_dsp_trace_init(struct snd_sof_dev *sdev, u32 *stream_tag) ret =hda_dsp_trace_prepare (sdev, &sdev->dmatb);if (ret <0 ) {dev_err (sdev->dev,"error: hdac trace init failed: %d\n" , ret); -hda_dsp_stream_put (sdev,SNDRV_PCM_STREAM_CAPTURE , *stream_tag); +hda_dsp_stream_put (sdev,SNDRV_PCM_STREAM_CAPTURE , + dtrace_params->stream_tag); hda->dtrace_stream =NULL ; - *stream_tag =0 ; + dtrace_params->stream_tag =0 ; }return ret;
sound/soc/sof/intel/hda.h +2 -1
@@ -670,7 +670,8 @@ static inline int hda_codec_i915_exit(struct snd_sof_dev *sdev) { return 0; }/* * Trace Control. */ -int hda_dsp_trace_init (struct snd_sof_dev *sdev,u32 *stream_tag); +int hda_dsp_trace_init (struct snd_sof_dev *sdev, +struct sof_ipc_dma_trace_params_ext *dtrace_params);int hda_dsp_trace_release (struct snd_sof_dev *sdev);int hda_dsp_trace_trigger (struct snd_sof_dev *sdev,int cmd);
sound/soc/sof/ops.h +2 -2
@@ -369,10 +369,10 @@ static inline int snd_sof_dsp_send_msg(struct snd_sof_dev *sdev,/* host DMA trace */ static inline int snd_sof_dma_trace_init (struct snd_sof_dev *sdev, -u32 *stream_tag) +struct sof_ipc_dma_trace_params_ext *dtrace_params) {if (sof_ops (sdev)->trace_init) -return sof_ops (sdev)->trace_init (sdev, stream_tag); +return sof_ops (sdev)->trace_init (sdev, dtrace_params);return 0 ; }
sound/soc/sof/sof-priv.h +1 -1
@@ -281,7 +281,7 @@ struct snd_sof_dsp_ops {/* host DMA trace initialization */ int (*trace_init)(struct snd_sof_dev *sdev, -u32 *stream_tag);/* optional */ +struct sof_ipc_dma_trace_params_ext *dtrace_params);/* optional */ int (*trace_release)(struct snd_sof_dev *sdev);/* optional */ int (*trace_trigger)(struct snd_sof_dev *sdev,int cmd);/* optional */
sound/soc/sof/trace.c +1 -1
@@ -409,7 +409,7 @@ int snd_sof_init_trace_ipc(struct snd_sof_dev *sdev) sdev->host_offset =0 ; sdev->dtrace_draining = false; - ret =snd_sof_dma_trace_init (sdev, ¶ms.stream_tag); + ret =snd_sof_dma_trace_init (sdev, ¶ms);if (ret <0 ) {dev_err (sdev->dev,"error: fail in snd_sof_dma_trace_init %d\n" , ret);
Signature · 1 line
2.35.0
Mark Brown
maintainerQuoted 10 lines · Peter Ujfalusi
the DMA trace implementation on AMD platform assumes that the
stream_tagpointer is pointing thestream_tagmember of structsof_ipc_dma_trace_params_ext, which is true at the moment, but it can not be guarantied and a change in the dtrace core can cause out of bound accesses for AMD.For this reason, change the API to pass the struct itself which will remove the assumption and makes it clear from both sides what is expected to be sent via the parameter list.
[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/2] ASoC: SOF: intel: hda-trace: Pass the dma buffer pointer to hda_dsp_trace_prepare
commit: 91e716b2a4f997cafb017c04351c2751fc820637
[2/2] ASoC: SOF: dma-trace: Pass pointer to params_ext struct in trace_init()
commit: bab05b508ebfde32a14880696a13820d54510fcbAll being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark