ASoC: Intel: Skylake: Driver fundaments overhaul
Subsystems (3)
Cezary Rojewski
maintainercover ASoC: Intel: Skylake: Driver fundaments overhaul
Skylake driver is divided into two modules:
- snd_soc_skl
- snd_soc_skl_ipc
and nothing would be wrong if not for the fact that both cannot exist without one another. IPC module is not some kind of extension, as it is the case for snd_hda_ext_core which is separated from snd_hda_core - legacy hda interface. It's as much core Skylake module as snd_soc_skl is.
Statement backup by existence of circular dependency between this two. To eliminate said problem, struct skl_sst has been created. From that momment, Skylake has been plagued by header errors (incomplete sturcts, unknown references etc.) whenever something new is to be added or code is cleaned up.
Fix this flawed design by merging snd_soc_skl and snd_soc_skl_ipc. Also, do not forget about struct skl_sst redundancy. Followup changes address harmful assumptions and false logic which driver currently implements e.g.: attempt to take role of master for DSP scheduling when in fact entire control takes place in DSP.
Amadeusz Sławiński (2):
ASoC: Intel: Skylake: Combine snd_soc_skl_ipc and snd_soc_skl
ASoC: Intel: Skylake: Do not disable FW notifications
Cezary Rojewski (5):
ASoC: Intel: Skylake: Merge skl_sst and skl into skl_dev struct
ASoC: Intel: Skylake: Remove MCPS available check
ASoC: Intel: Skylake: Remove memory available check
ASoC: Intel: Skylake: Make MCPS and CPS params obsolete
ASoC: Intel: Skylake: Cleanup skl_module_cfg declaration
sound/soc/intel/common/sst-ipc.h | 1 + sound/soc/intel/skylake/Makefile | 12 +- sound/soc/intel/skylake/bxt-sst.c | 50 +-- sound/soc/intel/skylake/cnl-sst-dsp.h | 7 +- sound/soc/intel/skylake/cnl-sst.c | 37 +- sound/soc/intel/skylake/skl-debug.c | 14 +- sound/soc/intel/skylake/skl-messages.c | 245 ++++++------- sound/soc/intel/skylake/skl-nhlt.c | 18 +- sound/soc/intel/skylake/skl-pcm.c | 74 ++-- sound/soc/intel/skylake/skl-ssp-clk.c | 4 +- sound/soc/intel/skylake/skl-sst-dsp.c | 10 +- sound/soc/intel/skylake/skl-sst-dsp.h | 29 +- sound/soc/intel/skylake/skl-sst-ipc.c | 8 +- sound/soc/intel/skylake/skl-sst-ipc.h | 52 +-- sound/soc/intel/skylake/skl-sst-utils.c | 37 +- sound/soc/intel/skylake/skl-sst.c | 51 +-- sound/soc/intel/skylake/skl-topology.c | 441 ++++++++---------------- sound/soc/intel/skylake/skl-topology.h | 43 +-- sound/soc/intel/skylake/skl.c | 54 +-- sound/soc/intel/skylake/skl.h | 102 ++++-- 20 files changed, 546 insertions(+), 743 deletions(-)
Signature · 6 lines
2.17.1 _______________________________________________ Alsa-devel mailing list [email protected] https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Cezary Rojewski
maintainerPATCH 1/7 ASoC: Intel: Skylake: Merge skl_sst and skl into skl_dev struct
Skylake driver is divided into two modules:
- snd_soc_skl
- snd_soc_skl_ipc
and nothing would be wrong if not for the fact that both cannot exist without one another. IPC module is not some kind of extension, as it is the case for snd_hda_ext_core which is separated from snd_hda_core - legacy hda interface. It's as much core Skylake module as snd_soc_skl is.
Statement backed up by existence of circular dependency between this two. To eliminate said problem, struct skl_sst has been created. From that very momment, Skylake has been plagued by header errors (incomplete structs, unknown references etc.) whenever something new is to be added or code is cleaned up.
As this design is being corrected, struct skl_sst is no longer needed, so combine it with struct skl. To avoid ambiguity when searching for skl stuff (struct skl *skl) it has also been renamed to skl_dev.
No functional changes.
--- sound/soc/intel/common/sst-ipc.h | 1 + sound/soc/intel/skylake/bxt-sst.c | 50 ++-- sound/soc/intel/skylake/cnl-sst-dsp.h | 7 +- sound/soc/intel/skylake/cnl-sst.c | 37 ++- sound/soc/intel/skylake/skl-debug.c | 8 +- sound/soc/intel/skylake/skl-messages.c | 229 +++++++++-------- sound/soc/intel/skylake/skl-nhlt.c | 18 +- sound/soc/intel/skylake/skl-pcm.c | 75 +++--- sound/soc/intel/skylake/skl-ssp-clk.c | 4 +- sound/soc/intel/skylake/skl-sst-dsp.c | 10 +- sound/soc/intel/skylake/skl-sst-dsp.h | 30 +-- sound/soc/intel/skylake/skl-sst-ipc.c | 8 +- sound/soc/intel/skylake/skl-sst-ipc.h | 52 +--- sound/soc/intel/skylake/skl-sst-utils.c | 37 ++- sound/soc/intel/skylake/skl-sst.c | 51 ++-- sound/soc/intel/skylake/skl-topology.c | 320 ++++++++++++------------ sound/soc/intel/skylake/skl-topology.h | 32 +-- sound/soc/intel/skylake/skl.c | 54 ++-- sound/soc/intel/skylake/skl.h | 94 +++++-- 19 files changed, 545 insertions(+), 572 deletions(-)
sound/soc/intel/common/sst-ipc.h +1 -0
@@ -35,6 +35,7 @@ struct ipc_message { };struct sst_generic_ipc ; +struct sst_dsp ;struct sst_plat_ipc_ops {void (*tx_msg)(struct sst_generic_ipc *,struct ipc_message *);
sound/soc/intel/skylake/bxt-sst.c +25 -25
137 lines not on this page · raw message
sound/soc/intel/skylake/cnl-sst-dsp.h +3 -4
@@ -9,7 +9,6 @@#define __CNL_SST_DSP_H__struct sst_dsp ; -struct skl_sst ;struct sst_dsp_device ;struct sst_generic_ipc ;
@@ -97,8 +96,8 @@ void cnl_ipc_free(struct sst_generic_ipc *ipc);int cnl_sst_dsp_init (struct device *dev,void __iomem *mmio_base,int irq,const char *fw_name,struct skl_dsp_loader_ops dsp_ops, -struct skl_sst **dsp); -int cnl_sst_init_fw (struct device *dev,struct skl_sst *ctx); -void cnl_sst_dsp_cleanup (struct device *dev,struct skl_sst *ctx); +struct skl_dev **dsp); +int cnl_sst_init_fw (struct device *dev,struct skl_dev *skl); +void cnl_sst_dsp_cleanup (struct device *dev,struct skl_dev *skl);#endif /*__CNL_SST_DSP_H__*/
sound/soc/intel/skylake/cnl-sst.c +18 -19
@@ -24,8 +24,7 @@#include "../common/sst-dsp-priv.h" #include "../common/sst-ipc.h" #include "cnl-sst-dsp.h" -#include "skl-sst-dsp.h" -#include "skl-sst-ipc.h" +#include "skl.h" #define CNL_FW_ROM_INIT 0x1#define CNL_FW_INIT 0x5
@@ -109,7 +108,7 @@ static int sst_transfer_fw_host_dma(struct sst_dsp *ctx)static int cnl_load_base_firmware (struct sst_dsp *ctx) {struct firmware stripped_fw; -struct skl_sst *cnl = ctx->thread_context; +struct skl_dev *cnl = ctx->thread_context;int ret;if (!ctx->fw) {
@@ -167,7 +166,7 @@ static int cnl_load_base_firmware(struct sst_dsp *ctx)static int cnl_set_dsp_D0 (struct sst_dsp *ctx,unsigned int core_id) { -struct skl_sst *cnl = ctx->thread_context; +struct skl_dev *cnl = ctx->thread_context;unsigned int core_mask =SKL_DSP_CORE_MASK (core_id);struct skl_ipc_dxstate_info dx;int ret;
@@ -229,7 +228,7 @@ static int cnl_set_dsp_D0(struct sst_dsp *ctx, unsigned int core_id)static int cnl_set_dsp_D3 (struct sst_dsp *ctx,unsigned int core_id) { -struct skl_sst *cnl = ctx->thread_context; +struct skl_dev *cnl = ctx->thread_context;unsigned int core_mask =SKL_DSP_CORE_MASK (core_id);struct skl_ipc_dxstate_info dx;int ret;
@@ -293,7 +292,7 @@ static struct sst_ops cnl_ops = {static irqreturn_t cnl_dsp_irq_thread_handler (int irq,void *context) {struct sst_dsp *dsp = context; -struct skl_sst *cnl =sst_dsp_get_thread_context (dsp); +struct skl_dev *cnl =sst_dsp_get_thread_context (dsp);struct sst_generic_ipc *ipc = &cnl->ipc;struct skl_ipc_header header = {0 };u32 hipcida, hipctdr, hipctdd;
@@ -386,7 +385,7 @@ static bool cnl_ipc_is_dsp_busy(struct sst_dsp *dsp)return (hipcidr &CNL_ADSP_REG_HIPCIDR_BUSY ); } -static int cnl_ipc_init (struct device *dev,struct skl_sst *cnl) +static int cnl_ipc_init (struct device *dev,struct skl_dev *cnl) {struct sst_generic_ipc *ipc;int err;
@@ -415,9 +414,9 @@ static int cnl_ipc_init(struct device *dev, struct skl_sst *cnl)int cnl_sst_dsp_init (struct device *dev,void __iomem *mmio_base,int irq,const char *fw_name,struct skl_dsp_loader_ops dsp_ops, -struct skl_sst **dsp) +struct skl_dev **dsp) { -struct skl_sst *cnl; +struct skl_dev *cnl;struct sst_dsp *sst;int ret;
@@ -454,12 +453,12 @@ int cnl_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq, }EXPORT_SYMBOL_GPL (cnl_sst_dsp_init); -int cnl_sst_init_fw (struct device *dev,struct skl_sst *ctx) +int cnl_sst_init_fw (struct device *dev,struct skl_dev *skl) {int ret; -struct sst_dsp *sst = ctx->dsp; +struct sst_dsp *sst = skl->dsp; - ret = ctx->dsp->fw_ops.load_fw (sst); + ret = skl->dsp->fw_ops.load_fw (sst);if (ret <0 ) {dev_err (dev,"load base fw failed: %d" , ret);return ret;
@@ -467,21 +466,21 @@ int cnl_sst_init_fw(struct device *dev, struct skl_sst *ctx)skl_dsp_init_core_state (sst); - ctx->is_first_boot = false; + skl->is_first_boot = false;return 0 ; }EXPORT_SYMBOL_GPL (cnl_sst_init_fw); -void cnl_sst_dsp_cleanup (struct device *dev,struct skl_sst *ctx) +void cnl_sst_dsp_cleanup (struct device *dev,struct skl_dev *skl) { -if (ctx->dsp->fw) -release_firmware (ctx->dsp->fw); +if (skl->dsp->fw) +release_firmware (skl->dsp->fw); -skl_freeup_uuid_list (ctx); -cnl_ipc_free (&ctx->ipc); +skl_freeup_uuid_list (skl); +cnl_ipc_free (&skl->ipc); - ctx->dsp->ops->free (ctx->dsp); + skl->dsp->ops->free (skl->dsp); }EXPORT_SYMBOL_GPL (cnl_sst_dsp_cleanup);
sound/soc/intel/skylake/skl-debug.c +4 -4
@@ -20,7 +20,7 @@#define FW_REG_SIZE 0x60struct skl_debug { -struct skl *skl; +struct skl_dev *skl;struct device *dev;struct dentry *fs;
@@ -172,7 +172,7 @@ static ssize_t fw_softreg_read(struct file *file, char __user *user_buf, size_t count, loff_t *ppos) { struct skl_debug *d = file->private_data; -struct sst_dsp *sst = d->skl->skl_sst->dsp; +struct sst_dsp *sst = d->skl->dsp;size_t w0_stat_sz = sst->addr.w0_stat_sz;void __iomem *in_base = sst->mailbox.in_base;void __iomem *fw_reg_addr;
@@ -213,7 +213,7 @@ static const struct file_operations soft_regs_ctrl_fops = { .llseek = default_llseek, }; -struct skl_debug *skl_debugfs_init (struct skl *skl) +struct skl_debug *skl_debugfs_init (struct skl_dev *skl) {struct skl_debug *d;
@@ -252,7 +252,7 @@ struct skl_debug *skl_debugfs_init(struct skl *skl)return NULL ; } -void skl_debugfs_exit (struct skl *skl) +void skl_debugfs_exit (struct skl_dev *skl) {struct skl_debug *d = skl->debugfs;
sound/soc/intel/skylake/skl-messages.c +112 -117
700 lines not on this page · raw message
sound/soc/intel/skylake/skl-nhlt.c +9 -9
@@ -126,7 +126,7 @@ static bool skl_check_ep_match(struct device *dev, struct nhlt_endpoint *epnt, }struct nhlt_specific_cfg -*skl_get_ep_blob (struct skl *skl,u32 instance,u8 link_type, +*skl_get_ep_blob (struct skl_dev *skl,u32 instance,u8 link_type,u8 s_fmt,u8 num_ch,u32 s_rate,u8 dirn,u8 dev_type) {
@@ -162,7 +162,7 @@ struct nhlt_specific_cfgreturn NULL ; } -int skl_get_dmic_geo (struct skl *skl) +int skl_get_dmic_geo (struct skl_dev *skl) {struct nhlt_acpi_table *nhlt = (struct nhlt_acpi_table *)skl->nhlt;struct nhlt_endpoint *epnt;
@@ -219,7 +219,7 @@ static void skl_nhlt_trim_space(char *trim) s[cnt] ='\0' ; } -int skl_nhlt_update_topology_bin (struct skl *skl) +int skl_nhlt_update_topology_bin (struct skl_dev *skl) {struct nhlt_acpi_table *nhlt = (struct nhlt_acpi_table *)skl->nhlt;struct hdac_bus *bus =skl_to_bus (skl);
@@ -243,7 +243,7 @@ static ssize_t skl_nhlt_platform_id_show(struct device *dev, {struct pci_dev *pci =to_pci_dev (dev);struct hdac_bus *bus =pci_get_drvdata (pci); -struct skl *skl =bus_to_skl (bus); +struct skl_dev *skl =bus_to_skl (bus);struct nhlt_acpi_table *nhlt = (struct nhlt_acpi_table *)skl->nhlt;char platform_id[32 ];
@@ -257,7 +257,7 @@ static ssize_t skl_nhlt_platform_id_show(struct device *dev, static DEVICE_ATTR(platform_id, 0444, skl_nhlt_platform_id_show, NULL); -int skl_nhlt_create_sysfs (struct skl *skl) +int skl_nhlt_create_sysfs (struct skl_dev *skl) {struct device *dev = &skl->pci->dev;
@@ -267,7 +267,7 @@ int skl_nhlt_create_sysfs(struct skl *skl)return 0 ; } -void skl_nhlt_remove_sysfs (struct skl *skl) +void skl_nhlt_remove_sysfs (struct skl_dev *skl) {struct device *dev = &skl->pci->dev;
@@ -279,7 +279,7 @@ void skl_nhlt_remove_sysfs(struct skl *skl)* stores all possible rates supported in a rate table for the corresponding * sclk/sclkfs. */ -static void skl_get_ssp_clks (struct skl *skl,struct skl_ssp_clk *ssp_clks, +static void skl_get_ssp_clks (struct skl_dev *skl,struct skl_ssp_clk *ssp_clks,struct nhlt_fmt *fmt,u8 id) {struct skl_i2s_config_blob_ext *i2s_config_ext;
@@ -377,7 +377,7 @@ static void skl_get_ssp_clks(struct skl *skl, struct skl_ssp_clk *ssp_clks, } } -static void skl_get_mclk (struct skl *skl,struct skl_ssp_clk *mclk, +static void skl_get_mclk (struct skl_dev *skl,struct skl_ssp_clk *mclk,struct nhlt_fmt *fmt,u8 id) {struct skl_i2s_config_blob_ext *i2s_config_ext;
@@ -421,7 +421,7 @@ static void skl_get_mclk(struct skl *skl, struct skl_ssp_clk *mclk, mclk[id].parent_name = parent->name; } -void skl_get_clks (struct skl *skl,struct skl_ssp_clk *ssp_clks) +void skl_get_clks (struct skl_dev *skl,struct skl_ssp_clk *ssp_clks) {struct nhlt_acpi_table *nhlt = (struct nhlt_acpi_table *)skl->nhlt;struct nhlt_endpoint *epnt;
sound/soc/intel/skylake/skl-pcm.c +37 -38
237 lines not on this page · raw message
sound/soc/intel/skylake/skl-ssp-clk.c +2 -2
@@ -101,7 +101,7 @@ static void skl_fill_clk_ipc(struct skl_clk_rate_cfg_table *rcfg, u8 clk_type) }/* Sends dma control IPC to turn the clock ON/OFF */ -static int skl_send_clk_dma_control (struct skl *skl, +static int skl_send_clk_dma_control (struct skl_dev *skl,struct skl_clk_rate_cfg_table *rcfg,u32 vbus_id,u8 clk_type,bool enable)
@@ -152,7 +152,7 @@ static int skl_send_clk_dma_control(struct skl *skl,memcpy (i2s_config + sp_cfg->size, data, size); node_id = ((SKL_DMA_I2S_LINK_INPUT_CLASS <<8 ) | (vbus_id <<4 )); - ret =skl_dsp_set_dma_control (skl->skl_sst, (u32 *)i2s_config, + ret =skl_dsp_set_dma_control (skl, (u32 *)i2s_config, i2s_config_size, node_id);kfree (i2s_config);
sound/soc/intel/skylake/skl-sst-dsp.c +5 -5
@@ -12,7 +12,7 @@#include "../common/sst-dsp.h" #include "../common/sst-ipc.h" #include "../common/sst-dsp-priv.h" -#include "skl-sst-ipc.h" +#include "skl.h" /* various timeout values */ #define SKL_DSP_PU_TO 50
@@ -33,7 +33,7 @@ void skl_dsp_set_state_locked(struct sst_dsp *ctx, int state)*/ void skl_dsp_init_core_state (struct sst_dsp *ctx) { -struct skl_sst *skl = ctx->thread_context; +struct skl_dev *skl = ctx->thread_context;int i; skl->cores.state[SKL_DSP_CORE0_ID ] =SKL_DSP_RUNNING ;
@@ -48,7 +48,7 @@ void skl_dsp_init_core_state(struct sst_dsp *ctx)/* Get the mask for all enabled cores */ unsigned int skl_dsp_get_enabled_cores (struct sst_dsp *ctx) { -struct skl_sst *skl = ctx->thread_context; +struct skl_dev *skl = ctx->thread_context;unsigned int core_mask, en_cores_mask;u32 val;
@@ -335,7 +335,7 @@ irqreturn_t skl_dsp_sst_interrupt(int irq, void *dev_id)*/ int skl_dsp_get_core (struct sst_dsp *ctx,unsigned int core_id) { -struct skl_sst *skl = ctx->thread_context; +struct skl_dev *skl = ctx->thread_context;int ret =0 ;if (core_id >= skl->cores.count) {
@@ -364,7 +364,7 @@ EXPORT_SYMBOL_GPL(skl_dsp_get_core);int skl_dsp_put_core (struct sst_dsp *ctx,unsigned int core_id) { -struct skl_sst *skl = ctx->thread_context; +struct skl_dev *skl = ctx->thread_context;int ret =0 ;if (core_id >= skl->cores.count) {
sound/soc/intel/skylake/skl-sst-dsp.h +15 -15
@@ -15,9 +15,9 @@#include "skl-sst-cldma.h" struct sst_dsp ; -struct skl_sst ;struct sst_dsp_device ;struct skl_lib_info ; +struct skl_dev ;/* Intel HD Audio General DSP Registers */ #define SKL_ADSP_GEN_BASE 0x0
@@ -222,32 +222,32 @@ int skl_dsp_put_core(struct sst_dsp *ctx, unsigned int core_id);int skl_dsp_boot (struct sst_dsp *ctx);int skl_sst_dsp_init (struct device *dev,void __iomem *mmio_base,int irq,const char *fw_name,struct skl_dsp_loader_ops dsp_ops, -struct skl_sst **dsp); +struct skl_dev **dsp);int bxt_sst_dsp_init (struct device *dev,void __iomem *mmio_base,int irq,const char *fw_name,struct skl_dsp_loader_ops dsp_ops, -struct skl_sst **dsp); -int skl_sst_init_fw (struct device *dev,struct skl_sst *ctx); -int bxt_sst_init_fw (struct device *dev,struct skl_sst *ctx); -void skl_sst_dsp_cleanup (struct device *dev,struct skl_sst *ctx); -void bxt_sst_dsp_cleanup (struct device *dev,struct skl_sst *ctx); +struct skl_dev **dsp); +int skl_sst_init_fw (struct device *dev,struct skl_dev *skl); +int bxt_sst_init_fw (struct device *dev,struct skl_dev *skl); +void skl_sst_dsp_cleanup (struct device *dev,struct skl_dev *skl); +void bxt_sst_dsp_cleanup (struct device *dev,struct skl_dev *skl);int snd_skl_parse_uuids (struct sst_dsp *ctx,const struct firmware *fw,unsigned int offset,int index); -int skl_get_pvt_id (struct skl_sst *ctx,guid_t *uuid_mod,int instance_id); -int skl_put_pvt_id (struct skl_sst *ctx,guid_t *uuid_mod,int *pvt_id); -int skl_get_pvt_instance_id_map (struct skl_sst *ctx, +int skl_get_pvt_id (struct skl_dev *skl,guid_t *uuid_mod,int instance_id); +int skl_put_pvt_id (struct skl_dev *skl,guid_t *uuid_mod,int *pvt_id); +int skl_get_pvt_instance_id_map (struct skl_dev *skl,int module_id,int instance_id); -void skl_freeup_uuid_list (struct skl_sst *ctx); +void skl_freeup_uuid_list (struct skl_dev *skl);int skl_dsp_strip_extended_manifest (struct firmware *fw); -void skl_dsp_enable_notification (struct skl_sst *ctx,bool enable); +void skl_dsp_enable_notification (struct skl_dev *skl,bool enable); -void skl_dsp_set_astate_cfg (struct skl_sst *ctx,u32 cnt,void *data); +void skl_dsp_set_astate_cfg (struct skl_dev *skl,u32 cnt,void *data);int skl_sst_ctx_init (struct device *dev,int irq,const char *fw_name, -struct skl_dsp_loader_ops dsp_ops,struct skl_sst **dsp, +struct skl_dsp_loader_ops dsp_ops,struct skl_dev **dsp,struct sst_dsp_device *skl_dev); -int skl_prepare_lib_load (struct skl_sst *skl,struct skl_lib_info *linfo, +int skl_prepare_lib_load (struct skl_dev *skl,struct skl_lib_info *linfo,struct firmware *stripped_fw,unsigned int hdr_offset,int index);void skl_release_library (struct skl_lib_info *linfo,int lib_count);
sound/soc/intel/skylake/skl-sst-ipc.c +4 -4
@@ -345,7 +345,7 @@ static struct ipc_message *skl_ipc_reply_get_msg(struct sst_generic_ipc *ipc,int skl_ipc_process_notification (struct sst_generic_ipc *ipc,struct skl_ipc_header header) { - struct skl_sst *skl = container_of(ipc, struct skl_sst, ipc); + struct skl_dev *skl = container_of(ipc, struct skl_dev, ipc);if (IPC_GLB_NOTIFY_MSG_TYPE (header.primary)) {switch (IPC_GLB_NOTIFY_TYPE (header.primary)) {
@@ -436,7 +436,7 @@ void skl_ipc_process_reply(struct sst_generic_ipc *ipc,struct ipc_message *msg;u32 reply = header.primary &IPC_GLB_REPLY_STATUS_MASK ;u64 *ipc_header = (u64 *)(&header); - struct skl_sst *skl = container_of(ipc, struct skl_sst, ipc); + struct skl_dev *skl = container_of(ipc, struct skl_dev, ipc);unsigned long flags;spin_lock_irqsave (&ipc->dsp->spinlock, flags);
@@ -488,7 +488,7 @@ void skl_ipc_process_reply(struct sst_generic_ipc *ipc,irqreturn_t skl_dsp_irq_thread_handler (int irq,void *context) {struct sst_dsp *dsp = context; -struct skl_sst *skl =sst_dsp_get_thread_context (dsp); +struct skl_dev *skl =sst_dsp_get_thread_context (dsp);struct sst_generic_ipc *ipc = &skl->ipc;struct skl_ipc_header header = {0 };u32 hipcie, hipct, hipcte;
@@ -595,7 +595,7 @@ bool skl_ipc_int_status(struct sst_dsp *ctx) SKL_ADSP_REG_ADSPIS) & SKL_ADSPIS_IPC; } -int skl_ipc_init (struct device *dev,struct skl_sst *skl) +int skl_ipc_init (struct device *dev,struct skl_dev *skl) {struct sst_generic_ipc *ipc;int err;
sound/soc/intel/skylake/skl-sst-ipc.h +2 -50
72 lines not on this page · raw message
sound/soc/intel/skylake/skl-sst-utils.c +15 -22
@@ -8,10 +8,9 @@#include <linux/device.h> #include <linux/slab.h> #include <linux/uuid.h> -#include "skl-sst-dsp.h" #include "../common/sst-dsp.h" #include "../common/sst-dsp-priv.h" -#include "skl-sst-ipc.h" +#include "skl.h" #define DEFAULT_HASH_SHA256_LEN 32
@@ -99,12 +98,12 @@ static int skl_get_pvtid_map(struct uuid_module *module, int instance_id)return -EINVAL ; } -int skl_get_pvt_instance_id_map (struct skl_sst *ctx, +int skl_get_pvt_instance_id_map (struct skl_dev *skl,int module_id,int instance_id) {struct uuid_module *module; -list_for_each_entry (module, &ctx->uuid_list, list) { +list_for_each_entry (module, &skl->uuid_list, list) {if (module->id == module_id)return skl_get_pvtid_map (module, instance_id); }
@@ -163,19 +162,19 @@ static inline int skl_pvtid_128(struct uuid_module *module)/** * skl_get_pvt_id: generate a private id for use as module id * -* @ctx: driver context +* @skl: driver context * @uuid_mod: module's uuid * @instance_id: module's instance id * * This generates a 128 bit private unique id for a module TYPE so that * module instance is unique */ -int skl_get_pvt_id (struct skl_sst *ctx,guid_t *uuid_mod,int instance_id) +int skl_get_pvt_id (struct skl_dev *skl,guid_t *uuid_mod,int instance_id) {struct uuid_module *module;int pvt_id; -list_for_each_entry (module, &ctx->uuid_list, list) { +list_for_each_entry (module, &skl->uuid_list, list) {if (guid_equal (uuid_mod, &module->uuid)) { pvt_id =skl_pvtid_128 (module);
@@ -194,18 +193,18 @@ EXPORT_SYMBOL_GPL(skl_get_pvt_id);/** * skl_put_pvt_id: free up the private id allocated * -* @ctx: driver context +* @skl: driver context * @uuid_mod: module's uuid * @pvt_id: module pvt id * * This frees a 128 bit private unique id previously generated */ -int skl_put_pvt_id (struct skl_sst *ctx,guid_t *uuid_mod,int *pvt_id) +int skl_put_pvt_id (struct skl_dev *skl,guid_t *uuid_mod,int *pvt_id) {int i;struct uuid_module *module; -list_for_each_entry (module, &ctx->uuid_list, list) { +list_for_each_entry (module, &skl->uuid_list, list) {if (guid_equal (uuid_mod, &module->uuid)) {if (*pvt_id !=0 )
@@ -234,7 +233,7 @@ int snd_skl_parse_uuids(struct sst_dsp *ctx, const struct firmware *fw,struct adsp_module_entry *mod_entry;int i, num_entry, size;const char *buf; -struct skl_sst *skl = ctx->thread_context; +struct skl_dev *skl = ctx->thread_context;struct uuid_module *module;struct firmware stripped_fw;unsigned int safe_file;
@@ -317,11 +316,11 @@ int snd_skl_parse_uuids(struct sst_dsp *ctx, const struct firmware *fw,return ret; } -void skl_freeup_uuid_list (struct skl_sst *ctx) +void skl_freeup_uuid_list (struct skl_dev *skl) {struct uuid_module *uuid, *_uuid; -list_for_each_entry_safe (uuid, _uuid, &ctx->uuid_list, list) { +list_for_each_entry_safe (uuid, _uuid, &skl->uuid_list, list) {list_del (&uuid->list);kfree (uuid); }
@@ -355,16 +354,12 @@ int skl_dsp_strip_extended_manifest(struct firmware *fw) }int skl_sst_ctx_init (struct device *dev,int irq,const char *fw_name, -struct skl_dsp_loader_ops dsp_ops,struct skl_sst **dsp, +struct skl_dsp_loader_ops dsp_ops,struct skl_dev **dsp,struct sst_dsp_device *skl_dev) { -struct skl_sst *skl; +struct skl_dev *skl = *dsp;struct sst_dsp *sst; - skl =devm_kzalloc (dev,sizeof (*skl),GFP_KERNEL ); -if (skl ==NULL ) -return -ENOMEM ; - skl->dev = dev; skl_dev->thread_context = skl;INIT_LIST_HEAD (&skl->uuid_list);
@@ -381,13 +376,11 @@ int skl_sst_ctx_init(struct device *dev, int irq, const char *fw_name,INIT_LIST_HEAD (&sst->module_list); skl->is_first_boot = true; -if (dsp) - *dsp = skl;return 0 ; } -int skl_prepare_lib_load (struct skl_sst *skl,struct skl_lib_info *linfo, +int skl_prepare_lib_load (struct skl_dev *skl,struct skl_lib_info *linfo,struct firmware *stripped_fw,unsigned int hdr_offset,int index) {
sound/soc/intel/skylake/skl-sst.c +26 -25
126 lines not on this page · raw message
sound/soc/intel/skylake/skl-topology.c +154 -166
1,029 lines not on this page · raw message
sound/soc/intel/skylake/skl-topology.h +16 -16
@@ -447,7 +447,7 @@ enum skl_channel { SKL_CH_QUATRO = 4, }; -static inline struct skl *get_skl_ctx (struct device *dev) +static inline struct skl_dev *get_skl_ctx (struct device *dev) {struct hdac_bus *bus =dev_get_drvdata (dev);
@@ -456,7 +456,7 @@ static inline struct skl *get_skl_ctx(struct device *dev)int skl_tplg_be_update_params (struct snd_soc_dai *dai,struct skl_pipe_params *params); -int skl_dsp_set_dma_control (struct skl_sst *ctx,u32 *caps, +int skl_dsp_set_dma_control (struct skl_dev *skl,u32 *caps,u32 caps_size,u32 node_id);void skl_tplg_set_be_dmic_config (struct snd_soc_dai *dai,struct skl_pipe_params *params,int stream);
@@ -469,32 +469,32 @@ struct skl_module_cfg *skl_tplg_fe_get_cpr_module(int skl_tplg_update_pipe_params (struct device *dev,struct skl_module_cfg *mconfig,struct skl_pipe_params *params); -void skl_tplg_d0i3_get (struct skl *skl,enum d0i3_capability caps); -void skl_tplg_d0i3_put (struct skl *skl,enum d0i3_capability caps); +void skl_tplg_d0i3_get (struct skl_dev *skl,enum d0i3_capability caps); +void skl_tplg_d0i3_put (struct skl_dev *skl,enum d0i3_capability caps); -int skl_create_pipeline (struct skl_sst *ctx,struct skl_pipe *pipe); +int skl_create_pipeline (struct skl_dev *skl,struct skl_pipe *pipe); -int skl_run_pipe (struct skl_sst *ctx,struct skl_pipe *pipe); +int skl_run_pipe (struct skl_dev *skl,struct skl_pipe *pipe); -int skl_pause_pipe (struct skl_sst *ctx,struct skl_pipe *pipe); +int skl_pause_pipe (struct skl_dev *skl,struct skl_pipe *pipe); -int skl_delete_pipe (struct skl_sst *ctx,struct skl_pipe *pipe); +int skl_delete_pipe (struct skl_dev *skl,struct skl_pipe *pipe); -int skl_stop_pipe (struct skl_sst *ctx,struct skl_pipe *pipe); +int skl_stop_pipe (struct skl_dev *skl,struct skl_pipe *pipe); -int skl_reset_pipe (struct skl_sst *ctx,struct skl_pipe *pipe); +int skl_reset_pipe (struct skl_dev *skl,struct skl_pipe *pipe); -int skl_init_module (struct skl_sst *ctx,struct skl_module_cfg *module_config); +int skl_init_module (struct skl_dev *skl,struct skl_module_cfg *module_config); -int skl_bind_modules (struct skl_sst *ctx,struct skl_module_cfg +int skl_bind_modules (struct skl_dev *skl,struct skl_module_cfg *src_module,struct skl_module_cfg *dst_module); -int skl_unbind_modules (struct skl_sst *ctx,struct skl_module_cfg +int skl_unbind_modules (struct skl_dev *skl,struct skl_module_cfg *src_module,struct skl_module_cfg *dst_module); -int skl_set_module_params (struct skl_sst *ctx,u32 *params,int size, +int skl_set_module_params (struct skl_dev *skl,u32 *params,int size,u32 param_id,struct skl_module_cfg *mcfg); -int skl_get_module_params (struct skl_sst *ctx,u32 *params,int size, +int skl_get_module_params (struct skl_dev *skl,u32 *params,int size,u32 param_id,struct skl_module_cfg *mcfg); struct skl_module_cfg *skl_tplg_be_get_cpr_module(struct snd_soc_dai *dai,
@@ -508,6 +508,6 @@ int skl_pcm_link_dma_prepare(struct device *dev,int skl_dai_load (struct snd_soc_component *cmp,int index,struct snd_soc_dai_driver *dai_drv,struct snd_soc_tplg_pcm *pcm,struct snd_soc_dai *dai); -void skl_tplg_add_moduleid_in_bind_params (struct skl *skl, +void skl_tplg_add_moduleid_in_bind_params (struct skl_dev *skl,struct snd_soc_dapm_widget *w);#endif
sound/soc/intel/skylake/skl.c +27 -27
134 lines not on this page · raw message
sound/soc/intel/skylake/skl.h +70 -24
94 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.17.1
Part of the diff is not shown here. View the raw message.
Cezary Rojewski
maintainerPATCH 2/7 ASoC: Intel: Skylake: Combine snd_soc_skl_ipc and snd_soc_skl
In reply to Cezary RojewskiFrom: Amadeusz Sławiński <[email protected]>
As both modules are core part of Skylake driver and none can live without the other, combine snd_soc_skl_ipc and snd_soc_skl.
It's highly probable IPC module was to be treated as an interface for platform specific code implementations e.g.: possibility of existence of BXT specific code without SKL one. However, most funtionalities are being inherited from one DSP firmware to another, and thus this assumption fails.
skl-sst, bxt-sst and cnl-sst are not individuals pointing respectively to SKL (cAVS 1.5), BXT (cAVS 1.5+) & CNL (cAVS 1.8) standalone implementations. Code found within these is shared among all platforms whenever necessary to avoid code duplication and reduce development burden.
Merge also helps in cleaning up internal code in future changes.
--- sound/soc/intel/skylake/Makefile | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)
sound/soc/intel/skylake/Makefile +3 -9
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 -snd-soc-skl-objs := skl.o skl-pcm.o skl-nhlt.o skl-messages.o \ -skl-topology.o +snd-soc-skl-objs := skl.o skl-pcm.o skl-nhlt.o skl-messages.o skl-topology.o \ + skl-sst-ipc.o skl-sst-dsp.o cnl-sst-dsp.o skl-sst-cldma.o \ + skl-sst.o bxt-sst.o cnl-sst.o skl-sst-utils.o ifdef CONFIG_DEBUG_FS snd-soc-skl-objs += skl-debug.o
@@ -8,13 +9,6 @@ endif obj-$(CONFIG_SND_SOC_INTEL_SKYLAKE) += snd-soc-skl.o -# Skylake IPC Support -snd-soc-skl-ipc-objs := skl-sst-ipc.o skl-sst-dsp.o cnl-sst-dsp.o \ - skl-sst-cldma.o skl-sst.o bxt-sst.o cnl-sst.o \ - skl-sst-utils.o - -obj-$(CONFIG_SND_SOC_INTEL_SKYLAKE) += snd-soc-skl-ipc.o - #Skylake Clock device support snd-soc-skl-ssp-clk-objs := skl-ssp-clk.o
Signature · 6 lines
2.17.1 _______________________________________________ Alsa-devel mailing list [email protected] https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Cezary Rojewski
maintainerPATCH 3/7 ASoC: Intel: Skylake: Remove MCPS available check
In reply to Cezary RojewskiThe entire logic for MCPS calculation and DSP scheduling is found within DSP firmware. Currently driver implements simplistic, inaccurate logic itself which may prevent pipeline creation despite firmware being completely fine its parameters.
Remove that logic and leave the MCPS calculation to DSP alone.
--- sound/soc/intel/skylake/skl-topology.c | 67 +------------------------- sound/soc/intel/skylake/skl.h | 2 - 2 files changed, 1 insertion(+), 68 deletions(-)
sound/soc/intel/skylake/skl-topology.c +1 -66
@@ -142,54 +142,6 @@ static void skl_tplg_alloc_pipe_mem(struct skl_dev *skl, skl->resource.mem += mconfig->pipe->memory_pages; } -/* -* Pipeline needs needs DSP CPU resources for computation, this is -* quantified in MCPS (Million Clocks Per Second) required for module/pipe -* -* Each pipelines needs mcps to be allocated. Check if we have mcps for this -* pipe. -*/ - -static bool skl_is_pipe_mcps_avail (struct skl_dev *skl, -struct skl_module_cfg *mconfig) -{ -u8 res_idx = mconfig->res_idx; -struct skl_module_res *res = &mconfig->module->resources[res_idx]; - -if (skl->resource.mcps + res->cps > skl->resource.max_mcps) { -dev_err (skl->dev, -"%s: module_id %d instance %d\n" , __func__, - mconfig->id.module_id, mconfig->id.instance_id); -dev_err (skl->dev, -"exceeds ppl mcps available %d > mem %d\n" , - skl->resource.max_mcps, skl->resource.mcps); -return false; - }else { -return true; - } -} - -static void skl_tplg_alloc_pipe_mcps (struct skl_dev *skl, -struct skl_module_cfg *mconfig) -{ -u8 res_idx = mconfig->res_idx; -struct skl_module_res *res = &mconfig->module->resources[res_idx]; - - skl->resource.mcps += res->cps; -} - -/* -* Free the mcps when tearing down -*/ -static void -skl_tplg_free_pipe_mcps (struct skl_dev *skl,struct skl_module_cfg *mconfig) -{ -u8 res_idx = mconfig->res_idx; -struct skl_module_res *res = &mconfig->module->resources[res_idx]; - - skl->resource.mcps -= res->cps; -} -/* * Free the memory when tearing down */
@@ -582,10 +534,6 @@ skl_tplg_init_pipe_modules(struct skl_dev *skl, struct skl_pipe *pipe) mconfig->fmt_idx = mconfig->mod_cfg[cfg_idx].fmt_idx; mconfig->res_idx = mconfig->mod_cfg[cfg_idx].res_idx; -/* check resource available */ -if (!skl_is_pipe_mcps_avail (skl, mconfig)) -return -ENOMEM ; -if (mconfig->module->loadable && skl->dsp->fw_ops.load_mod) { ret = skl->dsp->fw_ops.load_mod (skl->dsp, mconfig->id.module_id, mconfig->guid);
@@ -627,7 +575,7 @@ skl_tplg_init_pipe_modules(struct skl_dev *skl, struct skl_pipe *pipe)skl_put_pvt_id (skl, uuid_mod, &mconfig->id.pvt_id); goto err; } -skl_tplg_alloc_pipe_mcps (skl, mconfig); + ret =skl_tplg_set_module_params (w, skl);if (ret <0 ) goto err;
@@ -752,10 +700,6 @@ static int skl_tplg_mixer_dapm_pre_pmu_event(struct snd_soc_dapm_widget *w,if (ret <0 )return ret; -/* check resource available */ -if (!skl_is_pipe_mcps_avail (skl, mconfig)) -return -EBUSY ; -if (!skl_is_pipe_mem_avail (skl, mconfig))return -ENOMEM ;
@@ -768,7 +712,6 @@ static int skl_tplg_mixer_dapm_pre_pmu_event(struct snd_soc_dapm_widget *w,return ret;skl_tplg_alloc_pipe_mem (skl, mconfig); -skl_tplg_alloc_pipe_mcps (skl, mconfig);/* Init all pipe modules from source to sink */ ret =skl_tplg_init_pipe_modules (skl, s_pipe);
@@ -1264,7 +1207,6 @@ static int skl_tplg_mixer_dapm_pre_pmd_event(struct snd_soc_dapm_widget *w,/* * in the Post-PMD event of mixer we need to do following: -* - Free the mcps used * - Free the mem used * - Unbind the modules within the pipeline * - Delete the pipeline (modules are not required to be explicitly
@@ -1282,7 +1224,6 @@ static int skl_tplg_mixer_dapm_post_pmd_event(struct snd_soc_dapm_widget *w,if (s_pipe->state ==SKL_PIPE_INVALID )return -EINVAL ; -skl_tplg_free_pipe_mcps (skl, mconfig);skl_tplg_free_pipe_mem (skl, mconfig);list_for_each_entry (w_module, &s_pipe->w_list, node) {
@@ -1317,8 +1258,6 @@ static int skl_tplg_mixer_dapm_post_pmd_event(struct snd_soc_dapm_widget *w,list_for_each_entry (w_module, &s_pipe->w_list, node) { dst_module = w_module->w->priv; -if (mconfig->m_state >=SKL_MODULE_INIT_DONE ) -skl_tplg_free_pipe_mcps (skl, dst_module);if (src_module ==NULL ) { src_module = dst_module;continue ;
@@ -1340,7 +1279,6 @@ static int skl_tplg_mixer_dapm_post_pmd_event(struct snd_soc_dapm_widget *w,/* * in the Post-PMD event of PGA we need to do following: -* - Free the mcps used * - Stop the pipeline * - In source pipe is connected, unbind with source pipelines */
@@ -2984,7 +2922,6 @@ void skl_cleanup_resources(struct skl_dev *skl)return ; skl->resource.mem =0 ; - skl->resource.mcps =0 ;list_for_each_entry (w, &card->widgets, list) {if (is_skl_dsp_widget_type (w, skl->dev) && w->priv !=NULL )
@@ -3683,7 +3620,6 @@ static void skl_tplg_set_pipe_type(struct skl_dev *skl, struct skl_pipe *pipe) }/* This will be read from topology manifest, currently defined here */ -#define SKL_MAX_MCPS 30000000#define SKL_FW_MAX_MEM 1000000/*
@@ -3720,7 +3656,6 @@ int skl_tplg_init(struct snd_soc_component *component, struct hdac_bus *bus)return -EINVAL ; } - skl->resource.max_mcps =SKL_MAX_MCPS ; skl->resource.max_mem =SKL_FW_MAX_MEM ; skl->tplg = fw;
sound/soc/intel/skylake/skl.h +0 -2
@@ -41,9 +41,7 @@#define AZX_REG_VS_EM2_L1SEN BIT(13)struct skl_dsp_resource { -u32 max_mcps;u32 max_mem; -u32 mcps;u32 mem; };
Signature · 1 line
2.17.1
Cezary Rojewski
maintainerPATCH 4/7 ASoC: Intel: Skylake: Remove memory available check
In reply to Cezary RojewskiCurrent memory availability check is a stub, while actual memory management takes place in firmware. Leave this task to firmware entirely and remove redundant code.
--- sound/soc/intel/skylake/skl-topology.c | 59 -------------------------- sound/soc/intel/skylake/skl.h | 6 --- 2 files changed, 65 deletions(-)
sound/soc/intel/skylake/skl-topology.c +0 -59
@@ -109,49 +109,6 @@ static int is_skl_dsp_widget_type(struct snd_soc_dapm_widget *w, } } -/* -* Each pipelines needs memory to be allocated. Check if we have free memory -* from available pool. -*/ -static bool skl_is_pipe_mem_avail (struct skl_dev *skl, -struct skl_module_cfg *mconfig) -{ -if (skl->resource.mem + mconfig->pipe->memory_pages > - skl->resource.max_mem) { -dev_err (skl->dev, -"%s: module_id %d instance %d\n" , __func__, - mconfig->id.module_id, - mconfig->id.instance_id); -dev_err (skl->dev, -"exceeds ppl memory available %d mem %d\n" , - skl->resource.max_mem, skl->resource.mem); -return false; - }else { -return true; - } -} - -/* -* Add the mem to the mem pool. This is freed when pipe is deleted. -* Note: DSP does actual memory management we only keep track for complete -* pool -*/ -static void skl_tplg_alloc_pipe_mem (struct skl_dev *skl, -struct skl_module_cfg *mconfig) -{ - skl->resource.mem += mconfig->pipe->memory_pages; -} - -/* -* Free the memory when tearing down -*/ -static void -skl_tplg_free_pipe_mem (struct skl_dev *skl,struct skl_module_cfg *mconfig) -{ - skl->resource.mem -= mconfig->pipe->memory_pages; -} - -static void skl_dump_mconfig (struct skl_dev *skl,struct skl_module_cfg *mcfg) {struct skl_module_iface *iface = &mcfg->module->formats[0 ];
@@ -681,7 +638,6 @@ skl_tplg_get_pipe_config(struct skl_dev *skl, struct skl_module_cfg *mconfig)/* * Mixer module represents a pipeline. So in the Pre-PMU event of mixer we * need create the pipeline. So we do following: -* - check the resources * - Create the pipeline * - Initialize the modules in pipeline * - finally bind all modules together
@@ -700,9 +656,6 @@ static int skl_tplg_mixer_dapm_pre_pmu_event(struct snd_soc_dapm_widget *w,if (ret <0 )return ret; -if (!skl_is_pipe_mem_avail (skl, mconfig)) -return -ENOMEM ; -/* * Create a list of modules for pipe. * This list contains modules from source to sink
@@ -711,8 +664,6 @@ static int skl_tplg_mixer_dapm_pre_pmu_event(struct snd_soc_dapm_widget *w,if (ret <0 )return ret; -skl_tplg_alloc_pipe_mem (skl, mconfig); -/* Init all pipe modules from source to sink */ ret =skl_tplg_init_pipe_modules (skl, s_pipe);if (ret <0 )
@@ -1207,7 +1158,6 @@ static int skl_tplg_mixer_dapm_pre_pmd_event(struct snd_soc_dapm_widget *w,/* * in the Post-PMD event of mixer we need to do following: -* - Free the mem used * - Unbind the modules within the pipeline * - Delete the pipeline (modules are not required to be explicitly * deleted, pipeline delete is enough here
@@ -1224,8 +1174,6 @@ static int skl_tplg_mixer_dapm_post_pmd_event(struct snd_soc_dapm_widget *w,if (s_pipe->state ==SKL_PIPE_INVALID )return -EINVAL ; -skl_tplg_free_pipe_mem (skl, mconfig); -list_for_each_entry (w_module, &s_pipe->w_list, node) {if (list_empty (&skl->bind_list))break ;
@@ -2921,8 +2869,6 @@ void skl_cleanup_resources(struct skl_dev *skl)if (!card || !card->instantiated)return ; - skl->resource.mem =0 ; -list_for_each_entry (w, &card->widgets, list) {if (is_skl_dsp_widget_type (w, skl->dev) && w->priv !=NULL )skl_clear_pin_config (soc_component, w);
@@ -3619,9 +3565,6 @@ static void skl_tplg_set_pipe_type(struct skl_dev *skl, struct skl_pipe *pipe) pipe->passthru = false; } -/* This will be read from topology manifest, currently defined here */ -#define SKL_FW_MAX_MEM 1000000 -/* * SKL topology init routine */
@@ -3656,8 +3599,6 @@ int skl_tplg_init(struct snd_soc_component *component, struct hdac_bus *bus)return -EINVAL ; } - skl->resource.max_mem =SKL_FW_MAX_MEM ; - skl->tplg = fw; ret =skl_tplg_create_pipe_widget_list (component);if (ret <0 )
sound/soc/intel/skylake/skl.h +0 -6
@@ -40,11 +40,6 @@#define AZX_REG_VS_EM2_L1SEN BIT(13) -struct skl_dsp_resource { -u32 max_mem; -u32 mem; -}; -struct skl_debug ;struct skl_astate_param {
@@ -74,7 +69,6 @@ struct skl_dev {struct nhlt_acpi_table *nhlt;/* nhlt ptr */ -struct skl_dsp_resource resource;struct list_head ppl_list;struct list_head bind_list;
Signature · 1 line
2.17.1
Cezary Rojewski
maintainerPATCH 5/7 ASoC: Intel: Skylake: Do not disable FW notifications
In reply to Cezary RojewskiFrom: Amadeusz Sławiński <[email protected]>
As per FW team recommendation we should not disable notifications. By default, all notifications are enabled in DSP firmware. These notifications provide a vital information whenever an error occurs.
Currently, driver disables them during boot sequences. By doing so, Skylake may silently ignore severe stream errors. Correct that by removing permissive code.
--- sound/soc/intel/skylake/skl-messages.c | 20 -------------------- sound/soc/intel/skylake/skl-pcm.c | 1 - sound/soc/intel/skylake/skl-sst-dsp.h | 1 - sound/soc/intel/skylake/skl-topology.h | 5 ----- 4 files changed, 27 deletions(-)
sound/soc/intel/skylake/skl-messages.c +0 -20
@@ -58,24 +58,6 @@ void skl_dsp_set_astate_cfg(struct skl_dev *skl, u32 cnt, void *data)skl_ipc_set_large_config (&skl->ipc, &msg, data); } -#define NOTIFICATION_PARAM_ID 3 -#define NOTIFICATION_MASK 0xf - -/* disable notfication for underruns/overruns from firmware module */ -void skl_dsp_enable_notification (struct skl_dev *skl,bool enable) -{ -struct notification_mask mask; -struct skl_ipc_large_config_msg msg = {0 }; - - mask.notify =NOTIFICATION_MASK ; - mask.enable = enable; - - msg.large_param_id =NOTIFICATION_PARAM_ID ; - msg.param_data_size =sizeof (mask); - -skl_ipc_set_large_config (&skl->ipc, &msg, (u32 *)&mask); -} -static int skl_dsp_setup_spib (struct device *dev,unsigned int size,int stream_tag,int enable) {
@@ -436,8 +418,6 @@ int skl_resume_dsp(struct skl_dev *skl)if (ret <0 )return ret; -skl_dsp_enable_notification (skl, false); -if (skl->cfg.astate_cfg !=NULL ) {skl_dsp_set_astate_cfg (skl, skl->cfg.astate_cfg->count, skl->cfg.astate_cfg);
sound/soc/intel/skylake/skl-pcm.c +0 -1
@@ -1445,7 +1445,6 @@ static int skl_platform_soc_probe(struct snd_soc_component *component) }skl_populate_modules (skl); skl->update_d0i3c = skl_update_d0i3c; -skl_dsp_enable_notification (skl, false);if (skl->cfg.astate_cfg !=NULL ) { skl_dsp_set_astate_cfg(skl,
sound/soc/intel/skylake/skl-sst-dsp.h +0 -1
@@ -240,7 +240,6 @@ int skl_get_pvt_instance_id_map(struct skl_dev *skl,void skl_freeup_uuid_list (struct skl_dev *skl);int skl_dsp_strip_extended_manifest (struct firmware *fw); -void skl_dsp_enable_notification (struct skl_dev *skl,bool enable);void skl_dsp_set_astate_cfg (struct skl_dev *skl,u32 cnt,void *data);
sound/soc/intel/skylake/skl-topology.h +0 -5
@@ -140,11 +140,6 @@ struct skl_src_module_cfg {enum skl_s_freq src_cfg; } __packed; -struct notification_mask { -u32 notify; -u32 enable; -} __packed; -struct skl_up_down_mixer_cfg {struct skl_base_cfg base_cfg;enum skl_ch_cfg out_ch_cfg;
Signature · 6 lines
2.17.1 _______________________________________________ Alsa-devel mailing list [email protected] https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Cezary Rojewski
maintainerPATCH 6/7 ASoC: Intel: Skylake: Make MCPS and CPS params obsolete
In reply to Cezary RojewskiAs per FW Interface Modules Configuration, init instance IPC request requires base initial module configuration. This configuration structure is made of:
- cpc (chunks per cycle)
- ibs (input buffer size)
- obs (output buffer size)
- is_pages (memory pages required)
- audio_fmt (self explanatory)
Skylake topology accepts following tokens: MCPS, CPS and CPC. All of these are directly connected. Moreover, assigning one of these allows to calculate the remaining two. In simplest scenario and assuming 1ms scheduling, following is true:
CPS = CPC times 1000
MCPS = CPS times 1000 000
Note: these calculations vary depending on scenario and scheduling requirements.
Given the current implementation, userspace is allowed to provide different values for all three causing informational chaos. On top of that, struct skl_base_cfg which represents base module configuration, incorrectly takes CPS param instead of CPC.
This ambiguity may lead to user unintentionally providing improper values to DSP firmware and thus impacting module scheduling in unexpected fashion. Fix by making MCPS and CPS topology params obsolete and relying solely on CPC value.
--- sound/soc/intel/skylake/skl-debug.c | 6 ++++-- sound/soc/intel/skylake/skl-messages.c | 2 +- sound/soc/intel/skylake/skl-topology.c | 15 ++++++--------- sound/soc/intel/skylake/skl-topology.h | 4 +--- 4 files changed, 12 insertions(+), 15 deletions(-)
sound/soc/intel/skylake/skl-debug.c +4 -2
@@ -66,6 +66,8 @@ static ssize_t module_read(struct file *file, char __user *user_buf, size_t count, loff_t *ppos) { struct skl_module_cfg *mconfig = file->private_data; +struct skl_module *module = mconfig->module; +struct skl_module_res *res = &module->resources[mconfig->res_idx];char *buf;ssize_t ret;
@@ -79,8 +81,8 @@ static ssize_t module_read(struct file *file, char __user *user_buf, mconfig->id.pvt_id); ret +=snprintf (buf + ret,MOD_BUF - ret, -"Resources:\n\tMCPS %#x\n\tIBS %#x\n\tOBS %#x\t\n" , - mconfig->mcps, mconfig->ibs, mconfig->obs); +"Resources:\n\tCPC %#x\n\tIBS %#x\n\tOBS %#x\t\n" , + res->cpc, res->ibs, res->obs); ret +=snprintf (buf + ret,MOD_BUF - ret, "Module data:\n\tCore %d\n\tIn queue %d\n\t"
sound/soc/intel/skylake/skl-messages.c +1 -1
@@ -477,7 +477,7 @@ static void skl_set_base_module_format(struct skl_dev *skl, base_cfg->audio_fmt.interleaving = format->interleaving_style; - base_cfg->cps = res->cps; + base_cfg->cpc = res->cpc; base_cfg->ibs = res->ibs; base_cfg->obs = res->obs; base_cfg->is_pages = res->is_pages;
sound/soc/intel/skylake/skl-topology.c +6 -9
@@ -2205,10 +2205,6 @@ static int skl_tplg_fill_res_tkn(struct device *dev,return -EINVAL ;switch (tkn_elem->token) { -case SKL_TKN_MM_U32_CPS : - res->cps = tkn_elem->value; -break ; -case SKL_TKN_MM_U32_DMA_SIZE : res->dma_buffer_size = tkn_elem->value;break ;
@@ -2229,10 +2225,6 @@ static int skl_tplg_fill_res_tkn(struct device *dev, res->ibs = tkn_elem->value;break ; -case SKL_TKN_U32_MAX_MCPS : - res->cps = tkn_elem->value; -break ; -case SKL_TKN_MM_U32_RES_PIN_ID :case SKL_TKN_MM_U32_PIN_BUF : ret = skl_tplg_manifest_pin_res_tkn(dev, tkn_elem, res,
@@ -2241,6 +2233,11 @@ static int skl_tplg_fill_res_tkn(struct device *dev,return ret;break ; +case SKL_TKN_MM_U32_CPS : +case SKL_TKN_U32_MAX_MCPS : +/* ignore unused tokens */ +break ; +default :dev_err (dev,"Not a res type token: %d" , tkn_elem->token);return -EINVAL ;
@@ -2693,7 +2690,7 @@ static int skl_tplg_get_pvt_data_v4(struct snd_soc_tplg_dapm_widget *tplg_w,return ret; mconfig->id.module_id =-1 ; mconfig->id.instance_id = dfw->instance_id; - mconfig->module->resources[0 ].cps = dfw->max_mcps; + mconfig->module->resources[0 ].cpc = dfw->max_mcps /1000 ; mconfig->module->resources[0 ].ibs = dfw->ibs; mconfig->module->resources[0 ].obs = dfw->obs; mconfig->core_id = dfw->core_id;
sound/soc/intel/skylake/skl-topology.h +1 -3
@@ -101,7 +101,7 @@ struct skl_audio_data_format { } __packed;struct skl_base_cfg { -u32 cps; +u32 cpc;u32 ibs;u32 obs;u32 is_pages;
@@ -343,7 +343,6 @@ struct skl_module_pin_resources {struct skl_module_res {u8 id;u32 is_pages; -u32 cps;u32 ibs;u32 obs;u32 dma_buffer_size;
@@ -384,7 +383,6 @@ struct skl_module_cfg {u8 out_queue_mask;u8 in_queue;u8 out_queue; -u32 mcps;u32 ibs;u32 obs;u8 is_loadable;
Signature · 1 line
2.17.1
Cezary Rojewski
maintainerPATCH 7/7 ASoC: Intel: Skylake: Cleanup skl_module_cfg declaration
In reply to Cezary RojewskiWith removal of MCPS, CPS and CPC ambiguity, ibs and obs params for struct skl_module_cfg have been left unused. Update struct declaration by removing these two.
--- sound/soc/intel/skylake/skl-topology.h | 2 -- 1 file changed, 2 deletions(-)
sound/soc/intel/skylake/skl-topology.h +0 -2
@@ -383,8 +383,6 @@ struct skl_module_cfg {u8 out_queue_mask;u8 in_queue;u8 out_queue; -u32 ibs; -u32 obs;u8 is_loadable;u8 core_id;u8 dev_type;
Signature · 1 line
2.17.1