ASoC: Intel: catpt: Round of fixes and PM changes
Subsystems (3)
Cezary Rojewski
maintainerv3 cover ASoC: Intel: catpt: Round of fixes and PM changes
Set of changes addressing gaps in DRAM offset checks, error paths and PM.
Three fixes lead the way, all straight-forward. Followed up by a small refactor to replace manual arithmetic with resource_xxx() API. The last two relate to the power management.
The standing out PM change is removal of the catpt-driver as a system-suspend (S3) blocker. This is a suggestion from Andy as indeed, audio is not a critical component that should prevent the system from going into S3. Whatever happens, the driver can recover on a follow up resume (S3 -> S0).
All points below suggested by Andy.
Changes in v3:
- reordered the patches so that all 3 fixes are at the start of the patchset and added missing 'Fixes:' tag
- small spacing adjustments in patch 2/6
Changes in v2:
- removed the last patch from v1 "ASoC: Intel: catpt: Drop catpt_runtime_resume()"
- added new patch "ASoC: Intel: catpt: Switch to resource_xxx() API" which refactors existing code that manupulates .start, .end and size of resources to publicly available interface
- patches 1/6 and 3/6 have had their message justified to improve readability
Cezary Rojewski (6):
ASoC: Intel: catpt: Fix error path in hw_params()
ASoC: Intel: catpt: Fix probing order of driver components
ASoC: Intel: catpt: Fix offset checks
ASoC: Intel: catpt: Switch to resource_xxx() API
ASoC: Intel: catpt: Do not ignore errors on runtime resume
ASoC: Intel: catpt: Do not block the system from suspending
sound/soc/intel/catpt/device.c | 26 ++++++++++++++++++-------- sound/soc/intel/catpt/loader.c | 19 ++++++++++--------- sound/soc/intel/catpt/pcm.c | 16 +++++++++------- sound/soc/intel/catpt/sysfs.c | 2 +- 4 files changed, 38 insertions(+), 25 deletions(-)
Signature · 1 line
2.25.1
Cezary Rojewski
maintainerPATCH v3 1/6 ASoC: Intel: catpt: Fix error path in hw_params()
Do not leave any resources hanging on the DSP side if applying user settings fails.
--- sound/soc/intel/catpt/pcm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/soc/intel/catpt/pcm.c +3 -1
@@ -417,8 +417,10 @@ static int catpt_dai_hw_params(struct snd_pcm_substream *substream,return CATPT_IPC_ERROR (ret); ret =catpt_dai_apply_usettings (dai, stream); -if (ret) +if (ret) { +catpt_ipc_free_stream (cdev, stream->info.stream_hw_id);return ret; + } stream->allocated = true;return 0 ;
Signature · 1 line
2.25.1
Cezary Rojewski
maintainerPATCH v3 2/6 ASoC: Intel: catpt: Fix probing order of driver components
In reply to Cezary Rojewskicatpt_dai_pcm_new() is called during the bring up sequence of the machine board device which is a different device to the parent (DSP) device yet utilizes pm_runtime_xxx() against it in order to send IPCs. If the parent's pm_runtime is not configured before that happens, errors will occur.
--- sound/soc/intel/catpt/device.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
sound/soc/intel/catpt/device.c +9 -6
@@ -184,22 +184,25 @@ static int catpt_probe_components(struct catpt_dev *cdev) goto err_boot_fw; } - ret =catpt_register_board (cdev); -if (ret) { -dev_err (cdev->dev,"register board failed: %d\n" , ret); - goto err_reg_board; - } -/* reflect actual ADSP state in pm_runtime */ pm_runtime_set_active (cdev->dev);pm_runtime_set_autosuspend_delay (cdev->dev,2000 );pm_runtime_use_autosuspend (cdev->dev);pm_runtime_mark_last_busy (cdev->dev); +/* Enable PM before spawning child device. See catpt_dai_pcm_new(). */ pm_runtime_enable (cdev->dev); + + ret =catpt_register_board (cdev); +if (ret) { +dev_err (cdev->dev,"register board failed: %d\n" , ret); + goto err_reg_board; + } +return 0 ; err_reg_board: +pm_runtime_disable (cdev->dev);snd_soc_unregister_component (cdev->dev); err_boot_fw:catpt_dmac_remove (cdev);
Signature · 1 line
2.25.1
Cezary Rojewski
maintainerPATCH v3 3/6 ASoC: Intel: catpt: Fix offset checks
In reply to Cezary RojewskiVerify if the entire block is found within DRAM, not just the start of it.
--- sound/soc/intel/catpt/loader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
sound/soc/intel/catpt/loader.c +4 -4
@@ -216,7 +216,7 @@ static int catpt_restore_memdumps(struct catpt_dev *cdev, struct dma_chan *chan)continue ; off =catpt_to_host_offset (info->offset); -if (off < cdev->dram.start || off > cdev->dram.end) +if (off < cdev->dram.start || off + info->size >= cdev->dram.end)continue ; dev_dbg(cdev->dev, "restoring memdump: off 0x%08x size %d\n",
@@ -261,12 +261,12 @@ static int catpt_restore_fwimage(struct catpt_dev *cdev,continue ; off =catpt_to_host_offset (info->offset); -if (off < cdev->dram.start || off > cdev->dram.end) -continue ; - r2.start = off; r2.end = r2.start + info->size -1 ; +if (r2.start < cdev->dram.start || r2.end > cdev->dram.end) +continue ; +if (!resource_intersection (&r2, &r1, &common))continue ;/* calculate start offset of common data area */
Signature · 1 line
2.25.1
Cezary Rojewski
maintainerPATCH v3 4/6 ASoC: Intel: catpt: Switch to resource_xxx() API
In reply to Cezary RojewskiThere is a number of interfaces available for manipulating instances of struct resource. To improve readability, move away from manual editing in favor of the common interface.
While at it, adjust spacing so that both code blocks, while found in separate functions, looks cohesive.
--- sound/soc/intel/catpt/loader.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
sound/soc/intel/catpt/loader.c +10 -9
@@ -208,6 +208,7 @@ static int catpt_restore_memdumps(struct catpt_dev *cdev, struct dma_chan *chan)for (i =0 ; i < cdev->dx_ctx.num_meminfo; i++) {struct catpt_save_meminfo *info; +struct resource r = {};u32 off;int ret;
@@ -216,7 +217,8 @@ static int catpt_restore_memdumps(struct catpt_dev *cdev, struct dma_chan *chan)continue ; off =catpt_to_host_offset (info->offset); -if (off < cdev->dram.start || off + info->size >= cdev->dram.end) +resource_set_range (&r, off, info->size); +if (!resource_contains (&cdev->dram, &r))continue ; dev_dbg(cdev->dev, "restoring memdump: off 0x%08x size %d\n",
@@ -239,32 +241,31 @@ static int catpt_restore_fwimage(struct catpt_dev *cdev, struct dma_chan *chan, dma_addr_t paddr, struct catpt_fw_block_hdr *blk) { - struct resource r1, r2, common; + struct resource r1 = {};int i;print_hex_dump_debug (__func__,DUMP_PREFIX_OFFSET ,8 ,4 , blk,sizeof (*blk), false); - r1.start = cdev->dram.start + blk->ram_offset; - r1.end = r1.start + blk->size -1 ; +resource_set_range (&r1, cdev->dram.start + blk->ram_offset, blk->size); +/* advance to data area */ paddr +=sizeof (*blk);for (i =0 ; i < cdev->dx_ctx.num_meminfo; i++) {struct catpt_save_meminfo *info; +struct resource common = {}; +struct resource r2 = {};u32 off;int ret; info = &cdev->dx_ctx.meminfo[i]; -if (info->source !=CATPT_DX_TYPE_FW_IMAGE )continue ; off =catpt_to_host_offset (info->offset); - r2.start = off; - r2.end = r2.start + info->size -1 ; - -if (r2.start < cdev->dram.start || r2.end > cdev->dram.end) +resource_set_range (&r2, off, info->size); +if (!resource_contains (&cdev->dram, &r2))continue ;if (!resource_intersection (&r2, &r1, &common))
Signature · 1 line
2.25.1
Cezary Rojewski
maintainerPATCH v3 5/6 ASoC: Intel: catpt: Do not ignore errors on runtime resume
In reply to Cezary RojewskiIf pm_runtime_resume_and_get() fails, follow up pm_runtime_xxx() operate on device in erroneous state.
--- sound/soc/intel/catpt/pcm.c | 12 ++++++------ sound/soc/intel/catpt/sysfs.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-)
sound/soc/intel/catpt/pcm.c +6 -6
@@ -671,7 +671,7 @@ static int catpt_dai_pcm_new(struct snd_soc_pcm_runtime *rtm,return 0 ; ret =pm_runtime_resume_and_get (cdev->dev); -if (ret <0 && ret != -EACCES ) +if (ret)return ret; ret =catpt_ipc_set_device_format (cdev, &devfmt);
@@ -874,7 +874,7 @@ static int catpt_mixer_volume_get(struct snd_kcontrol *kcontrol,int i; ret =pm_runtime_resume_and_get (cdev->dev); -if (ret <0 && ret != -EACCES ) +if (ret)return ret;for (i =0 ; i <CATPT_CHANNELS_MAX ; i++) {
@@ -895,7 +895,7 @@ static int catpt_mixer_volume_put(struct snd_kcontrol *kcontrol,int ret; ret =pm_runtime_resume_and_get (cdev->dev); -if (ret <0 && ret != -EACCES ) +if (ret)return ret; ret = catpt_set_dspvol(cdev, cdev->mixer.mixer_hw_id,
@@ -926,7 +926,7 @@ static int catpt_stream_volume_get(struct snd_kcontrol *kcontrol, } ret =pm_runtime_resume_and_get (cdev->dev); -if (ret <0 && ret != -EACCES ) +if (ret)return ret;for (i =0 ; i <CATPT_CHANNELS_MAX ; i++) {
@@ -957,7 +957,7 @@ static int catpt_stream_volume_put(struct snd_kcontrol *kcontrol, } ret =pm_runtime_resume_and_get (cdev->dev); -if (ret <0 && ret != -EACCES ) +if (ret)return ret; ret = catpt_set_dspvol(cdev, stream->info.stream_hw_id,
@@ -1033,7 +1033,7 @@ static int catpt_loopback_switch_put(struct snd_kcontrol *kcontrol, } ret =pm_runtime_resume_and_get (cdev->dev); -if (ret <0 && ret != -EACCES ) +if (ret)return ret; ret =catpt_ipc_mute_loopback (cdev, stream->info.stream_hw_id, mute);
sound/soc/intel/catpt/sysfs.c +1 -1
@@ -16,7 +16,7 @@ static ssize_t fw_version_show(struct device *dev,int ret; ret =pm_runtime_resume_and_get (cdev->dev); -if (ret <0 && ret != -EACCES ) +if (ret)return ret; ret =catpt_ipc_get_fw_version (cdev, &version);
Signature · 1 line
2.25.1
Cezary Rojewski
maintainerPATCH v3 6/6 ASoC: Intel: catpt: Do not block the system from suspending
In reply to Cezary RojewskiEven if something goes wrong when performing suspend on DSP, from the system perspective the component is not critical enough to block the suspend operation entirely. Leaving recovery to next resume() suffices.
--- sound/soc/intel/catpt/device.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
sound/soc/intel/catpt/device.c +9 -2
@@ -28,7 +28,7 @@#define CREATE_TRACE_POINTS #include "trace.h" -static int catpt_suspend (struct device *dev) +static int catpt_do_suspend (struct device *dev) {struct catpt_dev *cdev =dev_get_drvdata (dev);struct dma_chan *chan;
@@ -72,6 +72,13 @@ static int catpt_suspend(struct device *dev)return catpt_dsp_power_down (cdev); } +/* Do not block the system from suspending, recover on resume() if needed. */ +static int catpt_suspend (struct device *dev) +{ +catpt_do_suspend (dev); +return 0 ; +} +static int catpt_resume (struct device *dev) {struct catpt_dev *cdev =dev_get_drvdata (dev);
@@ -114,7 +121,7 @@ static int catpt_runtime_suspend(struct device *dev) }module_put (dev->driver->owner); -return catpt_suspend (dev); +return catpt_do_suspend (dev); }static int catpt_runtime_resume (struct device *dev)
Signature · 1 line
2.25.1
Quoted 7 lines · Cezary Rojewski
Set of changes addressing gaps in DRAM offset checks, error paths and PM.
Three fixes lead the way, all straight-forward. Followed up by a small refactor to replace manual arithmetic with
resource_xxx()API. The last two relate to the power management.
Quoted 5 lines
The standing out PM change is removal of the catpt-driver as a system-suspend (S3) blocker. This is a suggestion from Andy as indeed, audio is not a critical component that should prevent the system from going into S3. Whatever happens, the driver can recover on a follow up resume (S3 -> S0).
v2 had been applied AFAICS.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Mark Brown
maintainerQuoted 9 lines · Andy Shevchenko
Quoted 5 lines · Cezary Rojewski
The standing out PM change is removal of the catpt-driver as a system-suspend (S3) blocker. This is a suggestion from Andy as indeed, audio is not a critical component that should prevent the system from going into S3. Whatever happens, the driver can recover on a follow up resume (S3 -> S0).
v2 had been applied AFAICS.
Yes, it was.
Cezary Rojewski
maintainerQuoted 9 lines · Mark Brown
Quoted 7 lines · Andy Shevchenko
Quoted 5 lines · Cezary Rojewski
The standing out PM change is removal of the catpt-driver as a system-suspend (S3) blocker. This is a suggestion from Andy as indeed, audio is not a critical component that should prevent the system from going into S3. Whatever happens, the driver can recover on a follow up resume (S3 -> S0).
Quoted 3 lines
Quoted 1 line
v2 had been applied AFAICS.
Yes, it was.
Sorry for the spam then, didn't notice. Nothing major has been changed in v3 so it can be ignored.