ASoC: Intel: avs: PCM power management
Subsystems (3)
Cezary Rojewski
maintainerv4 cover ASoC: Intel: avs: PCM power management
Goal of the series is implementation of suspend/resume operations for a PCM stream along with all the collaterals connected to the subject.
Start with splitting avs_dai_fe_hw_free() as ideally we would like to reuse as much of existing code as possible but snd_pcm_lib_free_pages() is not desired part of the function when speaking of suspend operation.
The actual implementation of suspend/resume() for component drivers follows. For most scenarios, the PM flow is similar to standard streaming one, except for the part where the position register are being saved and the lack of PCM pages freeing. To reduce code duplication, all avs_dai_suspend_XXX() and avs_dai_resume_XXX() functions reuse their non-PM equivalents.
Order of operations is affected by the fact that path binding/unbinding happens only in FE part of the stream.
Above essentially unlocks SX+streaming scenarios i.e.: power transitions with an ongoing stream.
As some streams are allowed to run in low power state, support is provided for S0iX state. The handlers check ACPI capabilities and the number of active low-power paths before deciding between SX and S0iX flows.
The last portion of the patchset is addition of power/clock gating overrides. There is no single set of registers that ensures AudioDSP firmware loads 100% of time on every single configuration. By having them exposed, user can have the loading procedure behavior adjusted for their configuration without having to recompile the kernel.
Changes in v4:
- replaced readb_poll_timeout() with read_poll_timeout() for the DRSM polling function as the register is u32 wide, not u8
Changes in v3:
- fixed unused-but-set-variable warnings reported by the test robot
Changes in v2:
- moved DRSM reg polling to separate function, snd_hdac_stream_wait_drsm() as suggested by Pierre
- moved the acpi_gbl_FADT under AVS_S0IX_SUPPORTED macro and relocated the checks from pcm.c to topology.c so that the low-power streams are filtered as early as possible
- fixed compilation when CONFIG_ACPI is disabled as reported by the test robot
- simplified all the avs_dai_resume/suspend_xxx() by moving ->ignore_suspend check one level up, to avs_component_pm_op() (patch 0002)
Amadeusz Sławiński (1):
ASoC: Intel: avs: Handle SUSPEND and RESUME triggers
Cezary Rojewski (7):
ASoC: Intel: avs: Split pcm pages freeing operation from hw_free()
ASoC: Intel: avs: Introduce PCM power management routines
ALSA: hda: Introduce snd_hdac_stream_wait_drsm()
ASoC: Intel: avs: Restart instead of resuming HDA capture streams
ASoC: Intel: avs: Count low power streams
ASoC: Intel: avs: Power and clock gating policy overriding
ASoC: Intel: avs: Enact power gating policy
Piotr Maziarz (1):
ASoC: Intel: avs: Standby power-state support
include/sound/hdaudio.h | 1 + include/sound/hdaudio_ext.h | 5 + sound/hda/hdac_stream.c | 22 ++ sound/soc/intel/avs/avs.h | 8 + sound/soc/intel/avs/core.c | 97 +++++++-- sound/soc/intel/avs/loader.c | 10 + sound/soc/intel/avs/pcm.c | 368 +++++++++++++++++++++++++++++---- sound/soc/intel/avs/topology.c | 10 + 8 files changed, 461 insertions(+), 60 deletions(-)
Signature · 1 line
2.25.1
Cezary Rojewski
maintainerPATCH v4 1/9 ASoC: Intel: avs: Split pcm pages freeing operation from hw_free()
Prepare for introduction of PCM power management support. As freeing pages during the suspend operation is not desired, separate snd_pcm_lib_free_pages() from existing avs_dai_fe_hw_free() so that majority of the code found within it can be reused for standard and PM flows both.
--- sound/soc/intel/avs/pcm.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
sound/soc/intel/avs/pcm.c +10 -4
@@ -499,7 +499,7 @@ static int avs_dai_fe_hw_params(struct snd_pcm_substream *substream,return ret; } -static int avs_dai_fe_hw_free (struct snd_pcm_substream *substream,struct snd_soc_dai *dai) +static int __avs_dai_fe_hw_free (struct snd_pcm_substream *substream,struct snd_soc_dai *dai) {struct avs_dma_data *data;struct hdac_ext_stream *host_stream;
@@ -523,9 +523,15 @@ static int avs_dai_fe_hw_free(struct snd_pcm_substream *substream, struct snd_sosnd_hdac_stream_cleanup (hdac_stream (host_stream));hdac_stream (host_stream)->prepared = false; - ret =snd_pcm_lib_free_pages (substream); -if (ret <0 ) -dev_dbg (dai->dev,"Failed to free pages!\n" ); +return ret; +} + +static int avs_dai_fe_hw_free (struct snd_pcm_substream *substream,struct snd_soc_dai *dai) +{ +int ret; + + ret =__avs_dai_fe_hw_free (substream, dai); +snd_pcm_lib_free_pages (substream);return ret; }
Signature · 1 line
2.25.1
Cezary Rojewski
maintainerPATCH v4 2/9 ASoC: Intel: avs: Introduce PCM power management routines
In reply to Cezary RojewskiImplement suspend/resume() operations for component drivers. For most scenarios, the PM flow is similar to standard streaming one, except for the part where the position register are being saved and the lack of PCM pages freeing. To reduce code duplication, all avs_dai_suspend_XXX() and avs_dai_resume_XXX() functions reuse their non-PM equivalents.
Given that path binding/unbinding happens only in FE part of the stream, the order of suspend() goes:
1. hw_free() all FE DAIs, paths are unbound here
2. hw_free() all BE DAIs
Consequently, for resume() its:
1. hw_params() all BE DAIs
2. hw_params() all FE DAIs, paths are bound here
3. prepare() all BE DAIs
4. prepare() all FE DAIs
As component->suspend/resume() do not provide substream pointer, store it ourselves so that the PM flow has all the necessary information to proceed.
---
Changes in v3:
- fixed unused-but-set-variable warnings reported by the test robot
Changes in v2:
- moved DRSM reg polling to separate function, snd_hdac_stream_wait_drsm() as suggested by Pierre
- moved the acpi_gbl_FADT under AVS_S0IX_SUPPORTED macro and relocated the checks from pcm.c to topology.c so that the low-power streams are filtered as early as possible
- simplified all the avs_dai_resume/suspend_xxx() by moving ->ignore_suspend check one level up, to avs_component_pm_op() (patch 0002)
include/sound/hdaudio_ext.h | 5 + sound/soc/intel/avs/pcm.c | 214 +++++++++++++++++++++++++++++++++++- 2 files changed, 215 insertions(+), 4 deletions(-)
include/sound/hdaudio_ext.h +5 -0
@@ -51,6 +51,11 @@ struct hdac_ext_stream {void __iomem *pphc_addr;void __iomem *pplc_addr; +u32 pphcllpl; +u32 pphcllpu; +u32 pphcldpl; +u32 pphcldpu; + bool decoupled:1; bool link_locked:1;bool link_prepared;
sound/soc/intel/avs/pcm.c +210 -4
278 lines not on this page · raw message
Signature · 1 line
2.25.1
Cezary Rojewski
maintainerPATCH v4 3/9 ALSA: hda: Introduce snd_hdac_stream_wait_drsm()
In reply to Cezary RojewskiAllow for waiting for DRSM bit for specified stream to be cleared from HDAudio library level. Drivers may utilize this optional step during the stream resume procedure.
---
Changes in v4:
- replaced readb_poll_timeout() with read_poll_timeout() for the DRSM polling function as the register is u32 wide, not u8
include/sound/hdaudio.h | 1 + sound/hda/hdac_stream.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+)
include/sound/hdaudio.h +1 -0
@@ -597,6 +597,7 @@ int snd_hdac_stream_get_spbmaxfifo(struct hdac_bus *bus, struct hdac_stream *azx_dev);void snd_hdac_stream_drsm_enable (struct hdac_bus *bus,bool enable,int index); +int snd_hdac_stream_wait_drsm (struct hdac_stream *azx_dev);int snd_hdac_stream_set_dpibr (struct hdac_bus *bus,struct hdac_stream *azx_dev,u32 value);int snd_hdac_stream_set_lpib (struct hdac_stream *azx_dev,u32 value);
sound/hda/hdac_stream.c +22 -0
@@ -821,6 +821,28 @@ void snd_hdac_stream_drsm_enable(struct hdac_bus *bus, }EXPORT_SYMBOL_GPL (snd_hdac_stream_drsm_enable); +/* +* snd_hdac_stream_wait_drsm - wait for HW to clear RSM for a stream +* @azx_dev: HD-audio core stream to await RSM for +* +* Returns 0 on success and -ETIMEDOUT upon a timeout. +*/ +int snd_hdac_stream_wait_drsm (struct hdac_stream *azx_dev) +{ +struct hdac_bus *bus = azx_dev->bus; +u32 mask, reg; +int ret; + + mask =1 << azx_dev->index; + + ret =read_poll_timeout (snd_hdac_reg_readl, reg, !(reg & mask),250 ,2000 , false, bus, + bus->drsmcap +AZX_REG_DRSM_CTL ); +if (ret) +dev_dbg (bus->dev,"polling RSM 0x%08x failed: %d\n" , mask, ret); +return ret; +} +EXPORT_SYMBOL_GPL (snd_hdac_stream_wait_drsm); +/** * snd_hdac_stream_set_dpibr - sets the dpibr value of a stream * @bus: HD-audio core bus
Signature · 1 line
2.25.1
Re: [PATCH v4 3/9] ALSA: hda: Introduce snd_hdac_stream_wait_drsm()
Quoted 5 lines · Cezary Rojewski
Allow for waiting for DRSM bit for specified stream to be cleared from HDAudio library level. Drivers may utilize this optional step during the stream resume procedure.
Quoted 7 lines
Suggested-by Pierre-Louis Bossart <[email protected]>Signed-off-by Cezary Rojewski <[email protected]>---
Changes in v4:
- replacedreadb_poll_timeout()withread_poll_timeout()for the DRSM polling function as the register is u32 wide, not u8
thanks,
Takashi
Cezary Rojewski
maintainerPATCH v4 4/9 ASoC: Intel: avs: Handle SUSPEND and RESUME triggers
In reply to Cezary RojewskiFrom: Amadeusz Sławiński <[email protected]>
With power management operations added, service SUSPEND and RESUME trigger commands for running streams.
--- sound/soc/intel/avs/pcm.c | 75 +++++++++++++++++++++++++++++++-------- 1 file changed, 60 insertions(+), 15 deletions(-)
sound/soc/intel/avs/pcm.c +60 -15
@@ -208,30 +208,43 @@ static int avs_dai_nonhda_be_prepare(struct snd_pcm_substream *substream, structstatic int avs_dai_nonhda_be_trigger (struct snd_pcm_substream *substream,int cmd,struct snd_soc_dai *dai) { +struct snd_soc_pcm_runtime *rtd =snd_pcm_substream_chip (substream);struct avs_dma_data *data;int ret =0 ; data =snd_soc_dai_get_dma_data (dai, substream);switch (cmd) { +case SNDRV_PCM_TRIGGER_RESUME : +if (rtd->dai_link->ignore_suspend) +break ; + fallthrough;case SNDRV_PCM_TRIGGER_START :case SNDRV_PCM_TRIGGER_PAUSE_RELEASE : + ret =avs_path_pause (data->path); +if (ret <0 ) { +dev_err (dai->dev,"pause BE path failed: %d\n" , ret); +break ; + } + ret =avs_path_run (data->path,AVS_TPLG_TRIGGER_AUTO );if (ret <0 )dev_err (dai->dev,"run BE path failed: %d\n" , ret);break ; +case SNDRV_PCM_TRIGGER_SUSPEND : +if (rtd->dai_link->ignore_suspend) +break ; + fallthrough;case SNDRV_PCM_TRIGGER_PAUSE_PUSH :case SNDRV_PCM_TRIGGER_STOP : ret =avs_path_pause (data->path);if (ret <0 )dev_err (dai->dev,"pause BE path failed: %d\n" , ret); -if (cmd ==SNDRV_PCM_TRIGGER_STOP ) { - ret =avs_path_reset (data->path); -if (ret <0 ) -dev_err (dai->dev,"reset BE path failed: %d\n" , ret); - } + ret =avs_path_reset (data->path); +if (ret <0 ) +dev_err (dai->dev,"reset BE path failed: %d\n" , ret);break ;default :
@@ -351,6 +364,7 @@ static int avs_dai_hda_be_prepare(struct snd_pcm_substream *substream, struct snstatic int avs_dai_hda_be_trigger (struct snd_pcm_substream *substream,int cmd,struct snd_soc_dai *dai) { +struct snd_soc_pcm_runtime *rtd =snd_pcm_substream_chip (substream);struct hdac_ext_stream *link_stream;struct avs_dma_data *data;int ret =0 ;
@@ -361,15 +375,29 @@ static int avs_dai_hda_be_trigger(struct snd_pcm_substream *substream, int cmd, link_stream = substream->runtime->private_data;switch (cmd) { +case SNDRV_PCM_TRIGGER_RESUME : +if (rtd->dai_link->ignore_suspend) +break ; + fallthrough;case SNDRV_PCM_TRIGGER_START :case SNDRV_PCM_TRIGGER_PAUSE_RELEASE :snd_hdac_ext_stream_start (link_stream); + ret =avs_path_pause (data->path); +if (ret <0 ) { +dev_err (dai->dev,"pause BE path failed: %d\n" , ret); +break ; + } + ret =avs_path_run (data->path,AVS_TPLG_TRIGGER_AUTO );if (ret <0 )dev_err (dai->dev,"run BE path failed: %d\n" , ret);break ; +case SNDRV_PCM_TRIGGER_SUSPEND : +if (rtd->dai_link->ignore_suspend) +break ; + fallthrough;case SNDRV_PCM_TRIGGER_PAUSE_PUSH :case SNDRV_PCM_TRIGGER_STOP : ret =avs_path_pause (data->path);
@@ -378,11 +406,9 @@ static int avs_dai_hda_be_trigger(struct snd_pcm_substream *substream, int cmd,snd_hdac_ext_stream_clear (link_stream); -if (cmd ==SNDRV_PCM_TRIGGER_STOP ) { - ret =avs_path_reset (data->path); -if (ret <0 ) -dev_err (dai->dev,"reset BE path failed: %d\n" , ret); - } + ret =avs_path_reset (data->path); +if (ret <0 ) +dev_err (dai->dev,"reset BE path failed: %d\n" , ret);break ;default :
@@ -587,6 +613,7 @@ static int avs_dai_fe_prepare(struct snd_pcm_substream *substream, struct snd_sostatic int avs_dai_fe_trigger (struct snd_pcm_substream *substream,int cmd,struct snd_soc_dai *dai) { +struct snd_soc_pcm_runtime *rtd =snd_pcm_substream_chip (substream);struct avs_dma_data *data;struct hdac_ext_stream *host_stream;struct hdac_bus *bus;
@@ -598,17 +625,36 @@ static int avs_dai_fe_trigger(struct snd_pcm_substream *substream, int cmd, stru bus =hdac_stream (host_stream)->bus;switch (cmd) { +case SNDRV_PCM_TRIGGER_RESUME : +if (rtd->dai_link->ignore_suspend) +break ; + fallthrough;case SNDRV_PCM_TRIGGER_START :case SNDRV_PCM_TRIGGER_PAUSE_RELEASE :spin_lock_irqsave (&bus->reg_lock, flags);snd_hdac_stream_start (hdac_stream (host_stream), true);spin_unlock_irqrestore (&bus->reg_lock, flags); +/* Timeout on DRSM poll shall not stop the resume so ignore the result. */ +if (cmd ==SNDRV_PCM_TRIGGER_RESUME ) +snd_hdac_stream_wait_drsm (hdac_stream (host_stream)); + + ret =avs_path_pause (data->path); +if (ret <0 ) { +dev_err (dai->dev,"pause FE path failed: %d\n" , ret); +break ; + } + ret =avs_path_run (data->path,AVS_TPLG_TRIGGER_AUTO );if (ret <0 )dev_err (dai->dev,"run FE path failed: %d\n" , ret); +break ; +case SNDRV_PCM_TRIGGER_SUSPEND : +if (rtd->dai_link->ignore_suspend) +break ; + fallthrough;case SNDRV_PCM_TRIGGER_PAUSE_PUSH :case SNDRV_PCM_TRIGGER_STOP : ret =avs_path_pause (data->path);
@@ -619,11 +665,9 @@ static int avs_dai_fe_trigger(struct snd_pcm_substream *substream, int cmd, strusnd_hdac_stream_stop (hdac_stream (host_stream));spin_unlock_irqrestore (&bus->reg_lock, flags); -if (cmd ==SNDRV_PCM_TRIGGER_STOP ) { - ret =avs_path_reset (data->path); -if (ret <0 ) -dev_err (dai->dev,"reset FE path failed: %d\n" , ret); - } + ret =avs_path_reset (data->path); +if (ret <0 ) +dev_err (dai->dev,"reset FE path failed: %d\n" , ret);break ;default :
@@ -974,6 +1018,7 @@ static int avs_component_open(struct snd_soc_component *component,SNDRV_PCM_INFO_MMAP_VALID |SNDRV_PCM_INFO_INTERLEAVED |SNDRV_PCM_INFO_PAUSE | +SNDRV_PCM_INFO_RESUME |SNDRV_PCM_INFO_NO_PERIOD_WAKEUP ; hwparams.formats = SNDRV_PCM_FMTBIT_S16_LE |
Signature · 1 line
2.25.1
Cezary Rojewski
maintainerPATCH v4 5/9 ASoC: Intel: avs: Restart instead of resuming HDA capture streams
In reply to Cezary RojewskiResuming of capture streams for HD-Audio is unsupported so remove the relevant flag from the hardware params when assigning them during avs_component_hda_open().
--- sound/soc/intel/avs/pcm.c | 50 ++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 22 deletions(-)
sound/soc/intel/avs/pcm.c +28 -22
@@ -1004,34 +1004,34 @@ static int avs_component_resume(struct snd_soc_component *component)return avs_component_resume_prepare (component, false); } +static const struct snd_pcm_hardware avs_pcm_hardware = { + .info =SNDRV_PCM_INFO_MMAP | +SNDRV_PCM_INFO_MMAP_VALID | +SNDRV_PCM_INFO_INTERLEAVED | +SNDRV_PCM_INFO_PAUSE | +SNDRV_PCM_INFO_RESUME | +SNDRV_PCM_INFO_NO_PERIOD_WAKEUP , + .formats =SNDRV_PCM_FMTBIT_S16_LE | +SNDRV_PCM_FMTBIT_S24_LE | +SNDRV_PCM_FMTBIT_S32_LE , + .buffer_bytes_max =AZX_MAX_BUF_SIZE , + .period_bytes_min =128 , + .period_bytes_max =AZX_MAX_BUF_SIZE /2 , + .periods_min =2 , + .periods_max =AZX_MAX_FRAG , + .fifo_size =0 , +}; +static int avs_component_open (struct snd_soc_component *component,struct snd_pcm_substream *substream) {struct snd_soc_pcm_runtime *rtd =snd_pcm_substream_chip (substream); -struct snd_pcm_hardware hwparams;/* only FE DAI links are handled here */ if (rtd->dai_link->no_pcm)return 0 ; - hwparams.info =SNDRV_PCM_INFO_MMAP | -SNDRV_PCM_INFO_MMAP_VALID | -SNDRV_PCM_INFO_INTERLEAVED | -SNDRV_PCM_INFO_PAUSE | -SNDRV_PCM_INFO_RESUME | -SNDRV_PCM_INFO_NO_PERIOD_WAKEUP ; - - hwparams.formats =SNDRV_PCM_FMTBIT_S16_LE | -SNDRV_PCM_FMTBIT_S24_LE | -SNDRV_PCM_FMTBIT_S32_LE ; - hwparams.period_bytes_min =128 ; - hwparams.period_bytes_max =AZX_MAX_BUF_SIZE /2 ; - hwparams.periods_min =2 ; - hwparams.periods_max =AZX_MAX_FRAG ; - hwparams.buffer_bytes_max =AZX_MAX_BUF_SIZE ; - hwparams.fifo_size =0 ; - -return snd_soc_set_runtime_hwparams (substream, &hwparams); +return snd_soc_set_runtime_hwparams (substream, &avs_pcm_hardware); }static unsigned int avs_hda_stream_dpib_read (struct hdac_ext_stream *stream)
@@ -1375,9 +1375,15 @@ static int avs_component_hda_open(struct snd_soc_component *component,struct hdac_ext_stream *link_stream;struct hda_codec *codec; -/* only BE DAI links are handled here */ -if (!rtd->dai_link->no_pcm) -return avs_component_open (component, substream); +if (!rtd->dai_link->no_pcm) { +struct snd_pcm_hardware hwparams = avs_pcm_hardware; + +/* RESUME unsupported for de-coupled HD-Audio capture. */ +if (substream->stream ==SNDRV_PCM_STREAM_CAPTURE ) + hwparams.info &= ~SNDRV_PCM_INFO_RESUME ; + +return snd_soc_set_runtime_hwparams (substream, &hwparams); + } codec =dev_to_hda_codec (asoc_rtd_to_codec (rtd,0 )->dev); link_stream = snd_hdac_ext_stream_assign(&codec->bus->core, substream,
Signature · 1 line
2.25.1
Cezary Rojewski
maintainerPATCH v4 6/9 ASoC: Intel: avs: Count low power streams
In reply to Cezary RojewskiStreaming in S0iX differs from SX scenarios. Store the number of so-called low-power streams to be able to differentiate between the two.
--- sound/soc/intel/avs/avs.h | 1 + sound/soc/intel/avs/pcm.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+)
sound/soc/intel/avs/avs.h +1 -0
@@ -127,6 +127,7 @@ struct avs_dev {struct list_head fw_list;int *core_refs;/* reference count per core */ char **lib_names; +int num_lp_paths;struct completion fw_ready;struct work_struct probe_work;
sound/soc/intel/avs/pcm.c +15 -0
@@ -60,6 +60,8 @@ avs_dai_find_path_template(struct snd_soc_dai *dai, bool is_fe, int direction)static int avs_dai_startup (struct snd_pcm_substream *substream,struct snd_soc_dai *dai,bool is_fe,const struct snd_soc_dai_ops *ops) { +struct snd_soc_pcm_runtime *rtd =snd_pcm_substream_chip (substream); +struct avs_dev *adev =to_avs_dev (dai->dev);struct avs_tplg_path_template *template;struct avs_dma_data *data;
@@ -78,6 +80,9 @@ static int avs_dai_startup(struct snd_pcm_substream *substream, struct snd_soc_d data->template = template;snd_soc_dai_set_dma_data (dai, substream, data); +if (rtd->dai_link->ignore_suspend) + adev->num_lp_paths++; +return 0 ; }
@@ -164,8 +169,13 @@ static int avs_dai_nonhda_be_startup(struct snd_pcm_substream *substream, structstatic void avs_dai_nonhda_be_shutdown (struct snd_pcm_substream *substream,struct snd_soc_dai *dai) { +struct snd_soc_pcm_runtime *rtd =snd_pcm_substream_chip (substream); +struct avs_dev *adev =to_avs_dev (dai->dev);struct avs_dma_data *data; +if (rtd->dai_link->ignore_suspend) + adev->num_lp_paths--; + data =snd_soc_dai_get_dma_data (dai, substream);snd_soc_dai_set_dma_data (dai, substream,NULL );
@@ -479,8 +489,13 @@ static int avs_dai_fe_startup(struct snd_pcm_substream *substream, struct snd_sostatic void avs_dai_fe_shutdown (struct snd_pcm_substream *substream,struct snd_soc_dai *dai) { +struct snd_soc_pcm_runtime *rtd =snd_pcm_substream_chip (substream); +struct avs_dev *adev =to_avs_dev (dai->dev);struct avs_dma_data *data; +if (rtd->dai_link->ignore_suspend) + adev->num_lp_paths--; + data =snd_soc_dai_get_dma_data (dai, substream);snd_soc_dai_set_dma_data (dai, substream,NULL );
Signature · 1 line
2.25.1
Cezary Rojewski
maintainerPATCH v4 7/9 ASoC: Intel: avs: Standby power-state support
In reply to Cezary RojewskiFrom: Piotr Maziarz <[email protected]>
Introduce avs_suspend_standby() and avs_resume_standby() to support S0IX streaming. The AudioDSP is not shutdown during such scenario and the PCI device is armed for possible wake operation through an audio event.
As capability for a stream to be active during low power S0 is based off of ->ignore_suspend, adjust the field's value according to platform capabilities if needed.
--- sound/soc/intel/avs/avs.h | 7 ++++ sound/soc/intel/avs/core.c | 75 ++++++++++++++++++++++++++++++---- sound/soc/intel/avs/topology.c | 10 +++++ 3 files changed, 85 insertions(+), 7 deletions(-)
sound/soc/intel/avs/avs.h +7 -0
@@ -24,6 +24,13 @@ struct avs_tplg_library;struct avs_soc_component ;struct avs_ipc_msg ; +#ifdef CONFIG_ACPI +#define AVS_S0IX_SUPPORTED \ + (acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0) +#else +#define AVS_S0IX_SUPPORTED false +#endif +/* * struct avs_dsp_ops - Platform-specific DSP operations *
sound/soc/intel/avs/core.c +68 -7
117 lines not on this page · raw message
sound/soc/intel/avs/topology.c +10 -0
@@ -1405,6 +1405,11 @@ static int avs_widget_load(struct snd_soc_component *comp, int index,if (!le32_to_cpu (dw->priv.size))return 0 ; +if (w->ignore_suspend && !AVS_S0IX_SUPPORTED ) { +dev_info_once (comp->dev,"Device does not support S0IX, check BIOS settings\n" ); + w->ignore_suspend = false; + } + tplg = acomp->tplg; mach =dev_get_platdata (comp->card->dev);
@@ -1442,6 +1447,11 @@ static int avs_dai_load(struct snd_soc_component *comp, int index,static int avs_link_load (struct snd_soc_component *comp,int index,struct snd_soc_dai_link *link,struct snd_soc_tplg_link_config *cfg) { +if (link->ignore_suspend && !AVS_S0IX_SUPPORTED ) { +dev_info_once (comp->dev,"Device does not support S0IX, check BIOS settings\n" ); + link->ignore_suspend = false; + } +if (!link->no_pcm) {/* Stream control handled by IPCs. */ link->nonatomic = true;
Signature · 1 line
2.25.1
Cezary Rojewski
maintainerPATCH v4 8/9 ASoC: Intel: avs: Power and clock gating policy overriding
In reply to Cezary RojewskiProvide pgctl/cgctl_mask module parameters for overriding power and clock gating policies respectively. These help deal with rare firmware loading failures on some configurations. There're no golden masks that cover all known problems so leave the defaults as is.
While at it, update avs_hda_l1sen_enable()'s definition so it aligns with its power/clock friends.
--- sound/soc/intel/avs/core.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-)
sound/soc/intel/avs/core.c +13 -9
@@ -27,6 +27,14 @@#include "avs.h" #include "cldma.h" +static u32 pgctl_mask =AZX_PGCTL_LSRMD_MASK ; +module_param (pgctl_mask, uint,0444 ); +MODULE_PARM_DESC (pgctl_mask,"PCI PGCTL policy override" ); + +static u32 cgctl_mask =AZX_CGCTL_MISCBDCGE_MASK ; +module_param (cgctl_mask, uint,0444 ); +MODULE_PARM_DESC (cgctl_mask,"PCI CGCTL policy override" ); +static void avs_hda_update_config_dword (struct hdac_bus *bus,u32 reg,u32 mask,u32 value) {
@@ -41,19 +49,16 @@ avs_hda_update_config_dword(struct hdac_bus *bus, u32 reg, u32 mask, u32 value)void avs_hda_power_gating_enable (struct avs_dev *adev,bool enable) { -u32 value; +u32 value = enable ?0 : pgctl_mask; - value = enable ?0 :AZX_PGCTL_LSRMD_MASK ; -avs_hda_update_config_dword (&adev->base.core,AZX_PCIREG_PGCTL , -AZX_PGCTL_LSRMD_MASK , value); +avs_hda_update_config_dword (&adev->base.core,AZX_PCIREG_PGCTL , pgctl_mask, value); }static void avs_hdac_clock_gating_enable (struct hdac_bus *bus,bool enable) { -u32 value; +u32 value = enable ? cgctl_mask :0 ; - value = enable ?AZX_CGCTL_MISCBDCGE_MASK :0 ; -avs_hda_update_config_dword (bus,AZX_PCIREG_CGCTL ,AZX_CGCTL_MISCBDCGE_MASK , value); +avs_hda_update_config_dword (bus,AZX_PCIREG_CGCTL , cgctl_mask, value); }void avs_hda_clock_gating_enable (struct avs_dev *adev,bool enable)
@@ -63,9 +68,8 @@ void avs_hda_clock_gating_enable(struct avs_dev *adev, bool enable)void avs_hda_l1sen_enable (struct avs_dev *adev,bool enable) { -u32 value; +u32 value = enable ?AZX_VS_EM2_L1SEN :0 ; - value = enable ?AZX_VS_EM2_L1SEN :0 ;snd_hdac_chip_updatel (&adev->base.core,VS_EM2 ,AZX_VS_EM2_L1SEN , value); }
Signature · 1 line
2.25.1
Cezary Rojewski
maintainerPATCH v4 9/9 ASoC: Intel: avs: Enact power gating policy
In reply to Cezary RojewskiUpdate all firmware loading functions to also account for the power gating policy. As module loading routine is missing the chicken bits manipulation entirely, add the entire set there.
--- sound/soc/intel/avs/loader.c | 10 ++++++++++ sound/soc/intel/avs/pcm.c | 2 ++ 2 files changed, 12 insertions(+)
sound/soc/intel/avs/loader.c +10 -0
@@ -224,11 +224,19 @@ static int avs_cldma_load_module(struct avs_dev *adev, struct avs_module_entry *if (ret <0 )return ret; +avs_hda_power_gating_enable (adev, false); +avs_hda_clock_gating_enable (adev, false); +avs_hda_l1sen_enable (adev, false); +hda_cldma_set_data (cl, (void *)mod->data, mod->size);hda_cldma_transfer (cl,msecs_to_jiffies (AVS_CLDMA_START_DELAY_MS )); ret =avs_ipc_load_modules (adev, &mentry->module_id,1 );hda_cldma_stop (cl); +avs_hda_l1sen_enable (adev, true); +avs_hda_clock_gating_enable (adev, true); +avs_hda_power_gating_enable (adev, true); +if (ret) {dev_err (adev->dev,"load module %d failed: %d\n" , mentry->module_id, ret);avs_release_last_firmware (adev);
@@ -605,6 +613,7 @@ int avs_dsp_boot_firmware(struct avs_dev *adev, bool purge)for (i =1 ; i < adev->fw_cfg.max_libs_count; i++)memset (adev->lib_names[i],0 ,AVS_LIB_NAME_SIZE ); +avs_hda_power_gating_enable (adev, false);avs_hda_clock_gating_enable (adev, false);avs_hda_l1sen_enable (adev, false);
@@ -625,6 +634,7 @@ int avs_dsp_boot_firmware(struct avs_dev *adev, bool purge) reenable_gating:avs_hda_l1sen_enable (adev, true);avs_hda_clock_gating_enable (adev, true); +avs_hda_power_gating_enable (adev, true);if (ret <0 )return ret;
sound/soc/intel/avs/pcm.c +2 -0
@@ -737,6 +737,7 @@ static int avs_component_load_libraries(struct avs_soc_component *acomp)if (ret <0 )return ret; +avs_hda_power_gating_enable (adev, false);avs_hda_clock_gating_enable (adev, false);avs_hda_l1sen_enable (adev, false);
@@ -744,6 +745,7 @@ static int avs_component_load_libraries(struct avs_soc_component *acomp)avs_hda_l1sen_enable (adev, true);avs_hda_clock_gating_enable (adev, true); +avs_hda_power_gating_enable (adev, true);if (!ret) ret =avs_module_info_init (adev, false);
Signature · 1 line
2.25.1
Mark Brown
maintainerQuoted 8 lines · Cezary Rojewski
Goal of the series is implementation of suspend/resume operations for a PCM stream along with all the collaterals connected to the subject.
Start with splitting
avs_dai_fe_hw_free()as ideally we would like to reuse as much of existing code as possible butsnd_pcm_lib_free_pages()is not desired part of the function when speaking of suspend operation.[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/9] ASoC: Intel: avs: Split pcm pages freeing operation from hw_free()
commit: 0abfc84ba22aca05a5268128f719386648351020
[2/9] ASoC: Intel: avs: Introduce PCM power management routines
commit: 2b9a50ea845ebe95473f5b85dfcc9b806c252fac
[3/9] ALSA: hda: Introduce snd_hdac_stream_wait_drsm()
commit: efffb014478e76c35b1a9e279d7010f70ff517e2
[4/9] ASoC: Intel: avs: Handle SUSPEND and RESUME triggers
commit: 8e097f9a5529f0e6af30e1fac0d4e2a97c241392
[5/9] ASoC: Intel: avs: Restart instead of resuming HDA capture streams
commit: eb0699c4cd6e32d5e2bfc9356ab9e19a6164c94e
[6/9] ASoC: Intel: avs: Count low power streams
commit: 730cb320ec2973fb2aea72ea27f7edc6a847a664
[7/9] ASoC: Intel: avs: Standby power-state support
commit: d56829e9c1cb90044c07337fe90a9828fdb165c0
[8/9] ASoC: Intel: avs: Power and clock gating policy overriding
commit: 2a87f17775c1cbcfb99225312e8cc7a06aa109b9
[9/9] ASoC: Intel: avs: Enact power gating policy
commit: 758ba92f3a2f86493a9147abd31a5bdc0befc273All 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