ASoC: SOF: use common code for DSP core pm
Subsystems (3)
Kai Vehmanen
reviewercover ASoC: SOF: use common code for DSP core pm
Series to refactor the DSP core management:
- move tracking of powered up DSP cores to common SOF code
- add logic filter unnecessary power actions
- modify existing implementations to use common code whenever DSP cores are powered, so the state in common code stays in sync
Bard Liao (5):
ASoC: SOF: Intel: hda: use snd_sof_dsp_core_power_up/down API
ASoC: SOF: Intel: hda-loader: keep init cores alive
ASoC: SOF: update dsp core power status in common APIs
ASoC: SOF: Filter out unneeded core power up/downs
ASoC: SOF: intel: hda-loader: use snd_sof_dsp_core_power_down/up APIs
sound/soc/sof/intel/hda-dsp.c | 2 +- sound/soc/sof/intel/hda-loader.c | 9 +++++---- sound/soc/sof/intel/hda.c | 2 +- sound/soc/sof/loader.c | 6 ------ sound/soc/sof/ops.h | 24 ++++++++++++++++++------ sound/soc/sof/pm.c | 1 - sound/soc/sof/topology.c | 8 -------- 7 files changed, 25 insertions(+), 27 deletions(-)
base-commit: e32df142359fb6f4d27977b7652549f0844aa62f
Signature · 1 line
2.29.2
Kai Vehmanen
reviewerPATCH 1/5 ASoC: SOF: Intel: hda: use snd_sof_dsp_core_power_up/down API
From: Bard Liao <[email protected]>
To implement common logic in SOF core, core power up/down flows should use common SOF API and not directly use low-level platform specific helper functions.
--- sound/soc/sof/intel/hda-dsp.c | 2 +- sound/soc/sof/intel/hda-loader.c | 2 +- sound/soc/sof/intel/hda.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
sound/soc/sof/intel/hda-dsp.c +1 -1
@@ -624,7 +624,7 @@ static int hda_suspend(struct snd_sof_dev *sdev, bool runtime_suspend)#endif /* power down DSP */ - ret =hda_dsp_core_reset_power_down (sdev, chip->host_managed_cores_mask); + ret =snd_sof_dsp_core_power_down (sdev, chip->host_managed_cores_mask);if (ret <0 ) {dev_err (sdev->dev,"error: failed to power down core during suspend\n" );
sound/soc/sof/intel/hda-loader.c +1 -1
@@ -183,7 +183,7 @@ static int cl_dsp_init(struct snd_sof_dev *sdev, int stream_tag) flags |=SOF_DBG_DUMP_FORCE_ERR_LEVEL ;hda_dsp_dump (sdev, flags); -hda_dsp_core_reset_power_down (sdev, chip->host_managed_cores_mask); +snd_sof_dsp_core_power_down (sdev, chip->host_managed_cores_mask);return ret; }
sound/soc/sof/intel/hda.c +1 -1
@@ -928,7 +928,7 @@ int hda_dsp_remove(struct snd_sof_dev *sdev)/* disable cores */ if (chip) -hda_dsp_core_reset_power_down (sdev, chip->host_managed_cores_mask); +snd_sof_dsp_core_power_down (sdev, chip->host_managed_cores_mask);/* disable DSP */ snd_sof_dsp_update_bits(sdev, HDA_DSP_PP_BAR, SOF_HDA_REG_PP_PPCTL,
Signature · 1 line
2.29.2
Kai Vehmanen
reviewerPATCH 2/5 ASoC: SOF: Intel: hda-loader: keep init cores alive
In reply to Kai VehmanenFrom: Bard Liao <[email protected]>
init_core_mask should be the available cores mask after fw boot. So we should keep not core 0 but init cores alive.
--- sound/soc/sof/intel/hda-loader.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
sound/soc/sof/intel/hda-loader.c +3 -2
@@ -147,8 +147,9 @@ static int cl_dsp_init(struct snd_sof_dev *sdev, int stream_tag) chip->ipc_ack_mask, chip->ipc_ack_mask); -/* step 5: power down corex */ - ret =hda_dsp_core_power_down (sdev, chip->host_managed_cores_mask & ~(BIT (0 ))); +/* step 5: power down cores that are no longer needed */ + ret =hda_dsp_core_power_down (sdev, chip->host_managed_cores_mask & + ~(chip->init_core_mask));if (ret <0 ) {if (hda->boot_iteration ==HDA_FW_BOOT_ATTEMPTS ) dev_err(sdev->dev,
Signature · 1 line
2.29.2
Kai Vehmanen
reviewerPATCH 3/5 ASoC: SOF: update dsp core power status in common APIs
In reply to Kai VehmanenFrom: Bard Liao <[email protected]>
Only manage enabled_cores_mask in common snd_sof_dsp_core_power_up/down APIs to ensure it stays in sync with actual DSP core state.
--- sound/soc/sof/loader.c | 6 ------ sound/soc/sof/ops.h | 22 ++++++++++++++++------ sound/soc/sof/pm.c | 1 - sound/soc/sof/topology.c | 8 -------- 4 files changed, 16 insertions(+), 21 deletions(-)
sound/soc/sof/loader.c +0 -6
@@ -811,7 +811,6 @@ EXPORT_SYMBOL(snd_sof_load_firmware);int snd_sof_run_firmware (struct snd_sof_dev *sdev) {int ret; -int init_core_mask;init_waitqueue_head (&sdev->boot_wait);
@@ -843,8 +842,6 @@ int snd_sof_run_firmware(struct snd_sof_dev *sdev)return ret; } - init_core_mask = ret; -/* * now wait for the DSP to boot. There are 3 possible outcomes: * 1. Boot wait times out indicating FW boot failure.
@@ -874,9 +871,6 @@ int snd_sof_run_firmware(struct snd_sof_dev *sdev)return ret; } -/* fw boot is complete. Update the active cores mask */ - sdev->enabled_cores_mask = init_core_mask; -return 0 ; }EXPORT_SYMBOL (snd_sof_run_firmware);
sound/soc/sof/ops.h +16 -6
@@ -76,19 +76,29 @@ static inline int snd_sof_dsp_reset(struct snd_sof_dev *sdev)static inline int snd_sof_dsp_core_power_up (struct snd_sof_dev *sdev,unsigned int core_mask) { -if (sof_ops (sdev)->core_power_up) -return sof_ops (sdev)->core_power_up (sdev, core_mask); +int ret =0 ; -return 0 ; +if (sof_ops (sdev)->core_power_up) { + ret =sof_ops (sdev)->core_power_up (sdev, core_mask); +if (!ret) + sdev->enabled_cores_mask |= core_mask; + } + +return ret; }static inline int snd_sof_dsp_core_power_down (struct snd_sof_dev *sdev,unsigned int core_mask) { -if (sof_ops (sdev)->core_power_down) -return sof_ops (sdev)->core_power_down (sdev, core_mask); +int ret =0 ; -return 0 ; +if (sof_ops (sdev)->core_power_down) { + ret =sof_ops (sdev)->core_power_down (sdev, core_mask); +if (!ret) + sdev->enabled_cores_mask &= ~core_mask; + } + +return ret; }/* pre/post fw load */
sound/soc/sof/pm.c +0 -1
@@ -256,7 +256,6 @@ static int sof_suspend(struct device *dev, bool runtime_suspend)/* reset FW state */ sdev->fw_state =SOF_FW_BOOT_NOT_STARTED ; - sdev->enabled_cores_mask =0 ;return ret; }
sound/soc/sof/topology.c +0 -8
@@ -1352,10 +1352,6 @@ static int sof_core_enable(struct snd_sof_dev *sdev, int core) core, ret); goto err; } - -/* update enabled cores mask */ - sdev->enabled_cores_mask |=BIT (core); -return ret; err:/* power down core if it is host managed and return the original error if this fails too */
@@ -2603,10 +2599,6 @@ static int sof_widget_unload(struct snd_soc_component *scomp,if (ret <0 )dev_err (scomp->dev,"error: powering down pipeline schedule core %d\n" , pipeline->core); - -/* update enabled cores mask */ - sdev->enabled_cores_mask &= ~(1 << pipeline->core); -break ;default :break ;
Signature · 1 line
2.29.2
Kai Vehmanen
reviewerPATCH 4/5 ASoC: SOF: Filter out unneeded core power up/downs
In reply to Kai VehmanenFrom: Bard Liao <[email protected]>
Exclude cores that are already powered on/off correctly. This allows to simplify dsp_power_up/down() implementations and avoid unexpected error.
--- sound/soc/sof/ops.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
sound/soc/sof/ops.h +4 -2
@@ -78,7 +78,8 @@ static inline int snd_sof_dsp_core_power_up(struct snd_sof_dev *sdev, {int ret =0 ; -if (sof_ops (sdev)->core_power_up) { + core_mask &= ~sdev->enabled_cores_mask; +if (sof_ops (sdev)->core_power_up && core_mask) { ret =sof_ops (sdev)->core_power_up (sdev, core_mask);if (!ret) sdev->enabled_cores_mask |= core_mask;
@@ -92,7 +93,8 @@ static inline int snd_sof_dsp_core_power_down(struct snd_sof_dev *sdev, {int ret =0 ; -if (sof_ops (sdev)->core_power_down) { + core_mask &= sdev->enabled_cores_mask; +if (sof_ops (sdev)->core_power_down && core_mask) { ret =sof_ops (sdev)->core_power_down (sdev, core_mask);if (!ret) sdev->enabled_cores_mask &= ~core_mask;
Signature · 1 line
2.29.2
Kai Vehmanen
reviewerPATCH 5/5 ASoC: SOF: intel: hda-loader: use snd_sof_dsp_core_power_down/up APIs
In reply to Kai VehmanenFrom: Bard Liao <[email protected]>
To manage enabled_cores_mask flag, we should always use snd_sof_dsp_ core_power_down/up APIs to power up/down dsp cores. The APIs do a little bit more than the original functions, but it is harmless.
--- sound/soc/sof/intel/hda-loader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/soc/sof/intel/hda-loader.c +3 -3
@@ -93,7 +93,7 @@ static int cl_dsp_init(struct snd_sof_dev *sdev, int stream_tag)int i;/* step 1: power up corex */ - ret =hda_dsp_core_power_up (sdev, chip->host_managed_cores_mask); + ret =snd_sof_dsp_core_power_up (sdev, chip->host_managed_cores_mask);if (ret <0 ) {if (hda->boot_iteration ==HDA_FW_BOOT_ATTEMPTS )dev_err (sdev->dev,"error: dsp core 0/1 power up failed\n" );
@@ -148,8 +148,8 @@ static int cl_dsp_init(struct snd_sof_dev *sdev, int stream_tag) chip->ipc_ack_mask);/* step 5: power down cores that are no longer needed */ - ret =hda_dsp_core_power_down (sdev, chip->host_managed_cores_mask & - ~(chip->init_core_mask)); + ret =snd_sof_dsp_core_power_down (sdev, chip->host_managed_cores_mask & + ~(chip->init_core_mask));if (ret <0 ) {if (hda->boot_iteration ==HDA_FW_BOOT_ATTEMPTS ) dev_err(sdev->dev,
Signature · 1 line
2.29.2
Mark Brown
maintainerQuoted 8 lines · Kai Vehmanen
Series to refactor the DSP core management:
- move tracking of powered up DSP cores to common SOF code
- add logic filter unnecessary power actions
- modify existing implementations to use common code whenever DSP cores are powered, so the state in common code stays in sync[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/5] ASoC: SOF: Intel: hda: use snd_sof_dsp_core_power_up/down API
commit: f6c246eacb62977dea5c9c65ac6fb4921cad5bcd
[2/5] ASoC: SOF: Intel: hda-loader: keep init cores alive
commit: cedd502d18b5b7a913fa13fa18a037cc51b1798d
[3/5] ASoC: SOF: update dsp core power status in common APIs
commit: 42077f08b3f1ba891dca1f8f479810f16b7d6cbd
[4/5] ASoC: SOF: Filter out unneeded core power up/downs
commit: 30876e2a06f35b525dc71f94dfc3c6f329e55a28
[5/5] ASoC: SOF: intel: hda-loader: use snd_sof_dsp_core_power_down/up APIs
commit: 92c6ec606cd12c16091b70442da536bdeddb1f7fAll 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