ASoC: Intel: avs: Driver core and PCM operations
Subsystems (3)
Cezary Rojewski
maintainerv2 cover ASoC: Intel: avs: Driver core and PCM operations
Part three of main AVS driver series. This series was originally part of the initial series which was later divided [1] into smaller, easier-to-review chunks. Thus, many patches found here were already present on the list.
This series consists of code typical to many drivers - PCI driver operations, trace ability, PM operations - as well as PCM handlers for all standard audio interfaces, that is, HDA, I2S and DMIC are found here.
Series starts with updating firmware boot flow - libraries are no longer ignored. This change is dependent on already merged topology code [2] and because of that could not be part of the initial series [1].
PCM operations are split into four changes. First component operations alone i.e. operations which are usually agnostic towards path position (FE/BE). Then it continues with "generic" FE operations - there is no interface split here as from Intel ADSP point of view, FE, or HOST side as it's called in the specs, involves HD-Audio operations only. BE (also known as LINK) side on the other hand is divided into "non-HD-Audio" and HD-Audio part. The former represents transfer over DMIC and I2S interfaces both.
While patches implementing standard PCI driver operations along (again standard) HD-Audio initialization routines followed up by power management handlers are two major ones, series covers also other important subjects such as:
While patches implementing standard PCI driver operations along (again standard) HD-Audio initialization routines followed up by power management handlers are two major ones, series covers also other important subjects such as:
- event tracing
- preparation for firmware tracing (debugability)
- coredump (debugability)
- recovery flow (attempt recovery after IPC timeout or exception)
- D0ix (D0 device substate, complements standard power management)
Series is finalized by actual addition of supported platforms: SKL and APL-based. Platform-specific files are limited to firmware-specific bits, that is, bits that are specific to given firmware generation. Everything else is shared and is part of already upstream messaging code found in ipc.c, messages.c and messages.h files.
Changes in v2:
- usage of avs_releast_last_firmware() dropped in error path for library loading procedure as suggested by Pierre
- 'link_mask' usage replaced with 'i2s_link_mask' as requested by Pierre. Existing code addressed with new patch:
"ASoC: Intel: avs: Replace link_mask usage with i2s_link_mask"
- fixed possible race during recovery flow (->recovering flag is now atomic and tested in single location only).
- dropped platform prefixes for basically all i2s board descriptors
- 'ssp_test' renamed to 'i2s_test' to match naming convention of other boards
- simplified PM implementation for current series, 'low_power' bits moved to future series
- replaced SND_INTEL_DSP_DRIVER_SST with _AVS as suggested by Mark. Required changes to intel-dspcfg will be added in future series
- number of typos across commit messages addressed
[1]: https://lore.kernel.org/all/[email protected]/
[2]: https://lore.kernel.org/all/[email protected]/
Cezary Rojewski (14):
ASoC: Intel: avs: Account for libraries when booting basefw
ASoC: Intel: avs: Generic soc component driver
ASoC: Intel: avs: Generic PCM FE operations
ASoC: Intel: avs: non-HDA PCM BE operations
ASoC: Intel: avs: HDA PCM BE operations
ASoC: Intel: avs: Coredump and recovery flow
ASoC: Intel: avs: Prepare for firmware tracing
ASoC: Intel: avs: D0ix power state support
ASoC: Intel: avs: Event tracing
ASoC: Intel: avs: Machine board registration
ASoC: Intel: avs: PCI driver implementation
ASoC: Intel: avs: Power management
ASoC: Intel: avs: SKL-based platforms support
ASoC: Intel: avs: APL-based platforms support
Piotr Maziarz (1):
ASoC: Intel: avs: Replace link_mask usage with i2s_link_mask
include/sound/intel-dsp-config.h | 3 +- include/sound/soc-acpi.h | 2 + sound/soc/intel/Kconfig | 2 + sound/soc/intel/avs/Makefile | 7 +- sound/soc/intel/avs/apl.c | 250 ++++++ sound/soc/intel/avs/avs.h | 79 ++ sound/soc/intel/avs/board_selection.c | 501 +++++++++++ sound/soc/intel/avs/core.c | 631 +++++++++++++ sound/soc/intel/avs/dsp.c | 27 +- sound/soc/intel/avs/ipc.c | 253 +++++- sound/soc/intel/avs/loader.c | 84 ++ sound/soc/intel/avs/messages.c | 35 +- sound/soc/intel/avs/messages.h | 51 ++ sound/soc/intel/avs/pcm.c | 1182 +++++++++++++++++++++++++ sound/soc/intel/avs/registers.h | 8 + sound/soc/intel/avs/skl.c | 125 +++ sound/soc/intel/avs/topology.c | 14 +- sound/soc/intel/avs/trace.c | 33 + sound/soc/intel/avs/trace.h | 158 ++++ sound/soc/intel/avs/utils.c | 23 + 20 files changed, 3447 insertions(+), 21 deletions(-) create mode 100644 sound/soc/intel/avs/apl.c create mode 100644 sound/soc/intel/avs/board_selection.c create mode 100644 sound/soc/intel/avs/pcm.c create mode 100644 sound/soc/intel/avs/skl.c create mode 100644 sound/soc/intel/avs/trace.c create mode 100644 sound/soc/intel/avs/trace.h
Signature · 1 line
2.25.1
Cezary Rojewski
maintainerPATCH v2 1/15 ASoC: Intel: avs: Account for libraries when booting basefw
Not all modules are part of base firmware. Some are part of loadable libraries. These need to be loaded after base firmware reports ready status through FW_READY notification.
Their loading process is similar to the base firmware's one. Request the binary file, verify and strip the manifest and load the actual code into DSP memory with help of CLDMA or HD-Audio render stream, depending on audio device generation.
List of libraries needed for loading is obtained through the topology - vendor sections specifying the name of firmware files to request.
--- sound/soc/intel/avs/avs.h | 3 ++ sound/soc/intel/avs/loader.c | 80 ++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+)
sound/soc/intel/avs/avs.h +3 -0
@@ -19,6 +19,8 @@struct avs_dev ;struct avs_tplg ; +struct avs_tplg_library ; +struct avs_soc_component ;/* * struct avs_dsp_ops - Platform-specific DSP operations
@@ -241,6 +243,7 @@ void avs_hda_clock_gating_enable(struct avs_dev *adev, bool enable);void avs_hda_power_gating_enable (struct avs_dev *adev,bool enable);void avs_hda_l1sen_enable (struct avs_dev *adev,bool enable); +int avs_dsp_load_libraries (struct avs_dev *adev,struct avs_tplg_library *libs,u32 num_libs);int avs_dsp_boot_firmware (struct avs_dev *adev,bool purge);int avs_dsp_first_boot_firmware (struct avs_dev *adev);
sound/soc/intel/avs/loader.c +80 -0
105 lines not on this page · raw message
Signature · 1 line
2.25.1
Cezary Rojewski
maintainerPATCH v2 2/15 ASoC: Intel: avs: Generic soc component driver
In reply to Cezary RojewskiPrepare for concrete PCM operations over HDA, DMIC and I2S interfaces by providing generic soc component implementation. Interface-specific components re-use this code as majority of flow is shared.
--- include/sound/soc-acpi.h | 2 + sound/soc/intel/avs/Makefile | 2 +- sound/soc/intel/avs/pcm.c | 275 +++++++++++++++++++++++++++++++++++ 3 files changed, 278 insertions(+), 1 deletion(-) create mode 100644 sound/soc/intel/avs/pcm.c
include/sound/soc-acpi.h +2 -0
@@ -156,6 +156,7 @@ struct snd_soc_acpi_link_adr {* @links: array of link _ADR descriptors, null terminated. * @drv_name: machine driver name * @fw_filename: firmware file name. Used when SOF is not enabled. +* @tplg_filename: topology file name. Used when SOF is not enabled. * @board: board name * @machine_quirk: pointer to quirk, usually based on DMI information when * ACPI ID alone is not sufficient, wrong or misleading
@@ -174,6 +175,7 @@ struct snd_soc_acpi_mach {const struct snd_soc_acpi_link_adr *links;const char *drv_name;const char *fw_filename; +const char *tplg_filename;const char *board;struct snd_soc_acpi_mach * (*machine_quirk)(void *arg);const void *quirk_data;
sound/soc/intel/avs/Makefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only snd-soc-avs-objs := dsp.o ipc.o messages.o utils.o core.o loader.o \ - topology.o path.o + topology.o path.o pcm.o snd-soc-avs-objs += cldma.o obj-$(CONFIG_SND_SOC_INTEL_AVS) += snd-soc-avs.o
sound/soc/intel/avs/pcm.c new file +275 -0
275 lines not on this page · raw message
Signature · 1 line
2.25.1
Cezary Rojewski
maintainerPATCH v2 3/15 ASoC: Intel: avs: Generic PCM FE operations
In reply to Cezary RojewskiEach stream in AVS is represented by FE and BE domain. FE path stands for HOST part of the stream while BE stands for LINK (hardware) one. While BE portion is interface specific, FE is not. Handle all standard DAI operations to implement FE part of the stream.
--- sound/soc/intel/avs/pcm.c | 338 +++++++++++++++++++++++++++++++++ sound/soc/intel/avs/topology.c | 2 - 2 files changed, 338 insertions(+), 2 deletions(-)
sound/soc/intel/avs/pcm.c +338 -0
@@ -10,6 +10,7 @@#include <linux/device.h> #include <sound/hda_register.h> #include <sound/hdaudio_ext.h> +#include <sound/pcm_params.h> #include <sound/soc-acpi.h> #include <sound/soc-acpi-intel-match.h> #include <sound/soc-component.h>
@@ -29,6 +30,343 @@ struct avs_dma_data {struct hdac_ext_stream *host_stream; }; +static struct avs_tplg_path_template * +avs_dai_find_path_template (struct snd_soc_dai *dai,bool is_fe,int direction) +{ +struct snd_soc_dapm_widget *dw; +struct snd_soc_dapm_path *dp; +enum snd_soc_dapm_direction dir; + +if (direction ==SNDRV_PCM_STREAM_CAPTURE ) { + dw = dai->capture_widget; + dir = is_fe ?SND_SOC_DAPM_DIR_OUT :SND_SOC_DAPM_DIR_IN ; + }else { + dw = dai->playback_widget; + dir = is_fe ?SND_SOC_DAPM_DIR_IN :SND_SOC_DAPM_DIR_OUT ; + } + + dp =list_first_entry_or_null (&dw->edges[dir],typeof (*dp), list_node[dir]); +if (!dp) +return NULL ; + +/* Get the other widget, with actual path template data */ + dw = (dp->source == dw) ? dp->sink : dp->source; + +return dw->priv; +} + +static int avs_dai_startup (struct snd_pcm_substream *substream,struct snd_soc_dai *dai,bool is_fe) +{ +struct avs_tplg_path_template *template; +struct avs_dma_data *data; + + template =avs_dai_find_path_template (dai, is_fe, substream->stream); +if (!template) { +dev_err (dai->dev,"no %s path for dai %s, invalid tplg?\n" , +snd_pcm_stream_str (substream), dai->name); +return -EINVAL ; + } + + data =kzalloc (sizeof (*data),GFP_KERNEL ); +if (!data) +return -ENOMEM ; + + data->template = template; +snd_soc_dai_set_dma_data (dai, substream, data); + +return 0 ; +} + +static int avs_dai_hw_params (struct snd_pcm_substream *substream, +struct snd_pcm_hw_params *fe_hw_params, +struct snd_pcm_hw_params *be_hw_params,struct snd_soc_dai *dai, +int dma_id) +{ +struct avs_dma_data *data; +struct avs_path *path; +struct avs_dev *adev =to_avs_dev (dai->dev); +int ret; + + data =snd_soc_dai_get_dma_data (dai, substream); + +dev_dbg (dai->dev,"%s FE hw_params str %p rtd %p" , + __func__, substream, substream->runtime); +dev_dbg (dai->dev,"rate %d chn %d vbd %d bd %d\n" , +params_rate (fe_hw_params),params_channels (fe_hw_params), +params_width (fe_hw_params),params_physical_width (fe_hw_params)); + +dev_dbg (dai->dev,"%s BE hw_params str %p rtd %p" , + __func__, substream, substream->runtime); +dev_dbg (dai->dev,"rate %d chn %d vbd %d bd %d\n" , +params_rate (be_hw_params),params_channels (be_hw_params), +params_width (be_hw_params),params_physical_width (be_hw_params)); + + path =avs_path_create (adev, dma_id, data->template, fe_hw_params, be_hw_params); +if (IS_ERR (path)) { + ret =PTR_ERR (path); +dev_err (dai->dev,"create path failed: %d\n" , ret); +return ret; + } + + data->path = path; +return 0 ; +} + +static int avs_dai_prepare (struct avs_dev *adev,struct snd_pcm_substream *substream, +struct snd_soc_dai *dai) +{ +struct avs_dma_data *data; +int ret; + + data =snd_soc_dai_get_dma_data (dai, substream); +if (!data->path) +return 0 ; + + ret =avs_path_reset (data->path); +if (ret <0 ) { +dev_err (dai->dev,"reset path failed: %d\n" , ret); +return ret; + } + + ret =avs_path_pause (data->path); +if (ret <0 ) +dev_err (dai->dev,"pause path failed: %d\n" , ret); +return ret; +} + +static const unsigned int rates[] = { +8000 ,11025 ,12000 ,16000 , +22050 ,24000 ,32000 ,44100 , +48000 ,64000 ,88200 ,96000 , +128000 ,176400 ,192000 , +}; + +static const struct snd_pcm_hw_constraint_list hw_rates = { + .count =ARRAY_SIZE (rates), + .list = rates, + .mask =0 , +}; + +static int avs_dai_fe_startup (struct snd_pcm_substream *substream,struct snd_soc_dai *dai) +{ +struct snd_pcm_runtime *runtime = substream->runtime; +struct avs_dma_data *data; +struct avs_dev *adev =to_avs_dev (dai->dev); +struct hdac_bus *bus = &adev->base.core; +struct hdac_ext_stream *host_stream; +int ret; + + ret =avs_dai_startup (substream, dai, true); +if (ret) +return ret; + + data =snd_soc_dai_get_dma_data (dai, substream); + + host_stream =snd_hdac_ext_stream_assign (bus, substream,HDAC_EXT_STREAM_TYPE_HOST ); +if (!host_stream) { +kfree (data); +return -EBUSY ; + } + + data->host_stream = host_stream; +snd_pcm_hw_constraint_integer (runtime,SNDRV_PCM_HW_PARAM_PERIODS ); +/* avoid wrap-around with wall-clock */ +snd_pcm_hw_constraint_minmax (runtime,SNDRV_PCM_HW_PARAM_BUFFER_TIME ,20 ,178000000 ); +snd_pcm_hw_constraint_list (runtime,0 ,SNDRV_PCM_HW_PARAM_RATE , &hw_rates); +snd_pcm_set_sync (substream); + +dev_dbg (dai->dev,"%s fe STARTUP tag %d str %p" , + __func__,hdac_stream (host_stream)->stream_tag, substream); + +return 0 ; +} + +static void avs_dai_fe_shutdown (struct snd_pcm_substream *substream,struct snd_soc_dai *dai) +{ +struct avs_dma_data *data; + + data =snd_soc_dai_get_dma_data (dai, substream); + +snd_soc_dai_set_dma_data (dai, substream,NULL ); +snd_hdac_ext_stream_release (data->host_stream,HDAC_EXT_STREAM_TYPE_HOST ); +kfree (data); +} + +static int avs_dai_fe_hw_params (struct snd_pcm_substream *substream, +struct snd_pcm_hw_params *hw_params,struct snd_soc_dai *dai) +{ +struct snd_pcm_hw_params *be_hw_params =NULL ; +struct snd_soc_pcm_runtime *fe, *be; +struct snd_soc_dpcm *dpcm; +struct avs_dma_data *data; +struct hdac_ext_stream *host_stream; +int ret; + + data =snd_soc_dai_get_dma_data (dai, substream); +if (data->path) +return 0 ; + + host_stream = data->host_stream; + +hdac_stream (host_stream)->bufsize =0 ; +hdac_stream (host_stream)->period_bytes =0 ; +hdac_stream (host_stream)->format_val =0 ; + + fe =asoc_substream_to_rtd (substream); +for_each_dpcm_be (fe, substream->stream, dpcm) { + be = dpcm->be; + be_hw_params = &be->dpcm[substream->stream].hw_params; + } + + ret =avs_dai_hw_params (substream, hw_params, be_hw_params, dai, +hdac_stream (host_stream)->stream_tag -1 ); +if (ret) + goto create_err; + + ret =avs_path_bind (data->path); +if (ret <0 ) { +dev_err (dai->dev,"bind FE <-> BE failed: %d\n" , ret); + goto bind_err; + } + +return 0 ; + +bind_err: +avs_path_free (data->path); + data->path =NULL ; +create_err: +snd_pcm_lib_free_pages (substream); +return ret; +} + +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; +int ret; + +dev_dbg (dai->dev,"%s fe HW_FREE str %p rtd %p" , + __func__, substream, substream->runtime); + + data =snd_soc_dai_get_dma_data (dai, substream); +if (!data->path) +return 0 ; + + host_stream = data->host_stream; + + ret =avs_path_unbind (data->path); +if (ret <0 ) +dev_err (dai->dev,"unbind FE <-> BE failed: %d\n" , ret); + +avs_path_free (data->path); + data->path =NULL ; +snd_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_prepare (struct snd_pcm_substream *substream,struct snd_soc_dai *dai) +{ +struct snd_pcm_runtime *runtime = substream->runtime; +struct avs_dma_data *data; +struct avs_dev *adev =to_avs_dev (dai->dev); +struct hdac_ext_stream *host_stream; +struct hdac_bus *bus; +unsigned int format_val; +int ret; + + data =snd_soc_dai_get_dma_data (dai, substream); + host_stream = data->host_stream; + +if (hdac_stream (host_stream)->prepared) +return 0 ; + + bus =hdac_stream (host_stream)->bus; +snd_hdac_ext_stream_decouple (bus, data->host_stream, true); +snd_hdac_stream_reset (hdac_stream (host_stream)); + + format_val =snd_hdac_calc_stream_format (runtime->rate, runtime->channels, runtime->format, + runtime->sample_bits,0 ); + + ret =snd_hdac_stream_set_params (hdac_stream (host_stream), format_val); +if (ret <0 ) +return ret; + + ret =snd_hdac_stream_setup (hdac_stream (host_stream)); +if (ret <0 ) +return ret; + + ret =avs_dai_prepare (adev, substream, dai); +if (ret) +return ret; + +hdac_stream (host_stream)->prepared = true; +return 0 ; +} + +static int avs_dai_fe_trigger (struct snd_pcm_substream *substream,int cmd,struct snd_soc_dai *dai) +{ +struct avs_dma_data *data; +struct hdac_ext_stream *host_stream; +struct hdac_bus *bus; +unsigned long flags; +int ret =0 ; + + data =snd_soc_dai_get_dma_data (dai, substream); + host_stream = data->host_stream; + bus =hdac_stream (host_stream)->bus; + +switch (cmd) { +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); + + 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_PAUSE_PUSH : +case SNDRV_PCM_TRIGGER_STOP : + ret =avs_path_pause (data->path); +if (ret <0 ) +dev_err (dai->dev,"pause FE path failed: %d\n" , ret); + +spin_lock_irqsave (&bus->reg_lock, flags); +snd_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); + } +break ; + +default : + ret = -EINVAL ; +break ; + } + +return ret; +} + +const struct snd_soc_dai_ops avs_dai_fe_ops = { + .startup = avs_dai_fe_startup, + .shutdown = avs_dai_fe_shutdown, + .hw_params = avs_dai_fe_hw_params, + .hw_free = avs_dai_fe_hw_free, + .prepare = avs_dai_fe_prepare, + .trigger = avs_dai_fe_trigger, +}; +static ssize_t topology_name_read (struct file *file,char __user *user_buf,size_t count,loff_t *ppos) {
sound/soc/intel/avs/topology.c +0 -2
@@ -15,8 +15,6 @@#include "avs.h" #include "topology.h" -const struct snd_soc_dai_ops avs_dai_fe_ops; -/* Get pointer to vendor array at the specified offset. */ #define avs_tplg_vendor_array_at (array, offset) \ ((struct snd_soc_tplg_vendor_array *)((u8 *)array + offset))
Signature · 1 line
2.25.1
Cezary Rojewski
maintainerPATCH v2 4/15 ASoC: Intel: avs: non-HDA PCM BE operations
In reply to Cezary RojewskiDMIC and I2S interfaces differ in DMA operations from the HDAudio interface. With that in mind, implement all DAI operations to handle non-HDA BE interfaces.
To prevent code duplication in newly added code, I2S platform registering is dynamic - makes use of specified port_mask and TDMs array to populate as many DAIs as required.
--- sound/soc/intel/avs/avs.h | 4 + sound/soc/intel/avs/pcm.c | 222 +++++++++++++++++++++++++++++++++++++- 2 files changed, 225 insertions(+), 1 deletion(-)
sound/soc/intel/avs/avs.h +4 -0
@@ -270,4 +270,8 @@ struct avs_soc_component {extern const struct snd_soc_dai_ops avs_dai_fe_ops; +int avs_dmic_platform_register (struct avs_dev *adev,const char *name); +int avs_i2s_platform_register (struct avs_dev *adev,const char *name,unsigned long port_mask, +unsigned long *tdms); +#endif /* __SOUND_SOC_INTEL_AVS_H */
sound/soc/intel/avs/pcm.c +221 -1
243 lines not on this page · raw message
Signature · 1 line
2.25.1
Cezary Rojewski
maintainerPATCH v2 5/15 ASoC: Intel: avs: HDA PCM BE operations
In reply to Cezary RojewskiHDA streaming in DSP world means enlisting HDAudio links as BE interfaces. Another difference when compared to its DMIC and I2S friends is lack of NHLT blob usage - no additional hardware configuration is needed.
Similarly to I2S component, HDA populates its DAIs dynamically, here by the means of codec->pcm_list_head. Allows for cutting the number of soc components required to support the interface.
--- sound/soc/intel/avs/avs.h | 1 + sound/soc/intel/avs/pcm.c | 349 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 350 insertions(+)
sound/soc/intel/avs/avs.h +1 -0
@@ -273,5 +273,6 @@ extern const struct snd_soc_dai_ops avs_dai_fe_ops;int avs_dmic_platform_register (struct avs_dev *adev,const char *name);int avs_i2s_platform_register (struct avs_dev *adev,const char *name,unsigned long port_mask,unsigned long *tdms); +int avs_hda_platform_register (struct avs_dev *adev,const char *name);#endif /* __SOUND_SOC_INTEL_AVS_H */
sound/soc/intel/avs/pcm.c +349 -0
358 lines not on this page · raw message
Signature · 1 line
2.25.1
Cezary Rojewski
maintainerPATCH v2 6/15 ASoC: Intel: avs: Coredump and recovery flow
In reply to Cezary RojewskiIn rare occasions, under stress conditions or hardware malfunction, DSP firmware may fail. Software is notified about such situation with EXCEPTION_CAUGHT notification. IPC timeout is also counted as critical device failure. More often than not, driver can recover from such situations by performing full reset: killing and restarting ADSP.
--- sound/soc/intel/Kconfig | 1 + sound/soc/intel/avs/avs.h | 4 ++ sound/soc/intel/avs/ipc.c | 97 +++++++++++++++++++++++++++++++++- sound/soc/intel/avs/messages.h | 5 ++ 4 files changed, 105 insertions(+), 2 deletions(-)
sound/soc/intel/Kconfig +1 -0
@@ -219,6 +219,7 @@ config SND_SOC_INTEL_AVS select SND_HDA_EXT_CORE select SND_HDA_DSP_LOADER select SND_INTEL_DSP_CONFIG + select WANT_DEV_COREDUMP help Enable support for Intel(R) cAVS 1.5 platforms with DSP capabilities. This includes Skylake, Kabylake, Amberlake and
sound/soc/intel/avs/avs.h +4 -0
@@ -42,6 +42,7 @@ struct avs_dsp_ops {int (*const load_basefw)(struct avs_dev *,struct firmware *);int (*const load_lib)(struct avs_dev *,struct firmware *,u32 );int (*const transfer_mods)(struct avs_dev *,bool ,struct avs_module_entry *,u32 ); +int (*const coredump)(struct avs_dev *,union avs_notify_msg *); };#define avs_dsp_op (adev, op, ...) \
@@ -164,12 +165,15 @@ struct avs_ipc {struct avs_ipc_msg rx;u32 default_timeout_ms;bool ready; +atomic_t recovering;bool rx_completed;spinlock_t rx_lock;struct mutex msg_mutex;struct completion done_completion;struct completion busy_completion; + +struct work_struct recovery_work; };#define AVS_EIPC EREMOTEIO
sound/soc/intel/avs/ipc.c +95 -2
132 lines not on this page · raw message
sound/soc/intel/avs/messages.h +5 -0
@@ -187,6 +187,7 @@ enum avs_notify_msg_type {AVS_NOTIFY_PHRASE_DETECTED =4 ,AVS_NOTIFY_RESOURCE_EVENT =5 ,AVS_NOTIFY_FW_READY =8 , +AVS_NOTIFY_EXCEPTION_CAUGHT =10 , AVS_NOTIFY_MODULE_EVENT = 12, };
@@ -205,6 +206,10 @@ union avs_notify_msg { };union {u32 val; +struct { +u32 core_id:2 ; +u32 stack_dump_size:16 ; + } coredump; } ext; }; } __packed;
Signature · 1 line
2.25.1
Cezary Rojewski
maintainerPATCH v2 7/15 ASoC: Intel: avs: Prepare for firmware tracing
In reply to Cezary RojewskiFirmware provides its own debug functionality. While coredump is one of these, traces are the main area of interest. kfifo is enlisted to cache log data that is being pumped to driver through SRAM. Separate DSP operations are declared as actual feature implementation differs between firmware generations.
As log gathering involves usage of IPCs, add all necessary: ENABLE_LOGS and SYSTEM_TIME.
--- sound/soc/intel/avs/avs.h | 32 ++++++++++++++++++++++++++++++++ sound/soc/intel/avs/ipc.c | 5 +++++ sound/soc/intel/avs/messages.c | 31 +++++++++++++++++++++++++++++++ sound/soc/intel/avs/messages.h | 21 +++++++++++++++++++++ sound/soc/intel/avs/registers.h | 1 + sound/soc/intel/avs/utils.c | 23 +++++++++++++++++++++++ 6 files changed, 113 insertions(+)
sound/soc/intel/avs/avs.h +32 -0
@@ -11,6 +11,7 @@#include <linux/device.h> #include <linux/firmware.h> +#include <linux/kfifo.h> #include <sound/hda_codec.h> #include <sound/hda_register.h> #include <sound/soc-component.h>
@@ -42,6 +43,10 @@ struct avs_dsp_ops {int (*const load_basefw)(struct avs_dev *,struct firmware *);int (*const load_lib)(struct avs_dev *,struct firmware *,u32 );int (*const transfer_mods)(struct avs_dev *,bool ,struct avs_module_entry *,u32 ); +int (*const enable_logs)(struct avs_dev *,enum avs_log_enable ,u32 ,u32 ,unsigned long , +u32 *); +int (*const log_buffer_offset)(struct avs_dev *,u32 ); +int (*const log_buffer_status)(struct avs_dev *,union avs_notify_msg *);int (*const coredump)(struct avs_dev *,union avs_notify_msg *); };
@@ -75,6 +80,16 @@ struct avs_fw_entry {struct list_head node; }; +struct avs_debug { +struct kfifo trace_fifo; +spinlock_t fifo_lock;/* serialize I/O for trace_fifo */ +spinlock_t trace_lock;/* serialize debug window I/O between each LOG_BUFFER_STATUS */ +wait_queue_head_t trace_waitq; +u32 aging_timer_period; +u32 fifo_full_timer_period; +u32 logged_resources;/* context dependent: core or library */ +}; +/* * struct avs_dev - Intel HD-Audio driver data *
@@ -115,6 +130,8 @@ struct avs_dev {struct list_head path_list;spinlock_t path_list_lock;struct mutex path_mutex; + +struct avs_debug dbg; };/* from hda_bus to avs_dev */
@@ -279,4 +296,19 @@ int avs_i2s_platform_register(struct avs_dev *adev, const char *name, unsigned l unsigned long *tdms);int avs_hda_platform_register (struct avs_dev *adev,const char *name); +/* Firmware tracing helpers */ + +unsigned int __kfifo_fromio_locked (struct kfifo *fifo,const void __iomem *src,unsigned int len, +spinlock_t *lock); + +#define avs_log_buffer_size (adev) \ + ((adev)->fw_cfg.trace_log_bytes / (adev)->hw_cfg.dsp_cores) + +#define avs_log_buffer_addr (adev, core) \ +({ \ + s32 __offset = avs_dsp_op(adev, log_buffer_offset, core); \ + (__offset < 0) ? NULL : \ + (avs_sram_addr(adev, AVS_DEBUG_WINDOW) + __offset); \ +}) +#endif /* __SOUND_SOC_INTEL_AVS_H */
sound/soc/intel/avs/ipc.c +5 -0
@@ -140,6 +140,7 @@ static void avs_dsp_process_notification(struct avs_dev *adev, u64 header) data_size =sizeof (struct avs_notify_res_data );break ; +case AVS_NOTIFY_LOG_BUFFER_STATUS :case AVS_NOTIFY_EXCEPTION_CAUGHT :break ;
@@ -170,6 +171,10 @@ static void avs_dsp_process_notification(struct avs_dev *adev, u64 header)complete (&adev->fw_ready);break ; +case AVS_NOTIFY_LOG_BUFFER_STATUS : +avs_dsp_op (adev, log_buffer_status, &msg); +break ; +case AVS_NOTIFY_EXCEPTION_CAUGHT :avs_dsp_exception_caught (adev, &msg);break ;
sound/soc/intel/avs/messages.c +31 -0
@@ -677,6 +677,37 @@ int avs_ipc_get_modules_info(struct avs_dev *adev, struct avs_mods_info **info)return 0 ; } +int avs_ipc_set_enable_logs (struct avs_dev *adev,u8 *log_info,size_t size) +{ +int ret; + + ret =avs_ipc_set_large_config (adev,AVS_BASEFW_MOD_ID ,AVS_BASEFW_INST_ID , +AVS_BASEFW_ENABLE_LOGS , log_info, size); +if (ret) +dev_err (adev->dev,"enable logs failed: %d\n" , ret); + +return ret; +} + +int avs_ipc_set_system_time (struct avs_dev *adev) +{ +struct avs_sys_time sys_time; +int ret; +u64 us; + +/* firmware expects UTC time in micro seconds */ + us =ktime_to_us (ktime_get ()); + sys_time.val_l = us &UINT_MAX ; + sys_time.val_u = us >>32 ; + + ret =avs_ipc_set_large_config (adev,AVS_BASEFW_MOD_ID ,AVS_BASEFW_INST_ID , +AVS_BASEFW_SYSTEM_TIME , (u8 *)&sys_time,sizeof (sys_time)); +if (ret) +dev_err (adev->dev,"set system time failed: %d\n" , ret); + +return ret; +} + int avs_ipc_copier_set_sink_format(struct avs_dev *adev, u16 module_id, u8 instance_id, u32 sink_id, const struct avs_audio_format *src_fmt,
sound/soc/intel/avs/messages.h +21 -0
@@ -186,6 +186,7 @@ union avs_reply_msg {enum avs_notify_msg_type {AVS_NOTIFY_PHRASE_DETECTED =4 ,AVS_NOTIFY_RESOURCE_EVENT =5 , +AVS_NOTIFY_LOG_BUFFER_STATUS =6 ,AVS_NOTIFY_FW_READY =8 ,AVS_NOTIFY_EXCEPTION_CAUGHT =10 ,AVS_NOTIFY_MODULE_EVENT =12 ,
@@ -203,6 +204,10 @@ union avs_notify_msg { u32 msg_direction:1; u32 msg_target:1; }; +struct { +u16 rsvd:12 ; +u16 core:4 ; + } log; };union {u32 val;
@@ -329,12 +334,21 @@ int avs_ipc_set_d0ix(struct avs_dev *adev, bool enable_pg, bool streaming);#define AVS_BASEFW_INST_ID 0enum avs_basefw_runtime_param { +AVS_BASEFW_ENABLE_LOGS =6 ,AVS_BASEFW_FIRMWARE_CONFIG =7 ,AVS_BASEFW_HARDWARE_CONFIG =8 ,AVS_BASEFW_MODULES_INFO =9 ,AVS_BASEFW_LIBRARIES_INFO =16 , +AVS_BASEFW_SYSTEM_TIME =20 , +}; + +enum avs_log_enable { +AVS_LOG_DISABLE =0 , +AVS_LOG_ENABLE =1 }; +int avs_ipc_set_enable_logs (struct avs_dev *adev,u8 *log_info,size_t size); +struct avs_fw_version {u16 major;u16 minor;
@@ -502,6 +516,13 @@ static inline bool avs_module_entry_is_loaded(struct avs_module_entry *mentry)int avs_ipc_get_modules_info (struct avs_dev *adev,struct avs_mods_info **info); +struct avs_sys_time { +u32 val_l; +u32 val_u; +} __packed; + +int avs_ipc_set_system_time (struct avs_dev *adev); +/* Module configuration */ #define AVS_MIXIN_MOD_UUID \
sound/soc/intel/avs/registers.h +1 -0
@@ -58,6 +58,7 @@#define AVS_UPLINK_WINDOW AVS_FW_REGS_WINDOW/* HOST -> DSP communication window */ #define AVS_DOWNLINK_WINDOW 1 +#define AVS_DEBUG_WINDOW 2/* registry I/O helpers */ #define avs_sram_offset (adev, window_idx) \
sound/soc/intel/avs/utils.c +23 -0
@@ -7,6 +7,7 @@// #include <linux/firmware.h> +#include <linux/kfifo.h> #include <linux/slab.h> #include "avs.h" #include "messages.h"
@@ -299,3 +300,25 @@ void avs_release_firmwares(struct avs_dev *adev)kfree (entry); } } + +unsigned int __kfifo_fromio_locked (struct kfifo *fifo,const void __iomem *src,unsigned int len, +spinlock_t *lock) +{ +struct __kfifo *__fifo = &fifo->kfifo; +unsigned long flags; +unsigned int l, off; + +spin_lock_irqsave (lock, flags); + len =min (len,kfifo_avail (fifo)); + off = __fifo->in & __fifo->mask; + l =min (len,kfifo_size (fifo) - off); + +memcpy_fromio (__fifo->data + off, src, l); +memcpy_fromio (__fifo->data, src + l, len - l); +/* Make sure data copied from SRAM is visible to all CPUs. */ +smp_mb (); + __fifo->in += len; +spin_unlock_irqrestore (lock, flags); + +return len; +}
Signature · 1 line
2.25.1
Cezary Rojewski
maintainerPATCH v2 8/15 ASoC: Intel: avs: D0ix power state support
In reply to Cezary RojewskiAudio DSP device supports D0 substates in form of D0ix, allowing for preserving more power even when device is still considered active (D0). When entered, certain domains which are not being currently used become power gated. Entering and leaving D0ix is a complex process and differs between firmware generations.
Conditions that disallow D0i3 and require immediate D0i0 transition include but may not be limited to: IPC traffic, firmware tracing and SRAM I/O. To make D0ix toggling sane, delay D0i3 transition and refresh the timer each time an IPC is requested.
--- sound/soc/intel/avs/avs.h | 14 ++++ sound/soc/intel/avs/dsp.c | 14 ++++ sound/soc/intel/avs/ipc.c | 121 ++++++++++++++++++++++++++++++++- sound/soc/intel/avs/messages.c | 4 +- 4 files changed, 150 insertions(+), 3 deletions(-)
sound/soc/intel/avs/avs.h +14 -0
@@ -22,6 +22,7 @@ struct avs_dev;struct avs_tplg ;struct avs_tplg_library ;struct avs_soc_component ; +struct avs_ipc_msg ;/* * struct avs_dsp_ops - Platform-specific DSP operations
@@ -48,6 +49,8 @@ struct avs_dsp_ops {int (*const log_buffer_offset)(struct avs_dev *,u32 );int (*const log_buffer_status)(struct avs_dev *,union avs_notify_msg *);int (*const coredump)(struct avs_dev *,union avs_notify_msg *); +bool (*const d0ix_toggle)(struct avs_dev *,struct avs_ipc_msg *,bool ); +int (*const set_d0ix)(struct avs_dev *,bool ); };#define avs_dsp_op (adev, op, ...) \
@@ -191,6 +194,9 @@ struct avs_ipc {struct completion busy_completion;struct work_struct recovery_work; +struct delayed_work d0ix_work; +atomic_t d0ix_disable_depth; +bool in_d0ix; };#define AVS_EIPC EREMOTEIO
@@ -227,6 +233,11 @@ int avs_dsp_send_msg_timeout(struct avs_dev *adev, struct avs_ipc_msg *reply, int timeout);int avs_dsp_send_msg (struct avs_dev *adev,struct avs_ipc_msg *request,struct avs_ipc_msg *reply); +/* Two variants below are for messages that control DSP power states. */ +int avs_dsp_send_pm_msg_timeout (struct avs_dev *adev,struct avs_ipc_msg *request, +struct avs_ipc_msg *reply,int timeout,bool wake_d0i0); +int avs_dsp_send_pm_msg (struct avs_dev *adev,struct avs_ipc_msg *request, +struct avs_ipc_msg *reply,bool wake_d0i0);int avs_dsp_send_rom_msg_timeout (struct avs_dev *adev,struct avs_ipc_msg *request,int timeout);int avs_dsp_send_rom_msg (struct avs_dev *adev,struct avs_ipc_msg *request);
@@ -234,6 +245,9 @@ void avs_dsp_interrupt_control(struct avs_dev *adev, bool enable);int avs_ipc_init (struct avs_ipc *ipc,struct device *dev);void avs_ipc_block (struct avs_ipc *ipc); +int avs_dsp_disable_d0ix (struct avs_dev *adev); +int avs_dsp_enable_d0ix (struct avs_dev *adev); +/* Firmware resources management */ int avs_get_module_entry (struct avs_dev *adev,const guid_t *uuid,struct avs_module_entry *entry);
sound/soc/intel/avs/dsp.c +14 -0
@@ -152,6 +152,15 @@ static int avs_dsp_get_core(struct avs_dev *adev, u32 core_id) adev->core_refs[core_id]++;if (adev->core_refs[core_id] ==1 ) { +/* +* No cores other than main-core can be running for DSP +* to achieve d0ix. Conscious SET_D0IX IPC failure is permitted, +* simply d0ix power state will no longer be attempted. +*/ + ret =avs_dsp_disable_d0ix (adev); +if (ret && ret != -AVS_EIPC ) + goto err_disable_d0ix; + ret =avs_dsp_enable (adev, mask);if (ret) goto err_enable_dsp;
@@ -160,6 +169,8 @@ static int avs_dsp_get_core(struct avs_dev *adev, u32 core_id)return 0 ; err_enable_dsp: +avs_dsp_enable_d0ix (adev); +err_disable_d0ix: adev->core_refs[core_id]--; err:dev_err (adev->dev,"get core %d failed: %d\n" , core_id, ret);
@@ -185,6 +196,9 @@ static int avs_dsp_put_core(struct avs_dev *adev, u32 core_id) ret =avs_dsp_disable (adev, mask);if (ret) goto err; + +/* Match disable_d0ix in avs_dsp_get_core(). */ +avs_dsp_enable_d0ix (adev); }return 0 ;
sound/soc/intel/avs/ipc.c +120 -1
158 lines not on this page · raw message
sound/soc/intel/avs/messages.c +2 -2
@@ -432,7 +432,7 @@ int avs_ipc_set_dx(struct avs_dev *adev, u32 core_mask, bool powerup) request.data = &dx; request.size =sizeof (dx); - ret =avs_dsp_send_msg (adev, &request,NULL ); + ret =avs_dsp_send_pm_msg (adev, &request,NULL , true);if (ret)avs_ipc_err (adev, &request,"set dx" , ret);
@@ -456,7 +456,7 @@ int avs_ipc_set_d0ix(struct avs_dev *adev, bool enable_pg, bool streaming) request.header = msg.val; - ret =avs_dsp_send_msg (adev, &request,NULL ); + ret =avs_dsp_send_pm_msg (adev, &request,NULL , false);if (ret)avs_ipc_err (adev, &request,"set d0ix" , ret);
Signature · 1 line
2.25.1
Cezary Rojewski
maintainerPATCH v2 9/15 ASoC: Intel: avs: Event tracing
In reply to Cezary RojewskiDefine tracing macros for easy avs debug. These cover all IPC message
types: requests, replies and notifications as well as DSP-core operations and d0ix toggling.
--- sound/soc/intel/avs/Makefile | 4 + sound/soc/intel/avs/dsp.c | 10 +++ sound/soc/intel/avs/ipc.c | 30 ++++++- sound/soc/intel/avs/trace.c | 33 ++++++++ sound/soc/intel/avs/trace.h | 158 +++++++++++++++++++++++++++++++++++ 5 files changed, 232 insertions(+), 3 deletions(-) create mode 100644 sound/soc/intel/avs/trace.c create mode 100644 sound/soc/intel/avs/trace.h
sound/soc/intel/avs/Makefile +4 -0
@@ -4,4 +4,8 @@ snd-soc-avs-objs := dsp.o ipc.o messages.o utils.o core.o loader.o \ topology.o path.o pcm.o snd-soc-avs-objs += cldma.o +snd-soc-avs-objs += trace.o +# tell define_trace.h where to find the trace header +CFLAGS_trace.o := -I$(src) + obj-$(CONFIG_SND_SOC_INTEL_AVS) += snd-soc-avs.o
sound/soc/intel/avs/dsp.c +10 -0
@@ -10,6 +10,7 @@#include <sound/hdaudio_ext.h> #include "avs.h" #include "registers.h" +#include "trace.h" #define AVS_ADSPCS_INTERVAL_US 500#define AVS_ADSPCS_TIMEOUT_US 50000
@@ -19,6 +20,9 @@ int avs_dsp_core_power(struct avs_dev *adev, u32 core_mask, bool power)u32 value, mask, reg;int ret; + value =snd_hdac_adsp_readl (adev,AVS_ADSP_REG_ADSPCS ); +trace_avs_dsp_core_op (value, core_mask,"power" , power); + mask =AVS_ADSPCS_SPA_MASK (core_mask); value = power ? mask :0 ;
@@ -43,6 +47,9 @@ int avs_dsp_core_reset(struct avs_dev *adev, u32 core_mask, bool reset)u32 value, mask, reg;int ret; + value =snd_hdac_adsp_readl (adev,AVS_ADSP_REG_ADSPCS ); +trace_avs_dsp_core_op (value, core_mask,"reset" , reset); + mask =AVS_ADSPCS_CRST_MASK (core_mask); value = reset ? mask :0 ;
@@ -64,6 +71,9 @@ int avs_dsp_core_stall(struct avs_dev *adev, u32 core_mask, bool stall)u32 value, mask, reg;int ret; + value =snd_hdac_adsp_readl (adev,AVS_ADSP_REG_ADSPCS ); +trace_avs_dsp_core_op (value, core_mask,"stall" , stall); + mask =AVS_ADSPCS_CSTALL_MASK (core_mask); value = stall ? mask :0 ;
sound/soc/intel/avs/ipc.c +27 -3
@@ -6,11 +6,13 @@// Amadeusz Slawinski <[email protected]> // +#include <linux/io-64-nonatomic-lo-hi.h> #include <linux/slab.h> #include <sound/hdaudio_ext.h> #include "avs.h" #include "messages.h" #include "registers.h" +#include "trace.h" #define AVS_IPC_TIMEOUT_MS 300#define AVS_D0IX_DELAY_MS 300
@@ -179,6 +181,10 @@ static void avs_dsp_receive_rx(struct avs_dev *adev, u64 header) {struct avs_ipc *ipc = adev->ipc;union avs_reply_msg msg =AVS_MSG (header); +u64 reg; + + reg =readq (avs_sram_addr (adev,AVS_FW_REGS_WINDOW )); +trace_avs_ipc_reply_msg (header, reg); ipc->rx.header = header;/* Abort copying payload if request processing was unsuccessful. */
@@ -189,6 +195,7 @@ static void avs_dsp_receive_rx(struct avs_dev *adev, u64 header) ipc->rx.size = msg.ext.large_config.data_off_size;memcpy_fromio (ipc->rx.data,avs_uplink_addr (adev), ipc->rx.size); +trace_avs_msg_payload (ipc->rx.data, ipc->rx.size); } }
@@ -198,6 +205,10 @@ static void avs_dsp_process_notification(struct avs_dev *adev, u64 header)union avs_notify_msg msg =AVS_MSG (header);size_t data_size =0 ;void *data =NULL ; +u64 reg; + + reg =readq (avs_sram_addr (adev,AVS_FW_REGS_WINDOW )); +trace_avs_ipc_notify_msg (header, reg);/* Ignore spurious notifications until handshake is established. */ if (!adev->ipc->ready && msg.notify_msg_type !=AVS_NOTIFY_FW_READY ) {
@@ -239,6 +250,7 @@ static void avs_dsp_process_notification(struct avs_dev *adev, u64 header)return ;memcpy_fromio (data,avs_uplink_addr (adev), data_size); +trace_avs_msg_payload (data, data_size); }/* Perform notification-specific operations. */
@@ -422,9 +434,15 @@ static void avs_ipc_msg_init(struct avs_ipc *ipc, struct avs_ipc_msg *reply)reinit_completion (&ipc->busy_completion); } -static void avs_dsp_send_tx (struct avs_dev *adev,struct avs_ipc_msg *tx) +static void avs_dsp_send_tx (struct avs_dev *adev,struct avs_ipc_msg *tx,bool read_fwregs) { +u64 reg =ULONG_MAX ; + tx->header |=SKL_ADSP_HIPCI_BUSY ; +if (read_fwregs) + reg =readq (avs_sram_addr (adev,AVS_FW_REGS_WINDOW )); + +trace_avs_request (tx, reg);if (tx->size)memcpy_toio (avs_downlink_addr (adev), tx->data, tx->size);
@@ -445,7 +463,7 @@ static int avs_dsp_do_send_msg(struct avs_dev *adev, struct avs_ipc_msg *requestspin_lock (&ipc->rx_lock);avs_ipc_msg_init (ipc, reply); -avs_dsp_send_tx (adev, request); +avs_dsp_send_tx (adev, request, true);spin_unlock (&ipc->rx_lock); ret =avs_ipc_wait_busy_completion (ipc, timeout);
@@ -477,6 +495,7 @@ static int avs_dsp_send_msg_sequence(struct avs_dev *adev, struct avs_ipc_msg *r {int ret; +trace_avs_d0ix ("wake" , wake_d0i0, request->header);if (wake_d0i0) { ret =avs_dsp_wake_d0i0 (adev, request);if (ret)
@@ -487,6 +506,7 @@ static int avs_dsp_send_msg_sequence(struct avs_dev *adev, struct avs_ipc_msg *rif (ret)return ret; +trace_avs_d0ix ("schedule" , schedule_d0ix, request->header);if (schedule_d0ix)avs_dsp_schedule_d0ix (adev, request);
@@ -530,7 +550,11 @@ static int avs_dsp_do_send_rom_msg(struct avs_dev *adev, struct avs_ipc_msg *reqspin_lock (&ipc->rx_lock);avs_ipc_msg_init (ipc,NULL ); -avs_dsp_send_tx (adev, request); +/* +* with hw still stalled, memory windows may not be +* configured properly so avoid accessing SRAM +*/ +avs_dsp_send_tx (adev, request, false);spin_unlock (&ipc->rx_lock);/* ROM messages must be sent before main core is unstalled */
sound/soc/intel/avs/trace.c new file +33 -0
@@ -0,0 +1,33 @@ +// SPDX-License-Identifier: GPL-2.0-only +// +// Copyright(c) 2021-2022 Intel Corporation. All rights reserved. +// +// Author: Cezary Rojewski <[email protected]> +// Amadeusz Slawinski <[email protected]> +// + +#include <linux/types.h> + +#define CREATE_TRACE_POINTS +#include "trace.h" + +#define BYTES_PER_LINE 16 +#define MAX_CHUNK_SIZE ((PAGE_SIZE - 150) /* Place for trace header */ \ + / (2 * BYTES_PER_LINE + 4) /* chars per line */ \ + * BYTES_PER_LINE) + +void trace_avs_msg_payload (const void *data,size_t size) +{ +size_t remaining = size; +size_t offset =0 ; + +while (remaining >0 ) { +u32 chunk; + + chunk =min (remaining, (size_t )MAX_CHUNK_SIZE ); +trace_avs_ipc_msg_payload (data, chunk, offset, size); + + remaining -= chunk; + offset += chunk; + } +}
sound/soc/intel/avs/trace.h new file +158 -0
158 lines not on this page · raw message
Signature · 1 line
2.25.1
kernel test robot
build botRe: [PATCH v2 09/15] ASoC: Intel: avs: Event tracing
I love your patch! Yet something to improve:
Hi Cezary,
I love your patch! Yet something to improve:
[auto build test ERROR on broonie-sound/for-next]
[also build test ERROR on next-20220509]
[cannot apply to tiwai-sound/for-next v5.18-rc6]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/intel-lab-lkp/linux/commits/Cezary-Rojewski/ASoC-Intel-avs-Driver-core-and-PCM-operations/20220509-165656 base: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next config: alpha-allyesconfig (https://download.01.org/0day-ci/archive/20220509/[email protected]/config) compiler: alpha-linux-gcc (GCC) 11.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/22736f1a80f21a1729c0b0169ab6b7d724fab1d7
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Cezary-Rojewski/ASoC-Intel-avs-Driver-core-and-PCM-operations/20220509-165656 git checkout 22736f1a80f21a1729c0b0169ab6b7d724fab1d7
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.3.0 make.cross W=1 O=build_dir ARCH=alpha SHELL=/bin/bash
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
>> sound/soc/intel/avs/trace.c:19:6: error: redefinition of 'trace_avs_msg_payload'
19 | void trace_avs_msg_payload(const void *data, size_t size)
| ^~~~~~~~~~~~~~~~~~~~~
In file included from sound/soc/intel/avs/trace.c:12:
sound/soc/intel/avs/trace.h:41:20: note: previous definition of 'trace_avs_msg_payload' with type 'void(const void *, size_t)' {aka 'void(const void *, long unsigned int)'}
41 | static inline void trace_avs_msg_payload(const void *data, size_t size) {};
| ^~~~~~~~~~~~~~~~~~~~~vim +/trace_avs_msg_payload +19 sound/soc/intel/avs/trace.c
13
14 #define BYTES_PER_LINE 16
15 #define MAX_CHUNK_SIZE ((PAGE_SIZE - 150) /* Place for trace header */ \
16 / (2 * BYTES_PER_LINE + 4) /* chars per line */ \
17 * BYTES_PER_LINE)
18
> 19 void trace_avs_msg_payload(const void *data, size_t size)Signature · 2 lines
0-DAY CI Kernel Test Service https://01.org/lkp
Cezary Rojewski
maintainerPATCH v2 10/15 ASoC: Intel: avs: Replace link_mask usage with i2s_link_mask
In reply to Cezary RojewskiFrom: Piotr Maziarz <[email protected]>
'link_mask' field is intended for SoundWire, I2S should use 'i2s_link_mask' instead.
--- sound/soc/intel/avs/topology.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
sound/soc/intel/avs/topology.c +6 -6
@@ -381,11 +381,11 @@ static int parse_link_formatted_string(struct snd_soc_component *comp, void *ele* Dynamic naming - string formats, e.g.: ssp%d - supported only for * topologies describing single device e.g.: an I2S codec on SSP0. */ -if (hweight_long (mach->link_mask) !=1 ) +if (hweight_long (mach->mach_params.i2s_link_mask) !=1 )return avs_parse_string_token (comp, elem, object, offset);snprintf (val,SNDRV_CTL_ELEM_ID_NAME_MAXLEN , tuple->string, -__ffs (mach->link_mask)); +__ffs (mach->mach_params.i2s_link_mask));return 0 ; }
@@ -1350,8 +1350,8 @@ static int avs_route_load(struct snd_soc_component *comp, int index,u32 port;/* See parse_link_formatted_string() for dynamic naming when(s). */ -if (hweight_long (mach->link_mask) ==1 ) { - port =__ffs (mach->link_mask); +if (hweight_long (mach->mach_params.i2s_link_mask) ==1 ) { + port =__ffs (mach->mach_params.i2s_link_mask);snprintf (buf, len, route->source, port);strncpy ((char *)route->source, buf, len);
@@ -1382,10 +1382,10 @@ static int avs_widget_load(struct snd_soc_component *comp, int index, mach =dev_get_platdata (comp->card->dev);/* See parse_link_formatted_string() for dynamic naming when(s). */ -if (hweight_long (mach->link_mask) ==1 ) { +if (hweight_long (mach->mach_params.i2s_link_mask) ==1 ) {kfree (w->name);/* w->name is freed later by soc_tplg_dapm_widget_create() */ - w->name =kasprintf (GFP_KERNEL , dw->name,__ffs (mach->link_mask)); + w->name =kasprintf (GFP_KERNEL , dw->name,__ffs (mach->mach_params.i2s_link_mask));if (!w->name)return -ENOMEM ; }
Signature · 1 line
2.25.1
Cezary Rojewski
maintainerPATCH v2 11/15 ASoC: Intel: avs: Machine board registration
In reply to Cezary RojewskiAVS driver operates with granular audio card division in mind. Super-card approach (e.g.: I2S, DMIC and HDA DAIs combined) is deprecated in favour of individual cards - one per each device. This provides necessary dynamism, especially for configurations with number of codecs present and makes it easier to survive auxiliary devices failures - one card failing to probe does not prevent others from succeeding.
All boards spawned by AVS are unregistered on ->remove(). This includes dummy codecs such as DMIC.
As all machine boards found in sound/soc/intel/boards are irreversibly tied to 'super-card' approach, new boards are going to be introduced. This temporarily increases number of boards available under /intel directory until skylake-driver becomes deprecated and removed.
--- sound/soc/intel/avs/Makefile | 2 +- sound/soc/intel/avs/avs.h | 3 + sound/soc/intel/avs/board_selection.c | 501 ++++++++++++++++++++++++++ 3 files changed, 505 insertions(+), 1 deletion(-) create mode 100644 sound/soc/intel/avs/board_selection.c
sound/soc/intel/avs/Makefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only snd-soc-avs-objs := dsp.o ipc.o messages.o utils.o core.o loader.o \ - topology.o path.o pcm.o + topology.o path.o pcm.o board_selection.o snd-soc-avs-objs += cldma.o snd-soc-avs-objs += trace.o
sound/soc/intel/avs/avs.h +3 -0
@@ -310,6 +310,9 @@ int avs_i2s_platform_register(struct avs_dev *adev, const char *name, unsigned l unsigned long *tdms);int avs_hda_platform_register (struct avs_dev *adev,const char *name); +int avs_register_all_boards (struct avs_dev *adev); +void avs_unregister_all_boards (struct avs_dev *adev); +/* Firmware tracing helpers */ unsigned int __kfifo_fromio_locked(struct kfifo *fifo, const void __iomem *src, unsigned int len,
sound/soc/intel/avs/board_selection.c new file +501 -0
501 lines not on this page · raw message
Signature · 1 line
2.25.1
kernel test robot
build botRe: [PATCH v2 11/15] ASoC: Intel: avs: Machine board registration
I love your patch! Perhaps something to improve:
Hi Cezary,
I love your patch! Perhaps something to improve:
[auto build test WARNING on broonie-sound/for-next]
[also build test WARNING on next-20220506]
[cannot apply to tiwai-sound/for-next v5.18-rc6]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/intel-lab-lkp/linux/commits/Cezary-Rojewski/ASoC-Intel-avs-Driver-core-and-PCM-operations/20220509-165656 base: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next config: arc-allyesconfig (https://download.01.org/0day-ci/archive/20220509/[email protected]/config) compiler: arceb-elf-gcc (GCC) 11.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/2ef25400a7aee5a8e75c2ccdb5618be31c9f6809
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Cezary-Rojewski/ASoC-Intel-avs-Driver-core-and-PCM-operations/20220509-165656 git checkout 2ef25400a7aee5a8e75c2ccdb5618be31c9f6809
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.3.0 make.cross W=1 O=build_dir ARCH=arc SHELL=/bin/bash sound/soc/intel/avs/
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
In file included from include/linux/device.h:15,
from include/linux/acpi.h:15,
from sound/soc/intel/avs/board_selection.c:9:
sound/soc/intel/avs/board_selection.c: In function 'avs_register_i2s_board':
>> sound/soc/intel/avs/board_selection.c:328:36: warning: format '%ld' expects argument of type 'long int', but argument 5 has type 'int' [-Wformat=]
328 | dev_err(adev->dev, "Platform supports %d SSPs but board %s requires SSP%ld\n",
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/linux/dev_printk.h:110:30: note: in definition of macro 'dev_printk_index_wrap'
110 | _p_func(dev, fmt, ##__VA_ARGS__); \
| ^~~
include/linux/dev_printk.h:144:56: note: in expansion of macro 'dev_fmt'
144 | dev_printk_index_wrap(_dev_err, KERN_ERR, dev, dev_fmt(fmt), ##__VA_ARGS__)
| ^~~~~~~
sound/soc/intel/avs/board_selection.c:328:17: note: in expansion of macro 'dev_err'
328 | dev_err(adev->dev, "Platform supports %d SSPs but board %s requires SSP%ld\n",
| ^~~~~~~
sound/soc/intel/avs/board_selection.c:328:90: note: format string is defined here
328 | dev_err(adev->dev, "Platform supports %d SSPs but board %s requires SSP%ld\n",
| ~~^
| |
| long int
| %dvim +328 sound/soc/intel/avs/board_selection.c
318
319 static int avs_register_i2s_board(struct avs_dev *adev, struct snd_soc_acpi_mach *mach)
320 {
321 struct platform_device *board;
322 int num_ssps;
323 char *name;
324 int ret;
325
326 num_ssps = adev->hw_cfg.i2s_caps.ctrl_count;
327 if (fls(mach->mach_params.i2s_link_mask) > num_ssps) {
> 328 dev_err(adev->dev, "Platform supports %d SSPs but board %s requires SSP%ld\n",
329 num_ssps, mach->drv_name, __fls(mach->mach_params.i2s_link_mask));
330 return -ENODEV;
331 }
332
333 name = devm_kasprintf(adev->dev, GFP_KERNEL, "%s.%d-platform", mach->drv_name,
334 mach->mach_params.i2s_link_mask);
335 if (!name)
336 return -ENOMEM;
337
338 ret = avs_i2s_platform_register(adev, name, mach->mach_params.i2s_link_mask, mach->pdata);
339 if (ret < 0)
340 return ret;
341
342 mach->mach_params.platform = name;
343
344 board = platform_device_register_data(NULL, mach->drv_name, mach->mach_params.i2s_link_mask,
345 (const void *)mach, sizeof(*mach));
346 if (IS_ERR(board)) {
347 dev_err(adev->dev, "ssp board register failed\n");
348 return PTR_ERR(board);
349 }
350
351 ret = devm_add_action(adev->dev, board_pdev_unregister, board);
352 if (ret < 0) {
353 platform_device_unregister(board);
354 return ret;
355 }
356
357 return 0;
358 }
359
Signature · 2 lines
0-DAY CI Kernel Test Service https://01.org/lkp
Re: [PATCH v2 11/15] ASoC: Intel: avs: Machine board registration
Quoted 91 lines · kernel test robot
Hi Cezary,
I love your patch! Perhaps something to improve:
[auto build test WARNING on broonie-sound/for-next]
[also build test WARNING on next-20220506]
[cannot apply to tiwai-sound/for-next v5.18-rc6]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]url: https://github.com/intel-lab-lkp/linux/commits/Cezary-Rojewski/ASoC-Intel-avs-Driver-core-and-PCM-operations/20220509-165656 base: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next config: arc-allyesconfig (https://download.01.org/0day-ci/archive/20220509/[email protected]/config) compiler: arceb-elf-gcc (GCC) 11.3.0reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/2ef25400a7aee5a8e75c2ccdb5618be31c9f6809
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Cezary-Rojewski/ASoC-Intel-avs-Driver-core-and-PCM-operations/20220509-165656 git checkout2ef25400a7aee5a8e75c2ccdb5618be31c9f6809
# save the config file
mkdirbuild_dir&& cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.3.0 make.cross W=1 O=build_dir ARCH=arc SHELL=/bin/bashsound/soc/intel/avs/If you fix the issue, kindly add following tag as appropriate
Reported-by kernel test robot <[email protected]>All warnings (new ones prefixed by >>):
In file included from
include/linux/device.h:15,
frominclude/linux/acpi.h:15,
fromsound/soc/intel/avs/board_selection.c:9:
sound/soc/intel/avs/board_selection.c: In function 'avs_register_i2s_board':Quoted 1 line
Quoted 1 line
sound/soc/intel/avs/board_selection.c:328:36: warning: format '%ld' expects argument of type 'long int', but argument 5 has type 'int' [-Wformat=]328 | dev_err(adev->dev, "Platform supports %d SSPs but board %s requires SSP%ld\n", | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ include/linux/dev_printk.h:110:30: note: in definition of macro 'dev_printk_index_wrap' 110 | _p_func(dev, fmt, ##__VA_ARGS__); \ | ^~~ include/linux/dev_printk.h:144:56: note: in expansion of macro 'dev_fmt' 144 | dev_printk_index_wrap(_dev_err, KERN_ERR, dev, dev_fmt(fmt), ##__VA_ARGS__) | ^~~~~~~ sound/soc/intel/avs/board_selection.c:328:17: note: in expansion of macro 'dev_err' 328 | dev_err(adev->dev, "Platform supports %d SSPs but board %s requires SSP%ld\n", | ^~~~~~~ sound/soc/intel/avs/board_selection.c:328:90: note: format string is defined here 328 | dev_err(adev->dev, "Platform supports %d SSPs but board %s requires SSP%ld\n", | ~~^ | | | long int | %dvim +328
sound/soc/intel/avs/board_selection.c318 319 static int avs_register_i2s_board(struct avs_dev *adev, struct snd_soc_acpi_mach *mach) 320 { 321 struct platform_device *board; 322 int num_ssps; 323 char *name; 324 int ret; 325 326 num_ssps = adev->hw_cfg.i2s_caps.ctrl_count; 327 if (fls(mach->mach_params.i2s_link_mask) > num_ssps) {Quoted 1 line
328 dev_err(adev->dev, "Platform supports %d SSPs but board %s requires SSP%ld\n",
329 num_ssps, mach->drv_name, __fls(mach->mach_params.i2s_link_mask)); 330 return -ENODEV; 331 } 332 333 name = devm_kasprintf(adev->dev, GFP_KERNEL, "%s.%d-platform", mach->drv_name, 334 mach->mach_params.i2s_link_mask); 335 if (!name) 336 return -ENOMEM; 337 338 ret = avs_i2s_platform_register(adev, name, mach->mach_params.i2s_link_mask, mach->pdata); 339 if (ret < 0) 340 return ret; 341 342 mach->mach_params.platform = name; 343 344 board = platform_device_register_data(NULL, mach->drv_name, mach->mach_params.i2s_link_mask, 345 (const void *)mach, sizeof(*mach)); 346 if (IS_ERR(board)) { 347 dev_err(adev->dev, "ssp board register failed\n"); 348 return PTR_ERR(board); 349 } 350 351 ret = devm_add_action(adev->dev, board_pdev_unregister, board);
Quoted 9 lines
352 if (ret < 0) {
353 platform_device_unregister(board);
354 return ret;
355 }
356
357 return 0;
358 }
359 Kernel test robot warns us about __fls and it is right, as __fls depending on architecture returns either unsigned int or unsigned long.
But I would say that this seems questionable, as I would expect consistent return value between arches, especially for functions where we operate on bits and probably don't want inconsistent results.
Generic asm header [1] seems to suggest that it should accept unsigned long as parameter and return unsigned long. It seems however that arc accepts unsigned long as argument and returns int, while m68k uses int for argument and return value...
Adding relevant architecture maintainers to CC.
Re: [PATCH v2 11/15] ASoC: Intel: avs: Machine board registration
Quoted 142 lines · Amadeusz Sławiński
Quoted 120 lines · kernel test robot
Hi Cezary,
I love your patch! Perhaps something to improve:
[auto build test WARNING on broonie-sound/for-next]
[also build test WARNING on next-20220506]
[cannot apply to tiwai-sound/for-next v5.18-rc6]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]url:
https://github.com/intel-lab-lkp/linux/commits/Cezary-Rojewski/ASoC-Intel-avs-Driver-core-and-PCM-operations/20220509-165656
base:
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
for-next
config: arc-allyesconfig
(https://download.01.org/0day-ci/archive/20220509/202205091954.7hT2TBhd-lkp(a)intel.com/config)
compiler: arceb-elf-gcc (GCC) 11.3.0
reproduce (this is a W=1 build):
wget
https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross
-O ~/bin/make.cross
chmod +x ~/bin/make.cross
#
https://github.com/intel-lab-lkp/linux/commit/2ef25400a7aee5a8e75c2ccdb5618be31c9f6809
git remote add linux-review
https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Cezary-Rojewski/ASoC-Intel-avs-Driver-core-and-PCM-operations/20220509-165656 git checkout2ef25400a7aee5a8e75c2ccdb5618be31c9f6809# save the config file mkdir build_dir && cp config build_dir/.config COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.3.0 make.cross W=1 O=build_dir ARCH=arc SHELL=/bin/bash sound/soc/intel/avs/If you fix the issue, kindly add following tag as appropriate
Reported-by kernel test robot <[email protected]>All warnings (new ones prefixed by >>):
In file included from
include/linux/device.h:15, frominclude/linux/acpi.h:15,
fromsound/soc/intel/avs/board_selection.c:9:
sound/soc/intel/avs/board_selection.c: In function 'avs_register_i2s_board':Quoted 3 lines
Quoted 3 lines
sound/soc/intel/avs/board_selection.c:328:36: warning: format '%ld' expects argument of type 'long int', but argument 5 has type 'int' [-Wformat=]328 | dev_err(adev->dev, "Platform supports %d SSPs but board %s requires SSP%ld\n",
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~include/linux/dev_printk.h:110:30: note: in definition of macro 'dev_printk_index_wrap'
110 |_p_func(dev, fmt, ##__VA_ARGS__); \
| ^~~include/linux/dev_printk.h:144:56: note: in expansion of macro 'dev_fmt'
144 |dev_printk_index_wrap(_dev_err, KERN_ERR, dev, dev_fmt(fmt), ##__VA_ARGS__)
| ^~~~~~~sound/soc/intel/avs/board_selection.c:328:17: note: in expansion of macro 'dev_err'
328 | dev_err(adev->dev, "Platform supports %d SSPs but board %s requires SSP%ld\n",
| ^~~~~~~sound/soc/intel/avs/board_selection.c:328:90: note: format string is defined here
328 | dev_err(adev->dev, "Platform supports %d SSPs but board %s requires SSP%ld\n",| ~~^ | | | long int | %dvim +328
sound/soc/intel/avs/board_selection.c318
319 static intavs_register_i2s_board(struct avs_dev *adev, struct snd_soc_acpi_mach *mach)
320 {
321 structplatform_device*board;
322 intnum_ssps;
323 char *name;
324 int ret;
325
326num_ssps=adev->hw_cfg.i2s_caps.ctrl_count; 327 if (fls(mach->mach_params.i2s_link_mask)>num_ssps) { > 328 dev_err(adev->dev, "Platform supports %d SSPs but board %s requires SSP%ld\n",
329num_ssps,mach->drv_name,__fls(mach->mach_params.i2s_link_mask));
330 return-ENODEV;
331 }
332
333 name = devm_kasprintf(adev->dev,GFP_KERNEL, "%s.%d-platform",mach->drv_name,
334mach->mach_params.i2s_link_mask);
335 if (!name)
336 return-ENOMEM;
337
338 ret =avs_i2s_platform_register(adev, name, mach->mach_params.i2s_link_mask, mach->pdata);
339 if (ret < 0)
340 return ret;
341
342mach->mach_params.platform= name;
343
344 board = platform_device_register_data(NULL,mach->drv_name,mach->mach_params.i2s_link_mask,
345 (const void *)mach,sizeof(*mach)); 346 if (IS_ERR(board)) {
347dev_err(adev->dev, "ssp board register failed\n"); 348 returnPTR_ERR(board);
349 }
350
351 ret =devm_add_action(adev->dev, board_pdev_unregister, board);Quoted 9 lines
352 if (ret < 0) {
353platform_device_unregister(board); 354 return ret;
355 }
356
357 return 0;
358 }
359Kernel test robot warns us about
__flsand it is right, as__flsdepending on architecture returns either unsigned int or unsigned long. But I would say that this seems questionable, as I would expect consistent return value between arches, especially for functions where we operate on bits and probably don't want inconsistent results.Generic asm header [1] seems to suggest that it should accept unsigned long as parameter and return unsigned long. It seems however that arc accepts unsigned long as argument and returns int, while m68k uses int for argument and return value...
Quoted 4 lines
Adding relevant architecture maintainers to CC.
In generic code __fls() returns long, while fls() return int, which is weird as well. Anyhow for this error, ARC indeed needs fixing. Do u want to send a patch ?
Thx,
-Vineet
Cezary Rojewski
maintainerRe: [PATCH v2 11/15] ASoC: Intel: avs: Machine board registration
Quoted 14 lines · Vineet Gupta
Quoted 13 lines · Amadeusz Sławiński
Quoted 12 lines · kernel test robot
Hi Cezary,
I love your patch! Perhaps something to improve:
[auto build test WARNING on broonie-sound/for-next]
[also build test WARNING on next-20220506]
[cannot apply to tiwai-sound/for-next v5.18-rc6]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
...
Quoted 5 lines
Quoted 5 lines
Kernel test robot warns us about
__flsand it is right, as__flsdepending on architecture returns either unsigned int or unsigned long.
But I would say that this seems questionable, as I would expect consistent return value between arches, especially for functions where we operate on bits and probably don't want inconsistent results.Generic asm header [1] seems to suggest that it should accept unsigned long as parameter and return unsigned long. It seems however that arc accepts unsigned long as argument and returns int, while m68k uses int for argument and return value...
Quoted 7 lines
Quoted 4 lines
Adding relevant architecture maintainers to CC.
In generic code
__fls()returns long, whilefls()return int, which is weird as well. Anyhow for this error, ARC indeed needs fixing. Do u want to send a patch ?
Thanks for your input, Vineet. Yes, either me or Amadeo will address the problem with a separate change. Consequently, this means we won't be addressing the warning reported here by the kernel test bot.
Regards,
Czarek
Cezary Rojewski
maintainerPATCH v2 12/15 ASoC: Intel: avs: PCI driver implementation
In reply to Cezary RojewskiHD-Audio bus is a PCI device. Add all functions necessary to probe such device along with its removal sequence. Behaviour implemented for all standard operations is similar to existing solutions: sound/pci/hda and sound/soc/intel/skylake.
--- include/sound/intel-dsp-config.h | 3 +- sound/soc/intel/Kconfig | 1 + sound/soc/intel/avs/avs.h | 1 + sound/soc/intel/avs/core.c | 494 +++++++++++++++++++++++++++++++ sound/soc/intel/avs/dsp.c | 3 - sound/soc/intel/avs/registers.h | 1 + 6 files changed, 499 insertions(+), 4 deletions(-)
include/sound/intel-dsp-config.h +2 -1
@@ -15,7 +15,8 @@ enum {SND_INTEL_DSP_DRIVER_LEGACY ,SND_INTEL_DSP_DRIVER_SST ,SND_INTEL_DSP_DRIVER_SOF , - SND_INTEL_DSP_DRIVER_LAST = SND_INTEL_DSP_DRIVER_SOF +SND_INTEL_DSP_DRIVER_AVS , + SND_INTEL_DSP_DRIVER_LAST = SND_INTEL_DSP_DRIVER_AVS };#if IS_ENABLED (CONFIG_SND_INTEL_DSP_CONFIG )
sound/soc/intel/Kconfig +1 -0
@@ -216,6 +216,7 @@ config SND_SOC_INTEL_AVS depends on COMMON_CLK select SND_SOC_ACPI if ACPI select SND_SOC_TOPOLOGY + select SND_HDA select SND_HDA_EXT_CORE select SND_HDA_DSP_LOADER select SND_INTEL_DSP_CONFIG
sound/soc/intel/avs/avs.h +1 -0
@@ -126,6 +126,7 @@ struct avs_dev {char **lib_names;struct completion fw_ready; +struct work_struct probe_work;struct nhlt_acpi_table *nhlt;struct list_head comp_list;
sound/soc/intel/avs/core.c +494 -0
506 lines not on this page · raw message
sound/soc/intel/avs/dsp.c +0 -3
@@ -6,7 +6,6 @@// Amadeusz Slawinski <[email protected]> // -#include <linux/module.h> #include <sound/hdaudio_ext.h> #include "avs.h" #include "registers.h"
@@ -322,5 +321,3 @@ int avs_dsp_delete_pipeline(struct avs_dev *adev, u8 instance_id)ida_free (&adev->ppl_ida, instance_id);return ret; } - -MODULE_LICENSE ("GPL" );
sound/soc/intel/avs/registers.h +1 -0
@@ -14,6 +14,7 @@#define AZX_PGCTL_LSRMD_MASK BIT(4)#define AZX_CGCTL_MISCBDCGE_MASK BIT(6)#define AZX_VS_EM2_L1SEN BIT(13) +#define AZX_VS_EM2_DUM BIT(23)/* Intel HD Audio General DSP Registers */ #define AVS_ADSP_GEN_BASE 0x0
Signature · 1 line
2.25.1
Cezary Rojewski
maintainerPATCH v2 13/15 ASoC: Intel: avs: Power management
In reply to Cezary RojewskiTo preserve power during sleep operations, handle suspend (S3), hibernation (S4) and runtime (RTD3) transitions. As flow for all of is shared, define common handlers to reduce code size.
--- sound/soc/intel/avs/core.c | 101 +++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+)
sound/soc/intel/avs/core.c +101 -0
@@ -536,6 +536,104 @@ static void avs_pci_remove(struct pci_dev *pci)pm_runtime_get_noresume (&pci->dev); } +static int __maybe_unused avs_suspend_common (struct avs_dev *adev) +{ +struct hdac_bus *bus = &adev->base.core; +int ret; + +flush_work (&adev->probe_work); + +snd_hdac_ext_bus_link_power_down_all (bus); + + ret =avs_ipc_set_dx (adev,AVS_MAIN_CORE_MASK , false); +/* +* pm_runtime is blocked on DSP failure but system-wide suspend is not. +* Do not block entire system from suspending if that's the case. +*/ +if (ret && ret != -EPERM ) { +dev_err (adev->dev,"set dx failed: %d\n" , ret); +return AVS_IPC_RET (ret); + } + +avs_dsp_op (adev, int_control, false); +snd_hdac_ext_bus_ppcap_int_enable (bus, false); + + ret =avs_dsp_core_disable (adev,AVS_MAIN_CORE_MASK ); +if (ret <0 ) { +dev_err (adev->dev,"core_mask %ld disable failed: %d\n" ,AVS_MAIN_CORE_MASK , ret); +return ret; + } + +snd_hdac_ext_bus_ppcap_enable (bus, false); +/* disable LP SRAM retention */ +avs_hda_power_gating_enable (adev, false); +snd_hdac_bus_stop_chip (bus); +/* disable CG when putting controller to reset */ +avs_hdac_clock_gating_enable (bus, false); +snd_hdac_bus_enter_link_reset (bus); +avs_hdac_clock_gating_enable (bus, true); + +snd_hdac_display_power (bus,HDA_CODEC_IDX_CONTROLLER , false); + +return 0 ; +} + +static int __maybe_unused avs_resume_common (struct avs_dev *adev,bool purge) +{ +struct hdac_bus *bus = &adev->base.core; +struct hdac_ext_link *hlink; +int ret; + +snd_hdac_display_power (bus,HDA_CODEC_IDX_CONTROLLER , true); +avs_hdac_bus_init_chip (bus, true); + +snd_hdac_ext_bus_ppcap_enable (bus, true); +snd_hdac_ext_bus_ppcap_int_enable (bus, true); + + ret =avs_dsp_boot_firmware (adev, purge); +if (ret <0 ) { +dev_err (adev->dev,"firmware boot failed: %d\n" , ret); +return ret; + } + +/* turn off the links that were off before suspend */ +list_for_each_entry (hlink, &bus->hlink_list, list) { +if (!hlink->ref_count) +snd_hdac_ext_bus_link_power_down (hlink); + } + +/* check dma status and clean up CORB/RIRB buffers */ +if (!bus->cmd_dma_state) +snd_hdac_bus_stop_cmd_io (bus); + +return 0 ; +} + +static int __maybe_unused avs_suspend (struct device *dev) +{ +return avs_suspend_common (to_avs_dev (dev)); +} + +static int __maybe_unused avs_resume (struct device *dev) +{ +return avs_resume_common (to_avs_dev (dev), true); +} + +static int __maybe_unused avs_runtime_suspend (struct device *dev) +{ +return avs_suspend_common (to_avs_dev (dev)); +} + +static int __maybe_unused avs_runtime_resume (struct device *dev) +{ +return avs_resume_common (to_avs_dev (dev), true); +} + +static const struct dev_pm_ops avs_dev_pm = { + SET_SYSTEM_SLEEP_PM_OPS(avs_suspend, avs_resume) +SET_RUNTIME_PM_OPS (avs_runtime_suspend, avs_runtime_resume,NULL ) +}; +static const struct pci_device_id avs_ids[] = { {0 } };
@@ -546,6 +644,9 @@ static struct pci_driver avs_pci_driver = { .id_table = avs_ids, .probe = avs_pci_probe, .remove = avs_pci_remove, + .driver = { + .pm = &avs_dev_pm, + }, };module_pci_driver (avs_pci_driver);
Signature · 1 line
2.25.1
Cezary Rojewski
maintainerPATCH v2 14/15 ASoC: Intel: avs: SKL-based platforms support
In reply to Cezary RojewskiDefine handlers specific to cAVS 1.5 platforms, that is SKL, KBL, AML and all other variants based on this very version of AudioDSP architecture. Most are specific to SKL-alike platforms with only skl_log_buffer_offset() being exposed and used later by younger equivalents.
--- sound/soc/intel/avs/Makefile | 1 + sound/soc/intel/avs/avs.h | 4 + sound/soc/intel/avs/core.c | 18 +++++ sound/soc/intel/avs/messages.h | 18 +++++ sound/soc/intel/avs/registers.h | 4 + sound/soc/intel/avs/skl.c | 125 ++++++++++++++++++++++++++++++++ 6 files changed, 170 insertions(+) create mode 100644 sound/soc/intel/avs/skl.c
sound/soc/intel/avs/Makefile +1 -0
@@ -3,6 +3,7 @@ snd-soc-avs-objs := dsp.o ipc.o messages.o utils.o core.o loader.o \ topology.o path.o pcm.o board_selection.o snd-soc-avs-objs += cldma.o +snd-soc-avs-objs += skl.o snd-soc-avs-objs += trace.o # tell define_trace.h where to find the trace header
sound/soc/intel/avs/avs.h +4 -0
@@ -56,6 +56,8 @@ struct avs_dsp_ops {#define avs_dsp_op (adev, op, ...) \ ((adev)->spec->dsp_ops->op(adev, ## __VA_ARGS__)) +extern const struct avs_dsp_ops skl_dsp_ops; +#define AVS_PLATATTR_CLDMA BIT_ULL(0)#define AVS_PLATATTR_IMR BIT_ULL(1)
@@ -249,6 +251,8 @@ void avs_ipc_block(struct avs_ipc *ipc);int avs_dsp_disable_d0ix (struct avs_dev *adev);int avs_dsp_enable_d0ix (struct avs_dev *adev); +int skl_log_buffer_offset (struct avs_dev *adev,u32 core); +/* Firmware resources management */ int avs_get_module_entry (struct avs_dev *adev,const guid_t *uuid,struct avs_module_entry *entry);
sound/soc/intel/avs/core.c +18 -0
@@ -634,7 +634,25 @@ static const struct dev_pm_ops avs_dev_pm = { SET_RUNTIME_PM_OPS(avs_runtime_suspend, avs_runtime_resume, NULL) }; +static const struct avs_spec skl_desc = { + .name ="skl" , + .min_fw_version = { + .major =9 , + .minor =21 , + .hotfix =0 , + .build =4732 , + }, + .dsp_ops = &skl_dsp_ops, + .core_init_mask =1 , + .attributes =AVS_PLATATTR_CLDMA , + .sram_base_offset =SKL_ADSP_SRAM_BASE_OFFSET , + .sram_window_size =SKL_ADSP_SRAM_WINDOW_SIZE , + .rom_status =SKL_ADSP_SRAM_BASE_OFFSET , +}; +static const struct pci_device_id avs_ids[] = { + {PCI_VDEVICE (INTEL ,0x9d70 ), (unsigned long )&skl_desc },/* SKL */ + {PCI_VDEVICE (INTEL ,0x9d71 ), (unsigned long )&skl_desc },/* KBL */ {0 } };MODULE_DEVICE_TABLE (pci, avs_ids);
sound/soc/intel/avs/messages.h +18 -0
@@ -347,6 +347,24 @@ enum avs_log_enable {AVS_LOG_ENABLE =1 }; +enum avs_skl_log_priority { +AVS_SKL_LOG_CRITICAL =1 , +AVS_SKL_LOG_HIGH , +AVS_SKL_LOG_MEDIUM , +AVS_SKL_LOG_LOW , +AVS_SKL_LOG_VERBOSE , +}; + +struct skl_log_state { +u32 enable; +u32 min_priority; +} __packed; + +struct skl_log_state_info { +u32 core_mask; +struct skl_log_state logs_core[]; +} __packed; +int avs_ipc_set_enable_logs (struct avs_dev *adev,u8 *log_info,size_t size);struct avs_fw_version {
sound/soc/intel/avs/registers.h +4 -0
@@ -48,6 +48,10 @@#define SKL_ADSP_HIPCIE_DONE BIT(30)#define SKL_ADSP_HIPCT_BUSY BIT(31) +/* Intel HD Audio SRAM windows base addresses */ +#define SKL_ADSP_SRAM_BASE_OFFSET 0x8000 +#define SKL_ADSP_SRAM_WINDOW_SIZE 0x2000 +/* Constants used when accessing SRAM, space shared with firmware */ #define AVS_FW_REG_BASE (adev) ((adev)->spec->sram_base_offset)#define AVS_FW_REG_STATUS (adev) (AVS_FW_REG_BASE(adev) + 0x0)
sound/soc/intel/avs/skl.c new file +125 -0
125 lines not on this page · raw message
Signature · 1 line
2.25.1
Cezary Rojewski
maintainerPATCH v2 15/15 ASoC: Intel: avs: APL-based platforms support
In reply to Cezary RojewskiDefine handlers specific to cAVS 1.5+ platforms, that is, APL and similar platforms. These differ from SKL-alike ones in terms of AudioDSP firmware generation and thus the '+' suffix. Introduciton of IMR, removal of CLDMA, D0IX support and monolithic-ation of library/module code are most impactful but are not the only changes brought with this newer generation. Some generic and 1.5 operations are being re-used to reduce code size.
--- sound/soc/intel/avs/Makefile | 2 +- sound/soc/intel/avs/apl.c | 250 ++++++++++++++++++++++++++++++++ sound/soc/intel/avs/avs.h | 13 ++ sound/soc/intel/avs/core.c | 18 +++ sound/soc/intel/avs/loader.c | 4 + sound/soc/intel/avs/messages.h | 7 + sound/soc/intel/avs/registers.h | 2 + 7 files changed, 295 insertions(+), 1 deletion(-) create mode 100644 sound/soc/intel/avs/apl.c
sound/soc/intel/avs/Makefile +1 -1
@@ -3,7 +3,7 @@ snd-soc-avs-objs := dsp.o ipc.o messages.o utils.o core.o loader.o \ topology.o path.o pcm.o board_selection.o snd-soc-avs-objs += cldma.o -snd-soc-avs-objs += skl.o +snd-soc-avs-objs += skl.o apl.o snd-soc-avs-objs += trace.o # tell define_trace.h where to find the trace header
sound/soc/intel/avs/apl.c new file +250 -0
250 lines not on this page · raw message
sound/soc/intel/avs/avs.h +13 -0
@@ -57,6 +57,7 @@ struct avs_dsp_ops { ((adev)->spec->dsp_ops->op(adev, ## __VA_ARGS__))extern const struct avs_dsp_ops skl_dsp_ops; +extern const struct avs_dsp_ops apl_dsp_ops;#define AVS_PLATATTR_CLDMA BIT_ULL(0)#define AVS_PLATATTR_IMR BIT_ULL(1)
@@ -333,4 +334,16 @@ unsigned int __kfifo_fromio_locked(struct kfifo *fifo, const void __iomem *src, (avs_sram_addr (adev,AVS_DEBUG_WINDOW ) + __offset); \ }) +struct apl_log_buffer_layout { +u32 read_ptr; +u32 write_ptr; +u8 buffer[]; +} __packed; + +#define apl_log_payload_size (adev) \ + (avs_log_buffer_size(adev) - sizeof(struct apl_log_buffer_layout)) + +#define apl_log_payload_addr (addr) \ + (addr + sizeof(struct apl_log_buffer_layout)) +#endif /* __SOUND_SOC_INTEL_AVS_H */
sound/soc/intel/avs/core.c +18 -0
@@ -650,9 +650,27 @@ static const struct avs_spec skl_desc = { .rom_status = SKL_ADSP_SRAM_BASE_OFFSET, }; +static const struct avs_spec apl_desc = { + .name ="apl" , + .min_fw_version = { + .major =9 , + .minor =22 , + .hotfix =1 , + .build =4323 , + }, + .dsp_ops = &apl_dsp_ops, + .core_init_mask =3 , + .attributes =AVS_PLATATTR_IMR , + .sram_base_offset =APL_ADSP_SRAM_BASE_OFFSET , + .sram_window_size =APL_ADSP_SRAM_WINDOW_SIZE , + .rom_status =APL_ADSP_SRAM_BASE_OFFSET , +}; +static const struct pci_device_id avs_ids[] = { {PCI_VDEVICE (INTEL ,0x9d70 ), (unsigned long )&skl_desc },/* SKL */ {PCI_VDEVICE (INTEL ,0x9d71 ), (unsigned long )&skl_desc },/* KBL */ + {PCI_VDEVICE (INTEL ,0x5a98 ), (unsigned long )&apl_desc },/* APL */ + {PCI_VDEVICE (INTEL ,0x3198 ), (unsigned long )&apl_desc },/* GML */ {0 } };MODULE_DEVICE_TABLE (pci, avs_ids);
sound/soc/intel/avs/loader.c +4 -0
@@ -37,6 +37,8 @@#define AVS_EXT_MANIFEST_MAGIC 0x31454124#define SKL_MANIFEST_MAGIC 0x00000006#define SKL_ADSPFW_OFFSET 0x284 +#define APL_MANIFEST_MAGIC 0x44504324 +#define APL_ADSPFW_OFFSET 0x2000/* Occasionally, engineering (release candidate) firmware is provided for testing. */ static bool debug_ignore_fw_version;
@@ -87,6 +89,8 @@ static int avs_fw_manifest_offset(struct firmware *fw)switch (magic) {case SKL_MANIFEST_MAGIC :return SKL_ADSPFW_OFFSET ; +case APL_MANIFEST_MAGIC : +return APL_ADSPFW_OFFSET ;default :return -EINVAL ; }
sound/soc/intel/avs/messages.h +7 -0
@@ -365,6 +365,13 @@ struct skl_log_state_info {struct skl_log_state logs_core[]; } __packed; +struct apl_log_state_info { +u32 aging_timer_period; +u32 fifo_full_timer_period; +u32 core_mask; +struct skl_log_state logs_core[]; +} __packed; +int avs_ipc_set_enable_logs (struct avs_dev *adev,u8 *log_info,size_t size);struct avs_fw_version {
sound/soc/intel/avs/registers.h +2 -0
@@ -51,6 +51,8 @@/* Intel HD Audio SRAM windows base addresses */ #define SKL_ADSP_SRAM_BASE_OFFSET 0x8000#define SKL_ADSP_SRAM_WINDOW_SIZE 0x2000 +#define APL_ADSP_SRAM_BASE_OFFSET 0x80000 +#define APL_ADSP_SRAM_WINDOW_SIZE 0x20000/* Constants used when accessing SRAM, space shared with firmware */ #define AVS_FW_REG_BASE (adev) ((adev)->spec->sram_base_offset)
Signature · 1 line
2.25.1
Mark Brown
maintainerQuoted 11 lines · Cezary Rojewski
Part three of main AVS driver series. This series was originally part of the initial series which was later divided [1] into smaller, easier-to-review chunks. Thus, many patches found here were already present on the list.
This series consists of code typical to many drivers - PCI driver operations, trace ability, PM operations - as well as PCM handlers for all standard audio interfaces, that is, HDA, I2S and DMIC are found here.
[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[01/15] ASoC: Intel: avs: Account for libraries when booting basefw
commit: 81a299105d69344233e6aed8565522da9beec99e
[02/15] ASoC: Intel: avs: Generic soc component driver
commit: f1b3b320bd6519b16e3480f74f2926d106e3bcba
[03/15] ASoC: Intel: avs: Generic PCM FE operations
commit: 9114700b496c6ce16ad6fc0073f0502cd0f46991
[04/15] ASoC: Intel: avs: non-HDA PCM BE operations
commit: b9062f9867f0e601c64e973e2eecda37ccac2ee8
[05/15] ASoC: Intel: avs: HDA PCM BE operations
commit: d070002a20fc071c6f14c2fd8ff5ebeabead8d2a
[06/15] ASoC: Intel: avs: Coredump and recovery flow
commit: 2f1f570cd730c81807ae143a83766068dd82d577
[07/15] ASoC: Intel: avs: Prepare for firmware tracing
commit: 4b86115cb91a3d34ce7da87b734572ce6063babc
[08/15] ASoC: Intel: avs: D0ix power state support
commit: 335c4cbd201d4b74942ff37e6c644d56b9247df3
[09/15] ASoC: Intel: avs: Event tracing
commit: 69b23b3937a1a1019f3d34696897d89f2d987edf
[10/15] ASoC: Intel: avs: Replace link_mask usage with i2s_link_mask
commit: 25b552f192877bec5aea44a6b060a36f78de9675
[11/15] ASoC: Intel: avs: Machine board registration
commit: beed983621fbdfd291e6e3a0cdc4d10517e60af8
[12/15] ASoC: Intel: avs: PCI driver implementation
commit: 1affc44ea5dd554c103e0ce1e809f3aa5d942349
[13/15] ASoC: Intel: avs: Power management
commit: cfbc100e6bbfd01a56bb83fe796318a02dc18ce4
[14/15] ASoC: Intel: avs: SKL-based platforms support
commit: b3e29075b2346564f1bef7f8e19a1a7fcbcf7ed8
[15/15] ASoC: Intel: avs: APL-based platforms support
commit: c8c960c109716d96cfd1de65396fb8021eed4202All 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