ASoC: Intel: Skylake: Add support for library load
Subsystems (3)
cover ASoC: Intel: Skylake: Add support for library load
This patch series adds support for library loading. A module maybe part of base firmware or in a different library. A library may have one or more modules. The names of library to be loaded are passed as topology manifest data. The library list is loaded after base FW during dsp init. So we add support library load IPC and the usage in broxton ops for loading libs.
To load a list of lib(s) coming from topology, we need to split DSP init, into object creation and fw_init. The fw_init is invoked from soc-probe after topology is initialized. Now fw is initialized later, so module UUID query was move to runtime as the firmware is not available at topology initialization.
While at it, also fix the parsing UUIDs only once for SKL and BXT ops and one comment code style.
Lastly this series adds support for specifying processing domain for modules.
Kranthi G (1):
ASoC: Intel: Skylake: add support for tplg manifest load
Ramesh Babu (2):
ASoC: Intel: Skylake: Add library loading IPCs
ASoC: Intel: Skylake: Add library loading support
Senthilnathan Veppur (2):
ASoC: Intel: Skylake: add additional args to module parsing
ASoC: Intel: Skylake: Add module processing domain support
Vinod Koul (7):
ASoC: Intel: Skylake: Check list empty while getting module info
ASoC: Intel: Skylake: Move modules query to runtime
ASoC: Intel: Skylake: modify skl_get_dsp_ops()
ASoC: Intel: Skylake: split fw and dsp initialization
ASoC: Intel: Skylake: Parse UUIDs once
ASoC: Intel: Bxt: Parse UUIDs once
ASoC: Intel: Skylake: Fix a comment style
sound/soc/intel/skylake/bxt-sst.c | 114 ++++++++++++++++++++++++--- sound/soc/intel/skylake/skl-messages.c | 39 +++++---- sound/soc/intel/skylake/skl-pcm.c | 20 +++++ sound/soc/intel/skylake/skl-sst-dsp.h | 7 +- sound/soc/intel/skylake/skl-sst-ipc.c | 29 +++++++ sound/soc/intel/skylake/skl-sst-ipc.h | 12 ++- sound/soc/intel/skylake/skl-sst-utils.c | 14 +++- sound/soc/intel/skylake/skl-sst.c | 43 ++++++---- sound/soc/intel/skylake/skl-topology.c | 55 +++++++++++-- sound/soc/intel/skylake/skl-topology.h | 2 +- sound/soc/intel/skylake/skl-tplg-interface.h | 15 +++- sound/soc/intel/skylake/skl.h | 2 + 12 files changed, 297 insertions(+), 55 deletions(-)
Signature · 1 line
1.9.1
PATCH 1/12 ASoC: Intel: Skylake: Check list empty while getting module info
Module list can be NULL so check if the list is empty before accessing the list.
--- sound/soc/intel/skylake/skl-sst-utils.c | 5 +++++ 1 file changed, 5 insertions(+)
sound/soc/intel/skylake/skl-sst-utils.c +5 -0
@@ -123,6 +123,11 @@ int snd_skl_get_module_info(struct skl_sst *ctx, u8 *uuid, uuid_mod = (uuid_le *)uuid; +if (list_empty (&ctx->uuid_list)) { +dev_err (ctx->dev,"Module list is empty\n" ); +return -EINVAL ; + } +list_for_each_entry (module, &ctx->uuid_list, list) {if (uuid_le_cmp (*uuid_mod, module->uuid) ==0 ) { dfw_config->module_id = module->id;
Signature · 1 line
1.9.1
Mark Brown
maintainerApplied "ASoC: Intel: Skylake: Check list empty while getting module info" to the asoc tree
The patch
ASoC: Intel: Skylake: Check list empty while getting module info
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All 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
Quoted 1 line
From
2392f7fd695246df4fb5f0b5fb88ce37cdb01764Mon Sep 17 00:00:00 2001
From: Vinod Koul <[email protected]>
Date: Tue, 26 Jul 2016 18:06:39 +0530
Subject: [PATCH] ASoC: Intel: Skylake: Check list empty while getting module
info
Module list can be NULL so check if the list is empty before accessing the list.
--- sound/soc/intel/skylake/skl-sst-utils.c | 5 +++++ 1 file changed, 5 insertions(+)
sound/soc/intel/skylake/skl-sst-utils.c +5 -0
@@ -123,6 +123,11 @@ int snd_skl_get_module_info(struct skl_sst *ctx, u8 *uuid, uuid_mod = (uuid_le *)uuid; +if (list_empty (&ctx->uuid_list)) { +dev_err (ctx->dev,"Module list is empty\n" ); +return -EINVAL ; + } +list_for_each_entry (module, &ctx->uuid_list, list) {if (uuid_le_cmp (*uuid_mod, module->uuid) ==0 ) { dfw_config->module_id = module->id;
Signature · 1 line
2.8.1
PATCH 2/12 ASoC: Intel: Skylake: Move modules query to runtime
In reply to Vinod KoulSince we are moving DSP init to later, at the topology load the module info is not available.
So set the module id to -1 at init and query at first module initialization.
--- sound/soc/intel/skylake/skl-topology.c | 32 +++++++++++++++++++++++++++----- sound/soc/intel/skylake/skl-topology.h | 2 +- 2 files changed, 28 insertions(+), 6 deletions(-)
sound/soc/intel/skylake/skl-topology.c +27 -5
@@ -473,6 +473,28 @@ skl_tplg_init_pipe_modules(struct skl *skl, struct skl_pipe *pipe) w = w_module->w; mconfig = w->priv; +/* check if module ids are populated */ +if (mconfig->id.module_id <0 ) { +struct skl_dfw_module *dfw_config; + + dfw_config =kzalloc (sizeof (dfw_config),GFP_KERNEL ); +if (!dfw_config) +return -ENOMEM ; + + ret =snd_skl_get_module_info (skl->skl_sst, + mconfig->guid, dfw_config); +if (ret <0 ) { +dev_err (skl->skl_sst->dev, +"query module info failed: %d\n" , ret); +kfree (dfw_config); +return ret; + } + mconfig->id.module_id = dfw_config->module_id; + mconfig->is_loadable = dfw_config->is_loadable; + +kfree (dfw_config); + } +/* check resource available */ if (!skl_is_pipe_mcps_avail (skl, mconfig))return -ENOMEM ;
@@ -1621,11 +1643,11 @@ static int skl_tplg_widget_load(struct snd_soc_component *cmpnt, w->priv = mconfig;memcpy (&mconfig->guid, &dfw_config->uuid,16 ); - ret =snd_skl_get_module_info (skl->skl_sst, mconfig->guid, dfw_config); -if (ret <0 ) -return ret; - - mconfig->id.module_id = dfw_config->module_id; +/* +* module binary can be loaded later, so set it to query when +* module is load for a use case +*/ + mconfig->id.module_id =-1 ; mconfig->id.instance_id = dfw_config->instance_id; mconfig->mcps = dfw_config->max_mcps; mconfig->ibs = dfw_config->ibs;
sound/soc/intel/skylake/skl-topology.h +1 -1
@@ -216,7 +216,7 @@ struct skl_module_fmt {struct skl_module_cfg ;struct skl_module_inst_id { -u32 module_id; +int module_id;u32 instance_id; };
Signature · 1 line
1.9.1
Mark Brown
maintainerApplied "ASoC: Intel: Skylake: Move modules query to runtime" to the asoc tree
The patch
ASoC: Intel: Skylake: Move modules query to runtime
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All 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
Quoted 1 line
From
7c617ec3e8f6b614e63ea9c82ce2ea39e7daf579Mon Sep 17 00:00:00 2001
From: Vinod Koul <[email protected]>
Date: Tue, 26 Jul 2016 18:06:40 +0530
Subject: [PATCH] ASoC: Intel: Skylake: Move modules query to runtime
Since we are moving DSP init to later, at the topology load the module info is not available.
So set the module id to -1 at init and query at first module initialization.
--- sound/soc/intel/skylake/skl-topology.c | 32 +++++++++++++++++++++++++++----- sound/soc/intel/skylake/skl-topology.h | 2 +- 2 files changed, 28 insertions(+), 6 deletions(-)
sound/soc/intel/skylake/skl-topology.c +27 -5
@@ -473,6 +473,28 @@ skl_tplg_init_pipe_modules(struct skl *skl, struct skl_pipe *pipe) w = w_module->w; mconfig = w->priv; +/* check if module ids are populated */ +if (mconfig->id.module_id <0 ) { +struct skl_dfw_module *dfw_config; + + dfw_config =kzalloc (sizeof (dfw_config),GFP_KERNEL ); +if (!dfw_config) +return -ENOMEM ; + + ret =snd_skl_get_module_info (skl->skl_sst, + mconfig->guid, dfw_config); +if (ret <0 ) { +dev_err (skl->skl_sst->dev, +"query module info failed: %d\n" , ret); +kfree (dfw_config); +return ret; + } + mconfig->id.module_id = dfw_config->module_id; + mconfig->is_loadable = dfw_config->is_loadable; + +kfree (dfw_config); + } +/* check resource available */ if (!skl_is_pipe_mcps_avail (skl, mconfig))return -ENOMEM ;
@@ -1621,11 +1643,11 @@ static int skl_tplg_widget_load(struct snd_soc_component *cmpnt, w->priv = mconfig;memcpy (&mconfig->guid, &dfw_config->uuid,16 ); - ret =snd_skl_get_module_info (skl->skl_sst, mconfig->guid, dfw_config); -if (ret <0 ) -return ret; - - mconfig->id.module_id = dfw_config->module_id; +/* +* module binary can be loaded later, so set it to query when +* module is load for a use case +*/ + mconfig->id.module_id =-1 ; mconfig->id.instance_id = dfw_config->instance_id; mconfig->mcps = dfw_config->max_mcps; mconfig->ibs = dfw_config->ibs;
sound/soc/intel/skylake/skl-topology.h +1 -1
@@ -216,7 +216,7 @@ struct skl_module_fmt {struct skl_module_cfg ;struct skl_module_inst_id { -u32 module_id; +int module_id;u32 instance_id; };
Signature · 1 line
2.8.1
PATCH 3/12 ASoC: Intel: Skylake: modify skl_get_dsp_ops()
In reply to Vinod KoulTo query the ops used for a platform, we use skl_get_dsp_ops() which return index and then we load the ops.
Rather than this return the ops, this way it cna be used later to query the ops in rest of the driver.
--- sound/soc/intel/skylake/skl-messages.c | 30 ++++++++++++++++-------------- sound/soc/intel/skylake/skl.h | 1 + 2 files changed, 17 insertions(+), 14 deletions(-)
sound/soc/intel/skylake/skl-messages.c +16 -14
@@ -219,16 +219,16 @@ static const struct skl_dsp_ops dsp_ops[] = { }, }; -static int skl_get_dsp_ops (int pci_id) +const struct skl_dsp_ops *skl_get_dsp_ops (int pci_id) {int i;for (i =0 ; i <ARRAY_SIZE (dsp_ops); i++) {if (dsp_ops[i].id == pci_id) -return i; +return &dsp_ops[i]; } -return -EINVAL ; +return NULL ; }int skl_init_dsp (struct skl *skl)
@@ -238,7 +238,8 @@ int skl_init_dsp(struct skl *skl)struct hdac_bus *bus =ebus_to_hbus (ebus);struct skl_dsp_loader_ops loader_ops;int irq = bus->irq; -int ret, index; +const struct skl_dsp_ops *ops; +int ret;/* enable ppcap interrupt */ snd_hdac_ext_bus_ppcap_enable (&skl->ebus, true);
@@ -251,13 +252,14 @@ int skl_init_dsp(struct skl *skl)return -ENXIO ; } - index =skl_get_dsp_ops (skl->pci->device); -if (index <0 ) -return -EINVAL ; + ops =skl_get_dsp_ops (skl->pci->device); +if (!ops) +return -EIO ; - loader_ops = dsp_ops[index].loader_ops (); - ret = dsp_ops[index].init (bus->dev, mmio_base, irq, - skl->fw_name, loader_ops, &skl->skl_sst); + loader_ops = ops->loader_ops (); + ret = ops->init (bus->dev, mmio_base, irq, + skl->fw_name, loader_ops, + &skl->skl_sst);if (ret <0 )return ret;
@@ -273,16 +275,16 @@ int skl_free_dsp(struct skl *skl)struct hdac_ext_bus *ebus = &skl->ebus;struct hdac_bus *bus =ebus_to_hbus (ebus);struct skl_sst *ctx = skl->skl_sst; -int index; +const struct skl_dsp_ops *ops;/* disable ppcap interrupt */ snd_hdac_ext_bus_ppcap_int_enable (&skl->ebus, false); - index =skl_get_dsp_ops (skl->pci->device); -if (index <0 ) + ops =skl_get_dsp_ops (skl->pci->device); +if (!ops)return -EIO ; - dsp_ops[index].cleanup (bus->dev, ctx); + ops->cleanup (bus->dev, ctx);if (ctx->dsp->addr.lpe)iounmap (ctx->dsp->addr.lpe);
sound/soc/intel/skylake/skl.h +1 -0
@@ -123,4 +123,5 @@ int skl_free_dsp(struct skl *skl);int skl_suspend_dsp (struct skl *skl);int skl_resume_dsp (struct skl *skl);void skl_cleanup_resources (struct skl *skl); +const struct skl_dsp_ops *skl_get_dsp_ops (int pci_id);#endif /* __SOUND_SOC_SKL_H */
Signature · 1 line
1.9.1
Mark Brown
maintainerApplied "ASoC: Intel: Skylake: modify skl_get_dsp_ops()" to the asoc tree
The patch
ASoC: Intel: Skylake: modify skl_get_dsp_ops()
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All 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
Quoted 1 line
From
e68644c4290c6fbc65d1684c04b15c5828f8d765Mon Sep 17 00:00:00 2001
From: Vinod Koul <[email protected]>
Date: Tue, 26 Jul 2016 18:06:41 +0530
Subject: [PATCH] ASoC: Intel: Skylake: modify skl_get_dsp_ops()
To query the ops used for a platform, we use skl_get_dsp_ops() which return index and then we load the ops.
Rather than this return the ops, this way it cna be used later to query the ops in rest of the driver.
--- sound/soc/intel/skylake/skl-messages.c | 30 ++++++++++++++++-------------- sound/soc/intel/skylake/skl.h | 1 + 2 files changed, 17 insertions(+), 14 deletions(-)
sound/soc/intel/skylake/skl-messages.c +16 -14
@@ -219,16 +219,16 @@ static const struct skl_dsp_ops dsp_ops[] = { }, }; -static int skl_get_dsp_ops (int pci_id) +const struct skl_dsp_ops *skl_get_dsp_ops (int pci_id) {int i;for (i =0 ; i <ARRAY_SIZE (dsp_ops); i++) {if (dsp_ops[i].id == pci_id) -return i; +return &dsp_ops[i]; } -return -EINVAL ; +return NULL ; }int skl_init_dsp (struct skl *skl)
@@ -238,7 +238,8 @@ int skl_init_dsp(struct skl *skl)struct hdac_bus *bus =ebus_to_hbus (ebus);struct skl_dsp_loader_ops loader_ops;int irq = bus->irq; -int ret, index; +const struct skl_dsp_ops *ops; +int ret;/* enable ppcap interrupt */ snd_hdac_ext_bus_ppcap_enable (&skl->ebus, true);
@@ -251,13 +252,14 @@ int skl_init_dsp(struct skl *skl)return -ENXIO ; } - index =skl_get_dsp_ops (skl->pci->device); -if (index <0 ) -return -EINVAL ; + ops =skl_get_dsp_ops (skl->pci->device); +if (!ops) +return -EIO ; - loader_ops = dsp_ops[index].loader_ops (); - ret = dsp_ops[index].init (bus->dev, mmio_base, irq, - skl->fw_name, loader_ops, &skl->skl_sst); + loader_ops = ops->loader_ops (); + ret = ops->init (bus->dev, mmio_base, irq, + skl->fw_name, loader_ops, + &skl->skl_sst);if (ret <0 )return ret;
@@ -273,16 +275,16 @@ int skl_free_dsp(struct skl *skl)struct hdac_ext_bus *ebus = &skl->ebus;struct hdac_bus *bus =ebus_to_hbus (ebus);struct skl_sst *ctx = skl->skl_sst; -int index; +const struct skl_dsp_ops *ops;/* disable ppcap interrupt */ snd_hdac_ext_bus_ppcap_int_enable (&skl->ebus, false); - index =skl_get_dsp_ops (skl->pci->device); -if (index <0 ) + ops =skl_get_dsp_ops (skl->pci->device); +if (!ops)return -EIO ; - dsp_ops[index].cleanup (bus->dev, ctx); + ops->cleanup (bus->dev, ctx);if (ctx->dsp->addr.lpe)iounmap (ctx->dsp->addr.lpe);
sound/soc/intel/skylake/skl.h +1 -0
@@ -123,4 +123,5 @@ int skl_free_dsp(struct skl *skl);int skl_suspend_dsp (struct skl *skl);int skl_resume_dsp (struct skl *skl);void skl_cleanup_resources (struct skl *skl); +const struct skl_dsp_ops *skl_get_dsp_ops (int pci_id);#endif /* __SOUND_SOC_SKL_H */
Signature · 1 line
2.8.1
PATCH 4/12 ASoC: Intel: Skylake: split fw and dsp initialization
In reply to Vinod KoulThe DSP instance creation also loads the firmware on DSPs. For library load the firmware names come from topology so can't be loaded at object creation.
So split the firmware load and object creation. FW load is now called after topology init in platform probe.
--- sound/soc/intel/skylake/bxt-sst.c | 19 +++++++++++++++---- sound/soc/intel/skylake/skl-messages.c | 8 +++++++- sound/soc/intel/skylake/skl-pcm.c | 20 ++++++++++++++++++++ sound/soc/intel/skylake/skl-sst-dsp.h | 2 ++ sound/soc/intel/skylake/skl-sst-ipc.h | 3 +++ sound/soc/intel/skylake/skl-sst.c | 27 +++++++++++++++++---------- sound/soc/intel/skylake/skl.h | 1 + 7 files changed, 65 insertions(+), 15 deletions(-)
sound/soc/intel/skylake/bxt-sst.c +15 -4
@@ -397,6 +397,19 @@ int bxt_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq, skl->cores.count =2 ; skl->boot_complete = false;init_waitqueue_head (&skl->boot_wait); + skl->is_first_boot = true; + +if (dsp) + *dsp = skl; + +return 0 ; +} +EXPORT_SYMBOL_GPL (bxt_sst_dsp_init); + +int bxt_sst_init_fw (struct device *dev,struct skl_sst *ctx) +{ +int ret; +struct sst_dsp *sst = ctx->dsp; ret = sst->fw_ops.load_fw (sst);if (ret <0 ) {
@@ -406,13 +419,11 @@ int bxt_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq,skl_dsp_init_core_state (sst); -if (dsp) - *dsp = skl; + ctx->is_first_boot = false;return 0 ; } -EXPORT_SYMBOL_GPL (bxt_sst_dsp_init); - +EXPORT_SYMBOL_GPL (bxt_sst_init_fw);void bxt_sst_dsp_cleanup (struct device *dev,struct skl_sst *ctx) {
sound/soc/intel/skylake/skl-messages.c +7 -1
@@ -203,18 +203,21 @@ static const struct skl_dsp_ops dsp_ops[] = { .id = 0x9d70, .loader_ops = skl_get_loader_ops, .init = skl_sst_dsp_init, + .init_fw = skl_sst_init_fw, .cleanup = skl_sst_dsp_cleanup }, { .id = 0x9d71, .loader_ops = skl_get_loader_ops, .init = skl_sst_dsp_init, + .init_fw = skl_sst_init_fw, .cleanup = skl_sst_dsp_cleanup }, { .id = 0x5a98, .loader_ops = bxt_get_loader_ops, .init = bxt_sst_dsp_init, + .init_fw = bxt_sst_init_fw, .cleanup = bxt_sst_dsp_cleanup }, };
@@ -264,7 +267,6 @@ int skl_init_dsp(struct skl *skl)if (ret <0 )return ret; -skl_dsp_enable_notification (skl->skl_sst, false);dev_dbg (bus->dev,"dsp registration status=%d\n" , ret);return ret;
@@ -325,6 +327,10 @@ int skl_resume_dsp(struct skl *skl)snd_hdac_ext_bus_ppcap_enable (&skl->ebus, true);snd_hdac_ext_bus_ppcap_int_enable (&skl->ebus, true); +/* check if DSP 1st boot is done */ +if (skl->skl_sst->is_first_boot == true) +return 0 ; + ret =skl_dsp_wake (ctx->dsp);if (ret <0 )return ret;
sound/soc/intel/skylake/skl-pcm.c +20 -0
@@ -1142,8 +1142,10 @@ static int skl_platform_soc_probe(struct snd_soc_platform *platform) {struct hdac_ext_bus *ebus =dev_get_drvdata (platform->dev);struct skl *skl =ebus_to_skl (ebus); +const struct skl_dsp_ops *ops;int ret; +pm_runtime_get_sync (platform->dev);if (ebus->ppcap) { ret =skl_tplg_init (platform, ebus);if (ret <0 ) {
@@ -1151,7 +1153,25 @@ static int skl_platform_soc_probe(struct snd_soc_platform *platform)return ret; } skl->platform = platform; + +/* load the firmwares, since all is set */ + ops =skl_get_dsp_ops (skl->pci->device); +if (!ops) +return -EIO ; + +if (skl->skl_sst->is_first_boot == false) { +dev_err (platform->dev,"DSP reports first boot done!!!\n" ); +return -EIO ; + } + + ret = ops->init_fw (platform->dev, skl->skl_sst); +if (ret <0 ) { +dev_err (platform->dev,"Failed to boot first fw: %d\n" , ret); +return ret; + } } +pm_runtime_mark_last_busy (platform->dev); +pm_runtime_put_autosuspend (platform->dev);return 0 ; }
sound/soc/intel/skylake/skl-sst-dsp.h +2 -0
@@ -203,6 +203,8 @@ int skl_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq,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);
sound/soc/intel/skylake/skl-sst-ipc.h +3 -0
@@ -75,6 +75,9 @@ struct skl_sst {/* Is firmware loaded */ bool fw_loaded; +/* first boot ? */ +bool is_first_boot; +/* multi-core */ struct skl_dsp_cores cores; };
sound/soc/intel/skylake/skl-sst.c +17 -10
@@ -484,25 +484,32 @@ int skl_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq,return ret; skl->cores.count =2 ; + skl->is_first_boot = true; + +if (dsp) + *dsp = skl; + +return ret; +} +EXPORT_SYMBOL_GPL (skl_sst_dsp_init); + +int skl_sst_init_fw (struct device *dev,struct skl_sst *ctx) +{ +int ret; +struct sst_dsp *sst = ctx->dsp; ret = sst->fw_ops.load_fw (sst);if (ret <0 ) {dev_err (dev,"Load base fw failed : %d" , ret); - goto cleanup; +return ret; }skl_dsp_init_core_state (sst); + ctx->is_first_boot = false; -if (dsp) - *dsp = skl; - -return ret; - -cleanup: -skl_sst_dsp_cleanup (dev, skl); -return ret; +return 0 ; } -EXPORT_SYMBOL_GPL (skl_sst_dsp_init); +EXPORT_SYMBOL_GPL (skl_sst_init_fw);void skl_sst_dsp_cleanup (struct device *dev,struct skl_sst *ctx) {
sound/soc/intel/skylake/skl.h +1 -0
@@ -105,6 +105,7 @@ struct skl_dsp_ops { int irq, const char *fw_name, struct skl_dsp_loader_ops loader_ops, struct skl_sst **skl_sst); +int (*init_fw)(struct device *dev,struct skl_sst *ctx);void (*cleanup)(struct device *dev,struct skl_sst *ctx); };
Signature · 1 line
1.9.1
Mark Brown
maintainerApplied "ASoC: Intel: Skylake: split fw and dsp initialization" to the asoc tree
The patch
ASoC: Intel: Skylake: split fw and dsp initialization
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All 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
Quoted 1 line
From
b2f51fd9e11429124cab41fb2b94d1d2ee6ec9fcMon Sep 17 00:00:00 2001
From: Vinod Koul <[email protected]>
Date: Tue, 26 Jul 2016 18:06:42 +0530
Subject: [PATCH] ASoC: Intel: Skylake: split fw and dsp initialization
The DSP instance creation also loads the firmware on DSPs. For library load the firmware names come from topology so can't be loaded at object creation.
So split the firmware load and object creation. FW load is now called after topology init in platform probe.
--- sound/soc/intel/skylake/bxt-sst.c | 19 +++++++++++++++---- sound/soc/intel/skylake/skl-messages.c | 8 +++++++- sound/soc/intel/skylake/skl-pcm.c | 20 ++++++++++++++++++++ sound/soc/intel/skylake/skl-sst-dsp.h | 2 ++ sound/soc/intel/skylake/skl-sst-ipc.h | 3 +++ sound/soc/intel/skylake/skl-sst.c | 27 +++++++++++++++++---------- sound/soc/intel/skylake/skl.h | 1 + 7 files changed, 65 insertions(+), 15 deletions(-)
sound/soc/intel/skylake/bxt-sst.c +15 -4
@@ -397,6 +397,19 @@ int bxt_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq, skl->cores.count =2 ; skl->boot_complete = false;init_waitqueue_head (&skl->boot_wait); + skl->is_first_boot = true; + +if (dsp) + *dsp = skl; + +return 0 ; +} +EXPORT_SYMBOL_GPL (bxt_sst_dsp_init); + +int bxt_sst_init_fw (struct device *dev,struct skl_sst *ctx) +{ +int ret; +struct sst_dsp *sst = ctx->dsp; ret = sst->fw_ops.load_fw (sst);if (ret <0 ) {
@@ -406,13 +419,11 @@ int bxt_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq,skl_dsp_init_core_state (sst); -if (dsp) - *dsp = skl; + ctx->is_first_boot = false;return 0 ; } -EXPORT_SYMBOL_GPL (bxt_sst_dsp_init); - +EXPORT_SYMBOL_GPL (bxt_sst_init_fw);void bxt_sst_dsp_cleanup (struct device *dev,struct skl_sst *ctx) {
sound/soc/intel/skylake/skl-messages.c +7 -1
@@ -203,18 +203,21 @@ static const struct skl_dsp_ops dsp_ops[] = { .id = 0x9d70, .loader_ops = skl_get_loader_ops, .init = skl_sst_dsp_init, + .init_fw = skl_sst_init_fw, .cleanup = skl_sst_dsp_cleanup }, { .id = 0x9d71, .loader_ops = skl_get_loader_ops, .init = skl_sst_dsp_init, + .init_fw = skl_sst_init_fw, .cleanup = skl_sst_dsp_cleanup }, { .id = 0x5a98, .loader_ops = bxt_get_loader_ops, .init = bxt_sst_dsp_init, + .init_fw = bxt_sst_init_fw, .cleanup = bxt_sst_dsp_cleanup }, };
@@ -264,7 +267,6 @@ int skl_init_dsp(struct skl *skl)if (ret <0 )return ret; -skl_dsp_enable_notification (skl->skl_sst, false);dev_dbg (bus->dev,"dsp registration status=%d\n" , ret);return ret;
@@ -325,6 +327,10 @@ int skl_resume_dsp(struct skl *skl)snd_hdac_ext_bus_ppcap_enable (&skl->ebus, true);snd_hdac_ext_bus_ppcap_int_enable (&skl->ebus, true); +/* check if DSP 1st boot is done */ +if (skl->skl_sst->is_first_boot == true) +return 0 ; + ret =skl_dsp_wake (ctx->dsp);if (ret <0 )return ret;
sound/soc/intel/skylake/skl-pcm.c +20 -0
@@ -1142,8 +1142,10 @@ static int skl_platform_soc_probe(struct snd_soc_platform *platform) {struct hdac_ext_bus *ebus =dev_get_drvdata (platform->dev);struct skl *skl =ebus_to_skl (ebus); +const struct skl_dsp_ops *ops;int ret; +pm_runtime_get_sync (platform->dev);if (ebus->ppcap) { ret =skl_tplg_init (platform, ebus);if (ret <0 ) {
@@ -1151,7 +1153,25 @@ static int skl_platform_soc_probe(struct snd_soc_platform *platform)return ret; } skl->platform = platform; + +/* load the firmwares, since all is set */ + ops =skl_get_dsp_ops (skl->pci->device); +if (!ops) +return -EIO ; + +if (skl->skl_sst->is_first_boot == false) { +dev_err (platform->dev,"DSP reports first boot done!!!\n" ); +return -EIO ; + } + + ret = ops->init_fw (platform->dev, skl->skl_sst); +if (ret <0 ) { +dev_err (platform->dev,"Failed to boot first fw: %d\n" , ret); +return ret; + } } +pm_runtime_mark_last_busy (platform->dev); +pm_runtime_put_autosuspend (platform->dev);return 0 ; }
sound/soc/intel/skylake/skl-sst-dsp.h +2 -0
@@ -203,6 +203,8 @@ int skl_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq,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);
sound/soc/intel/skylake/skl-sst-ipc.h +3 -0
@@ -75,6 +75,9 @@ struct skl_sst {/* Is firmware loaded */ bool fw_loaded; +/* first boot ? */ +bool is_first_boot; +/* multi-core */ struct skl_dsp_cores cores; };
sound/soc/intel/skylake/skl-sst.c +17 -10
@@ -484,25 +484,32 @@ int skl_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq,return ret; skl->cores.count =2 ; + skl->is_first_boot = true; + +if (dsp) + *dsp = skl; + +return ret; +} +EXPORT_SYMBOL_GPL (skl_sst_dsp_init); + +int skl_sst_init_fw (struct device *dev,struct skl_sst *ctx) +{ +int ret; +struct sst_dsp *sst = ctx->dsp; ret = sst->fw_ops.load_fw (sst);if (ret <0 ) {dev_err (dev,"Load base fw failed : %d" , ret); - goto cleanup; +return ret; }skl_dsp_init_core_state (sst); + ctx->is_first_boot = false; -if (dsp) - *dsp = skl; - -return ret; - -cleanup: -skl_sst_dsp_cleanup (dev, skl); -return ret; +return 0 ; } -EXPORT_SYMBOL_GPL (skl_sst_dsp_init); +EXPORT_SYMBOL_GPL (skl_sst_init_fw);void skl_sst_dsp_cleanup (struct device *dev,struct skl_sst *ctx) {
sound/soc/intel/skylake/skl.h +1 -0
@@ -105,6 +105,7 @@ struct skl_dsp_ops { int irq, const char *fw_name, struct skl_dsp_loader_ops loader_ops, struct skl_sst **skl_sst); +int (*init_fw)(struct device *dev,struct skl_sst *ctx);void (*cleanup)(struct device *dev,struct skl_sst *ctx); };
Signature · 1 line
2.8.1
PATCH 5/12 ASoC: Intel: Skylake: add support for tplg manifest load
In reply to Vinod KoulFrom: Kranthi G <[email protected]>
Topology manifest gives information about the libraries to be loaded. Implement the topology manifest load callback to get this.
--- sound/soc/intel/skylake/skl-sst-ipc.h | 3 +++ sound/soc/intel/skylake/skl-topology.c | 22 ++++++++++++++++++++++ sound/soc/intel/skylake/skl-tplg-interface.h | 12 ++++++++++++ 3 files changed, 37 insertions(+)
sound/soc/intel/skylake/skl-sst-ipc.h +3 -0
@@ -80,6 +80,9 @@ struct skl_sst {/* multi-core */ struct skl_dsp_cores cores; + +/* tplg manifest */ +struct skl_dfw_manifest manifest; };struct skl_ipc_init_instance_msg {
sound/soc/intel/skylake/skl-topology.c +22 -0
@@ -1789,11 +1789,33 @@ static int skl_tplg_control_load(struct snd_soc_component *cmpnt,return 0 ; } +static int skl_manifest_load (struct snd_soc_component *cmpnt, +struct snd_soc_tplg_manifest *manifest) +{ +struct skl_dfw_manifest *minfo; +struct hdac_ext_bus *ebus =snd_soc_component_get_drvdata (cmpnt); +struct hdac_bus *bus =ebus_to_hbus (ebus); +struct skl *skl =ebus_to_skl (ebus); +int ret =0 ; + + minfo = &skl->skl_sst->manifest; +memcpy (minfo, manifest->priv.data,sizeof (struct skl_dfw_manifest )); + +if (minfo->lib_count >HDA_MAX_LIB ) { +dev_err (bus->dev,"Exceeding max Library count. Got:%d\n" , + minfo->lib_count); + ret = -EINVAL ; + } + +return ret; +} +static struct snd_soc_tplg_ops skl_tplg_ops = { .widget_load = skl_tplg_widget_load, .control_load = skl_tplg_control_load, .bytes_ext_ops = skl_tlv_ops, .bytes_ext_ops_count =ARRAY_SIZE (skl_tlv_ops), + .manifest = skl_manifest_load, };/*
sound/soc/intel/skylake/skl-tplg-interface.h +12 -0
@@ -228,4 +228,16 @@ struct skl_dfw_algo_data { char params[0]; } __packed; +#define LIB_NAME_LENGTH 128 +#define HDA_MAX_LIB 16 + +struct lib_info { +char name[LIB_NAME_LENGTH ]; +} __packed; + +struct skl_dfw_manifest { +u32 lib_count; +struct lib_info lib[HDA_MAX_LIB ]; +} __packed; +#endif
Signature · 1 line
1.9.1
Mark Brown
maintainerApplied "ASoC: Intel: Skylake: add support for tplg manifest load" to the asoc tree
The patch
ASoC: Intel: Skylake: add support for tplg manifest load
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All 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
Quoted 1 line
From
05b39fd4eca326aa67a636b4eec63dd4677c19d4Mon Sep 17 00:00:00 2001
From: Kranthi G <[email protected]>
Date: Tue, 26 Jul 2016 18:06:43 +0530
Subject: [PATCH] ASoC: Intel: Skylake: add support for tplg manifest load
Topology manifest gives information about the libraries to be loaded. Implement the topology manifest load callback to get this.
--- sound/soc/intel/skylake/skl-sst-ipc.h | 3 +++ sound/soc/intel/skylake/skl-topology.c | 22 ++++++++++++++++++++++ sound/soc/intel/skylake/skl-tplg-interface.h | 12 ++++++++++++ 3 files changed, 37 insertions(+)
sound/soc/intel/skylake/skl-sst-ipc.h +3 -0
@@ -80,6 +80,9 @@ struct skl_sst {/* multi-core */ struct skl_dsp_cores cores; + +/* tplg manifest */ +struct skl_dfw_manifest manifest; };struct skl_ipc_init_instance_msg {
sound/soc/intel/skylake/skl-topology.c +22 -0
@@ -1789,11 +1789,33 @@ static int skl_tplg_control_load(struct snd_soc_component *cmpnt,return 0 ; } +static int skl_manifest_load (struct snd_soc_component *cmpnt, +struct snd_soc_tplg_manifest *manifest) +{ +struct skl_dfw_manifest *minfo; +struct hdac_ext_bus *ebus =snd_soc_component_get_drvdata (cmpnt); +struct hdac_bus *bus =ebus_to_hbus (ebus); +struct skl *skl =ebus_to_skl (ebus); +int ret =0 ; + + minfo = &skl->skl_sst->manifest; +memcpy (minfo, manifest->priv.data,sizeof (struct skl_dfw_manifest )); + +if (minfo->lib_count >HDA_MAX_LIB ) { +dev_err (bus->dev,"Exceeding max Library count. Got:%d\n" , + minfo->lib_count); + ret = -EINVAL ; + } + +return ret; +} +static struct snd_soc_tplg_ops skl_tplg_ops = { .widget_load = skl_tplg_widget_load, .control_load = skl_tplg_control_load, .bytes_ext_ops = skl_tlv_ops, .bytes_ext_ops_count =ARRAY_SIZE (skl_tlv_ops), + .manifest = skl_manifest_load, };/*
sound/soc/intel/skylake/skl-tplg-interface.h +12 -0
@@ -228,4 +228,16 @@ struct skl_dfw_algo_data { char params[0]; } __packed; +#define LIB_NAME_LENGTH 128 +#define HDA_MAX_LIB 16 + +struct lib_info { +char name[LIB_NAME_LENGTH ]; +} __packed; + +struct skl_dfw_manifest { +u32 lib_count; +struct lib_info lib[HDA_MAX_LIB ]; +} __packed; +#endif
Signature · 1 line
2.8.1
PATCH 6/12 ASoC: Intel: Skylake: add additional args to module parsing
In reply to Vinod KoulFrom: Senthilnathan Veppur <[email protected]>
For additional library parsing, we need to pass firmware to be loaded and not use the pointer in context. Also, Library module IDs are combination of library index and module ID in manifest.
So add the additional arguments of firmware and library offset to snd_skl_parse_uuids().
--- sound/soc/intel/skylake/bxt-sst.c | 2 +- sound/soc/intel/skylake/skl-sst-dsp.h | 3 ++- sound/soc/intel/skylake/skl-sst-utils.c | 9 +++++---- sound/soc/intel/skylake/skl-sst.c | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-)
sound/soc/intel/skylake/bxt-sst.c +1 -1
@@ -175,7 +175,7 @@ static int bxt_load_base_firmware(struct sst_dsp *ctx)if (ctx->fw ==NULL ) goto sst_load_base_firmware_failed; - ret =snd_skl_parse_uuids (ctx,BXT_ADSP_FW_BIN_HDR_OFFSET ); + ret =snd_skl_parse_uuids (ctx, ctx->fw,BXT_ADSP_FW_BIN_HDR_OFFSET ,0 );if (ret <0 ) goto sst_load_base_firmware_failed;
sound/soc/intel/skylake/skl-sst-dsp.h +2 -1
@@ -210,7 +210,8 @@ void bxt_sst_dsp_cleanup(struct device *dev, struct skl_sst *ctx);int snd_skl_get_module_info (struct skl_sst *ctx,u8 *uuid,struct skl_dfw_module *dfw_config); -int snd_skl_parse_uuids (struct sst_dsp *ctx,unsigned int offset); +int snd_skl_parse_uuids (struct sst_dsp *ctx,const struct firmware *fw, +unsigned int offset,int index);void skl_freeup_uuid_list (struct skl_sst *ctx);int skl_dsp_strip_extended_manifest (struct firmware *fw);
sound/soc/intel/skylake/skl-sst-utils.c +5 -4
@@ -145,7 +145,8 @@ EXPORT_SYMBOL_GPL(snd_skl_get_module_info);* Parse the firmware binary to get the UUID, module id * and loadable flags */ -int snd_skl_parse_uuids (struct sst_dsp *ctx,unsigned int offset) +int snd_skl_parse_uuids (struct sst_dsp *ctx,const struct firmware *fw, +unsigned int offset,int index) {struct adsp_fw_hdr *adsp_hdr;struct adsp_module_entry *mod_entry;
@@ -158,8 +159,8 @@ int snd_skl_parse_uuids(struct sst_dsp *ctx, unsigned int offset)unsigned int safe_file;/* Get the FW pointer to derive ADSP header */ - stripped_fw.data = ctx->fw->data; - stripped_fw.size = ctx->fw->size; + stripped_fw.data = fw->data; + stripped_fw.size = fw->size;skl_dsp_strip_extended_manifest (&stripped_fw);
@@ -210,7 +211,7 @@ int snd_skl_parse_uuids(struct sst_dsp *ctx, unsigned int offset) uuid_bin = (uuid_le *)mod_entry->uuid.id;memcpy (&module->uuid, uuid_bin,sizeof (module->uuid)); - module->id = i; + module->id = (i | (index <<12 )); module->is_loadable = mod_entry->type.load_type;list_add_tail (&module->list, &skl->uuid_list);
sound/soc/intel/skylake/skl-sst.c +1 -1
@@ -88,7 +88,7 @@ static int skl_load_base_firmware(struct sst_dsp *ctx) } } - ret =snd_skl_parse_uuids (ctx,SKL_ADSP_FW_BIN_HDR_OFFSET ); + ret =snd_skl_parse_uuids (ctx, ctx->fw,SKL_ADSP_FW_BIN_HDR_OFFSET ,0 );if (ret <0 ) {dev_err (ctx->dev,"UUID parsing err: %d\n" , ret);
Signature · 1 line
1.9.1
Mark Brown
maintainerApplied "ASoC: Intel: Skylake: add additional args to module parsing" to the asoc tree
The patch
ASoC: Intel: Skylake: add additional args to module parsing
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All 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
Quoted 1 line
From
11aa041a775ea5b2ec866298df9656e9ebf67322Mon Sep 17 00:00:00 2001
From: Senthilnathan Veppur <[email protected]>
Date: Tue, 26 Jul 2016 18:06:44 +0530
Subject: [PATCH] ASoC: Intel: Skylake: add additional args to module parsing
For additional library parsing, we need to pass firmware to be loaded and not use the pointer in context. Also, Library module IDs are combination of library index and module ID in manifest.
So add the additional arguments of firmware and library offset to snd_skl_parse_uuids().
--- sound/soc/intel/skylake/bxt-sst.c | 2 +- sound/soc/intel/skylake/skl-sst-dsp.h | 3 ++- sound/soc/intel/skylake/skl-sst-utils.c | 9 +++++---- sound/soc/intel/skylake/skl-sst.c | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-)
sound/soc/intel/skylake/bxt-sst.c +1 -1
@@ -175,7 +175,7 @@ static int bxt_load_base_firmware(struct sst_dsp *ctx)if (ctx->fw ==NULL ) goto sst_load_base_firmware_failed; - ret =snd_skl_parse_uuids (ctx,BXT_ADSP_FW_BIN_HDR_OFFSET ); + ret =snd_skl_parse_uuids (ctx, ctx->fw,BXT_ADSP_FW_BIN_HDR_OFFSET ,0 );if (ret <0 ) goto sst_load_base_firmware_failed;
sound/soc/intel/skylake/skl-sst-dsp.h +2 -1
@@ -210,7 +210,8 @@ void bxt_sst_dsp_cleanup(struct device *dev, struct skl_sst *ctx);int snd_skl_get_module_info (struct skl_sst *ctx,u8 *uuid,struct skl_dfw_module *dfw_config); -int snd_skl_parse_uuids (struct sst_dsp *ctx,unsigned int offset); +int snd_skl_parse_uuids (struct sst_dsp *ctx,const struct firmware *fw, +unsigned int offset,int index);void skl_freeup_uuid_list (struct skl_sst *ctx);int skl_dsp_strip_extended_manifest (struct firmware *fw);
sound/soc/intel/skylake/skl-sst-utils.c +5 -4
@@ -140,7 +140,8 @@ EXPORT_SYMBOL_GPL(snd_skl_get_module_info);* Parse the firmware binary to get the UUID, module id * and loadable flags */ -int snd_skl_parse_uuids (struct sst_dsp *ctx,unsigned int offset) +int snd_skl_parse_uuids (struct sst_dsp *ctx,const struct firmware *fw, +unsigned int offset,int index) {struct adsp_fw_hdr *adsp_hdr;struct adsp_module_entry *mod_entry;
@@ -153,8 +154,8 @@ int snd_skl_parse_uuids(struct sst_dsp *ctx, unsigned int offset)unsigned int safe_file;/* Get the FW pointer to derive ADSP header */ - stripped_fw.data = ctx->fw->data; - stripped_fw.size = ctx->fw->size; + stripped_fw.data = fw->data; + stripped_fw.size = fw->size;skl_dsp_strip_extended_manifest (&stripped_fw);
@@ -205,7 +206,7 @@ int snd_skl_parse_uuids(struct sst_dsp *ctx, unsigned int offset) uuid_bin = (uuid_le *)mod_entry->uuid.id;memcpy (&module->uuid, uuid_bin,sizeof (module->uuid)); - module->id = i; + module->id = (i | (index <<12 )); module->is_loadable = mod_entry->type.load_type;list_add_tail (&module->list, &skl->uuid_list);
sound/soc/intel/skylake/skl-sst.c +1 -1
@@ -88,7 +88,7 @@ static int skl_load_base_firmware(struct sst_dsp *ctx) } } - ret =snd_skl_parse_uuids (ctx,SKL_ADSP_FW_BIN_HDR_OFFSET ); + ret =snd_skl_parse_uuids (ctx, ctx->fw,SKL_ADSP_FW_BIN_HDR_OFFSET ,0 );if (ret <0 ) {dev_err (ctx->dev,"UUID parsing err: %d\n" , ret);
Signature · 1 line
2.8.1
PATCH 7/12 ASoC: Intel: Skylake: Parse UUIDs once
In reply to Vinod KoulThe firmware manifest contains UUIDs which needs to be passed only once.
So use the newly introduced is_first_boot flag to distinguish and parse these only once.
--- sound/soc/intel/skylake/skl-sst.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
sound/soc/intel/skylake/skl-sst.c +9 -7
@@ -88,13 +88,15 @@ static int skl_load_base_firmware(struct sst_dsp *ctx) } } - ret =snd_skl_parse_uuids (ctx, ctx->fw,SKL_ADSP_FW_BIN_HDR_OFFSET ,0 ); -if (ret <0 ) { -dev_err (ctx->dev, -"UUID parsing err: %d\n" , ret); -release_firmware (ctx->fw); -skl_dsp_disable_core (ctx,SKL_DSP_CORE0_MASK ); -return ret; +/* prase uuids on first boot */ +if (skl->is_first_boot) { + ret =snd_skl_parse_uuids (ctx, ctx->fw,SKL_ADSP_FW_BIN_HDR_OFFSET ,0 ); +if (ret <0 ) { +dev_err (ctx->dev,"UUID parsing err: %d\n" , ret); +release_firmware (ctx->fw); +skl_dsp_disable_core (ctx,SKL_DSP_CORE0_MASK ); +return ret; + } }/* check for extended manifest */
Signature · 1 line
1.9.1
Mark Brown
maintainerApplied "ASoC: Intel: Skylake: Parse UUIDs once" to the asoc tree
The patch
ASoC: Intel: Skylake: Parse UUIDs once
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All 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
Quoted 1 line
From
c6703d023a4f380345a361f30b0af221e2dd0bd1Mon Sep 17 00:00:00 2001
From: Vinod Koul <[email protected]>
Date: Tue, 26 Jul 2016 18:06:45 +0530
Subject: [PATCH] ASoC: Intel: Skylake: Parse UUIDs once
The firmware manifest contains UUIDs which needs to be passed only once.
So use the newly introduced is_first_boot flag to distinguish and parse these only once.
--- sound/soc/intel/skylake/skl-sst.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
sound/soc/intel/skylake/skl-sst.c +9 -7
@@ -88,13 +88,15 @@ static int skl_load_base_firmware(struct sst_dsp *ctx) } } - ret =snd_skl_parse_uuids (ctx, ctx->fw,SKL_ADSP_FW_BIN_HDR_OFFSET ,0 ); -if (ret <0 ) { -dev_err (ctx->dev, -"UUID parsing err: %d\n" , ret); -release_firmware (ctx->fw); -skl_dsp_disable_core (ctx,SKL_DSP_CORE0_MASK ); -return ret; +/* prase uuids on first boot */ +if (skl->is_first_boot) { + ret =snd_skl_parse_uuids (ctx, ctx->fw,SKL_ADSP_FW_BIN_HDR_OFFSET ,0 ); +if (ret <0 ) { +dev_err (ctx->dev,"UUID parsing err: %d\n" , ret); +release_firmware (ctx->fw); +skl_dsp_disable_core (ctx,SKL_DSP_CORE0_MASK ); +return ret; + } }/* check for extended manifest */
Signature · 1 line
2.8.1
PATCH 8/12 ASoC: Intel: Bxt: Parse UUIDs once
In reply to Vinod KoulThe firmware manifest contains UUIDs which needs to be passed only once.
So use the newly introduced is_first_boot flag to distinguish and parse these only once on bxt platform as well.
--- sound/soc/intel/skylake/bxt-sst.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
sound/soc/intel/skylake/bxt-sst.c +6 -3
@@ -175,9 +175,12 @@ static int bxt_load_base_firmware(struct sst_dsp *ctx)if (ctx->fw ==NULL ) goto sst_load_base_firmware_failed; - ret =snd_skl_parse_uuids (ctx, ctx->fw,BXT_ADSP_FW_BIN_HDR_OFFSET ,0 ); -if (ret <0 ) - goto sst_load_base_firmware_failed; +/* prase uuids on first boot */ +if (skl->is_first_boot) { + ret =snd_skl_parse_uuids (ctx, ctx->fw,BXT_ADSP_FW_BIN_HDR_OFFSET ,0 ); +if (ret <0 ) + goto sst_load_base_firmware_failed; + } stripped_fw.data = ctx->fw->data; stripped_fw.size = ctx->fw->size;
Signature · 1 line
1.9.1
Mark Brown
maintainerApplied "ASoC: Intel: Bxt: Parse UUIDs once" to the asoc tree
The patch
ASoC: Intel: Bxt: Parse UUIDs once
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All 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
Quoted 1 line
From
f3d4212d17143d52beb257752df4f4493a0e756bMon Sep 17 00:00:00 2001
From: Vinod Koul <[email protected]>
Date: Tue, 26 Jul 2016 18:06:46 +0530
Subject: [PATCH] ASoC: Intel: Bxt: Parse UUIDs once
The firmware manifest contains UUIDs which needs to be passed only once.
So use the newly introduced is_first_boot flag to distinguish and parse these only once on bxt platform as well.
--- sound/soc/intel/skylake/bxt-sst.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
sound/soc/intel/skylake/bxt-sst.c +6 -3
@@ -175,9 +175,12 @@ static int bxt_load_base_firmware(struct sst_dsp *ctx)if (ctx->fw ==NULL ) goto sst_load_base_firmware_failed; - ret =snd_skl_parse_uuids (ctx, ctx->fw,BXT_ADSP_FW_BIN_HDR_OFFSET ,0 ); -if (ret <0 ) - goto sst_load_base_firmware_failed; +/* prase uuids on first boot */ +if (skl->is_first_boot) { + ret =snd_skl_parse_uuids (ctx, ctx->fw,BXT_ADSP_FW_BIN_HDR_OFFSET ,0 ); +if (ret <0 ) + goto sst_load_base_firmware_failed; + } stripped_fw.data = ctx->fw->data; stripped_fw.size = ctx->fw->size;
Signature · 1 line
2.8.1
PATCH 9/12 ASoC: Intel: Skylake: Add library loading IPCs
In reply to Vinod KoulFrom: Ramesh Babu <[email protected]>
DSP fw can have additional firmwares as libs. These libs can be loaded using message IPC_GLB_LOAD_LIBRARY.
--- sound/soc/intel/skylake/skl-sst-ipc.c | 23 +++++++++++++++++++++++ sound/soc/intel/skylake/skl-sst-ipc.h | 3 +++ 2 files changed, 26 insertions(+)
sound/soc/intel/skylake/skl-sst-ipc.c +23 -0
@@ -190,6 +190,7 @@ enum skl_ipc_glb_type {IPC_GLB_GET_PPL_CONTEXT_SIZE =21 ,IPC_GLB_SAVE_PPL =22 ,IPC_GLB_RESTORE_PPL =23 , +IPC_GLB_LOAD_LIBRARY =24 ,IPC_GLB_NOTIFY =26 , IPC_GLB_MAX_IPC_MSG_NUMBER = 31 /* Maximum message number */ };
@@ -902,3 +903,25 @@ int skl_ipc_get_large_config(struct sst_generic_ipc *ipc,return ret; }EXPORT_SYMBOL_GPL (skl_ipc_get_large_config); + +int skl_sst_ipc_load_library (struct sst_generic_ipc *ipc, +u8 dma_id,u8 table_id) +{ +struct skl_ipc_header header = {0 }; +u64 *ipc_header = (u64 *)(&header); +int ret =0 ; + + header.primary =IPC_MSG_TARGET (IPC_FW_GEN_MSG ); + header.primary |=IPC_MSG_DIR (IPC_MSG_REQUEST ); + header.primary |=IPC_GLB_TYPE (IPC_GLB_LOAD_LIBRARY ); + header.primary |=IPC_MOD_INSTANCE_ID (table_id); + header.primary |=IPC_MOD_ID (dma_id); + + ret =sst_ipc_tx_message_wait (ipc, *ipc_header,NULL ,0 ,NULL ,0 ); + +if (ret <0 ) +dev_err (ipc->dev,"ipc: load lib failed\n" ); + +return ret; +} +EXPORT_SYMBOL_GPL (skl_sst_ipc_load_library);
sound/soc/intel/skylake/skl-sst-ipc.h +3 -0
@@ -151,6 +151,9 @@ int skl_ipc_set_large_config(struct sst_generic_ipc *ipc,int skl_ipc_get_large_config (struct sst_generic_ipc *ipc,struct skl_ipc_large_config_msg *msg,u32 *param); +int skl_sst_ipc_load_library (struct sst_generic_ipc *ipc, +u8 dma_id,u8 table_id); +void skl_ipc_int_enable (struct sst_dsp *dsp);void skl_ipc_op_int_enable (struct sst_dsp *ctx);void skl_ipc_op_int_disable (struct sst_dsp *ctx);
Signature · 1 line
1.9.1
Mark Brown
maintainerApplied "ASoC: Intel: Skylake: Add library loading IPCs" to the asoc tree
The patch
ASoC: Intel: Skylake: Add library loading IPCs
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All 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
Quoted 1 line
From
b1f89b197b3f7360239fc2120755252cead4e572Mon Sep 17 00:00:00 2001
From: Ramesh Babu <[email protected]>
Date: Tue, 26 Jul 2016 18:06:47 +0530
Subject: [PATCH] ASoC: Intel: Skylake: Add library loading IPCs
DSP fw can have additional firmwares as libs. These libs can be loaded using message IPC_GLB_LOAD_LIBRARY.
--- sound/soc/intel/skylake/skl-sst-ipc.c | 23 +++++++++++++++++++++++ sound/soc/intel/skylake/skl-sst-ipc.h | 3 +++ 2 files changed, 26 insertions(+)
sound/soc/intel/skylake/skl-sst-ipc.c +23 -0
@@ -190,6 +190,7 @@ enum skl_ipc_glb_type {IPC_GLB_GET_PPL_CONTEXT_SIZE =21 ,IPC_GLB_SAVE_PPL =22 ,IPC_GLB_RESTORE_PPL =23 , +IPC_GLB_LOAD_LIBRARY =24 ,IPC_GLB_NOTIFY =26 , IPC_GLB_MAX_IPC_MSG_NUMBER = 31 /* Maximum message number */ };
@@ -902,3 +903,25 @@ int skl_ipc_get_large_config(struct sst_generic_ipc *ipc,return ret; }EXPORT_SYMBOL_GPL (skl_ipc_get_large_config); + +int skl_sst_ipc_load_library (struct sst_generic_ipc *ipc, +u8 dma_id,u8 table_id) +{ +struct skl_ipc_header header = {0 }; +u64 *ipc_header = (u64 *)(&header); +int ret =0 ; + + header.primary =IPC_MSG_TARGET (IPC_FW_GEN_MSG ); + header.primary |=IPC_MSG_DIR (IPC_MSG_REQUEST ); + header.primary |=IPC_GLB_TYPE (IPC_GLB_LOAD_LIBRARY ); + header.primary |=IPC_MOD_INSTANCE_ID (table_id); + header.primary |=IPC_MOD_ID (dma_id); + + ret =sst_ipc_tx_message_wait (ipc, *ipc_header,NULL ,0 ,NULL ,0 ); + +if (ret <0 ) +dev_err (ipc->dev,"ipc: load lib failed\n" ); + +return ret; +} +EXPORT_SYMBOL_GPL (skl_sst_ipc_load_library);
sound/soc/intel/skylake/skl-sst-ipc.h +3 -0
@@ -151,6 +151,9 @@ int skl_ipc_set_large_config(struct sst_generic_ipc *ipc,int skl_ipc_get_large_config (struct sst_generic_ipc *ipc,struct skl_ipc_large_config_msg *msg,u32 *param); +int skl_sst_ipc_load_library (struct sst_generic_ipc *ipc, +u8 dma_id,u8 table_id); +void skl_ipc_int_enable (struct sst_dsp *dsp);void skl_ipc_op_int_enable (struct sst_dsp *ctx);void skl_ipc_op_int_disable (struct sst_dsp *ctx);
Signature · 1 line
2.8.1
PATCH 10/12 ASoC: Intel: Skylake: Add library loading support
In reply to Vinod KoulFrom: Ramesh Babu <[email protected]>
The library load is added as one of the ops in skl_dsp_fw_ops().
The manifest load gives the files to be loaded which are loaded during the fw_init()
--- sound/soc/intel/skylake/bxt-sst.c | 86 +++++++++++++++++++++++++++++++++-- sound/soc/intel/skylake/skl-sst-dsp.h | 2 + 2 files changed, 85 insertions(+), 3 deletions(-)
sound/soc/intel/skylake/bxt-sst.c +83 -3
@@ -23,6 +23,7 @@#include "../common/sst-dsp.h" #include "../common/sst-dsp-priv.h" #include "skl-sst-ipc.h" +#include "skl-tplg-interface.h" #define BXT_BASEFW_TIMEOUT 3000#define BXT_INIT_TIMEOUT 500
@@ -40,11 +41,73 @@#define BXT_INSTANCE_ID 0#define BXT_BASE_FW_MODULE_ID 0 +#define BXT_ADSP_FW_BIN_HDR_OFFSET 0x2000 +static unsigned int bxt_get_errorcode (struct sst_dsp *ctx) {return sst_dsp_shim_read (ctx,BXT_ADSP_ERROR_CODE ); } +static int +bxt_load_library (struct sst_dsp *ctx,struct skl_dfw_manifest *minfo) +{ +struct snd_dma_buffer dmab; +struct skl_sst *skl = ctx->thread_context; +const struct firmware *fw =NULL ; +struct firmware stripped_fw; +int ret =0 , i, dma_id, stream_tag; + +/* library indices start from 1 to N. 0 represents base FW */ +for (i =1 ; i < minfo->lib_count; i++) { + ret =request_firmware (&fw, minfo->lib[i].name, ctx->dev); +if (ret <0 ) { +dev_err (ctx->dev,"Request lib %s failed:%d\n" , + minfo->lib[i].name, ret); +return ret; + } + +if (skl->is_first_boot) { + ret =snd_skl_parse_uuids (ctx, fw, +BXT_ADSP_FW_BIN_HDR_OFFSET , i); +if (ret <0 ) + goto load_library_failed; + } + + stripped_fw.data = fw->data; + stripped_fw.size = fw->size; +skl_dsp_strip_extended_manifest (&stripped_fw); + + stream_tag = ctx->dsp_ops.prepare (ctx->dev,0x40 , + stripped_fw.size, &dmab); +if (stream_tag <=0 ) { +dev_err (ctx->dev,"Lib prepare DMA err: %x\n" , + stream_tag); + ret = stream_tag; + goto load_library_failed; + } + + dma_id = stream_tag -1 ; +memcpy (dmab.area, stripped_fw.data, stripped_fw.size); + + ctx->dsp_ops.trigger (ctx->dev, true, stream_tag); + ret =skl_sst_ipc_load_library (&skl->ipc, dma_id, i); +if (ret <0 ) +dev_err (ctx->dev,"IPC Load Lib for %s fail: %d\n" , + minfo->lib[i].name, ret); + + ctx->dsp_ops.trigger (ctx->dev, false, stream_tag); + ctx->dsp_ops.cleanup (ctx->dev, &dmab, stream_tag); +release_firmware (fw); + fw =NULL ; + } + +return ret; + +load_library_failed: +release_firmware (fw); +return ret; +} +/* * First boot sequence has some extra steps. Core 0 waits for power * status on core 1, so power up core 1 also momentarily, keep it in
@@ -157,8 +220,6 @@ static int sst_transfer_fw_host_dma(struct sst_dsp *ctx)return ret; } -#define BXT_ADSP_FW_BIN_HDR_OFFSET 0x2000 -static int bxt_load_base_firmware (struct sst_dsp *ctx) {struct firmware stripped_fw;
@@ -233,12 +294,23 @@ static int bxt_set_dsp_D0(struct sst_dsp *ctx, unsigned int core_id)int ret;struct skl_ipc_dxstate_info dx;unsigned int core_mask =SKL_DSP_CORE_MASK (core_id); +struct skl_dfw_manifest *minfo = &skl->manifest;if (skl->fw_loaded == false) { skl->boot_complete = false; ret =bxt_load_base_firmware (ctx); -if (ret <0 ) +if (ret <0 ) {dev_err (ctx->dev,"reload fw failed: %d\n" , ret); +return ret; + } + +if (minfo->lib_count >1 ) { + ret =bxt_load_library (ctx, minfo); +if (ret <0 ) { +dev_err (ctx->dev,"reload libs failed: %d\n" , ret); +return ret; + } + }return ret; }
@@ -344,6 +416,7 @@ static struct skl_dsp_fw_ops bxt_fw_ops = { .set_state_D3 = bxt_set_dsp_D3, .load_fw = bxt_load_base_firmware, .get_fw_errcode = bxt_get_errorcode, + .load_library = bxt_load_library, };static struct sst_ops skl_ops = {
@@ -422,6 +495,13 @@ int bxt_sst_init_fw(struct device *dev, struct skl_sst *ctx)skl_dsp_init_core_state (sst); +if (ctx->manifest.lib_count >1 ) { + ret = sst->fw_ops.load_library (sst, &ctx->manifest); +if (ret <0 ) { +dev_err (dev,"Load Library failed : %x" , ret); +return ret; + } + } ctx->is_first_boot = false;return 0 ;
sound/soc/intel/skylake/skl-sst-dsp.h +2 -0
@@ -133,6 +133,8 @@ enum skl_dsp_states {struct skl_dsp_fw_ops {int (*load_fw)(struct sst_dsp *ctx);/* FW module parser/loader */ +int (*load_library)(struct sst_dsp *ctx, +struct skl_dfw_manifest *minfo);int (*parse_fw)(struct sst_dsp *ctx);int (*set_state_D0)(struct sst_dsp *ctx,unsigned int core_id);int (*set_state_D3)(struct sst_dsp *ctx,unsigned int core_id);
Signature · 1 line
1.9.1
Mark Brown
maintainerApplied "ASoC: Intel: Skylake: Add library loading support" to the asoc tree
The patch
ASoC: Intel: Skylake: Add library loading support
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All 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
Quoted 1 line
From
f356a5acfe27b9955306d098a76be6846188cff6Mon Sep 17 00:00:00 2001
From: Ramesh Babu <[email protected]>
Date: Tue, 26 Jul 2016 18:06:48 +0530
Subject: [PATCH] ASoC: Intel: Skylake: Add library loading support
The library load is added as one of the ops in skl_dsp_fw_ops().
The manifest load gives the files to be loaded which are loaded during the fw_init()
--- sound/soc/intel/skylake/bxt-sst.c | 86 +++++++++++++++++++++++++++++++++-- sound/soc/intel/skylake/skl-sst-dsp.h | 2 + 2 files changed, 85 insertions(+), 3 deletions(-)
sound/soc/intel/skylake/bxt-sst.c +83 -3
@@ -23,6 +23,7 @@#include "../common/sst-dsp.h" #include "../common/sst-dsp-priv.h" #include "skl-sst-ipc.h" +#include "skl-tplg-interface.h" #define BXT_BASEFW_TIMEOUT 3000#define BXT_INIT_TIMEOUT 500
@@ -40,11 +41,73 @@#define BXT_INSTANCE_ID 0#define BXT_BASE_FW_MODULE_ID 0 +#define BXT_ADSP_FW_BIN_HDR_OFFSET 0x2000 +static unsigned int bxt_get_errorcode (struct sst_dsp *ctx) {return sst_dsp_shim_read (ctx,BXT_ADSP_ERROR_CODE ); } +static int +bxt_load_library (struct sst_dsp *ctx,struct skl_dfw_manifest *minfo) +{ +struct snd_dma_buffer dmab; +struct skl_sst *skl = ctx->thread_context; +const struct firmware *fw =NULL ; +struct firmware stripped_fw; +int ret =0 , i, dma_id, stream_tag; + +/* library indices start from 1 to N. 0 represents base FW */ +for (i =1 ; i < minfo->lib_count; i++) { + ret =request_firmware (&fw, minfo->lib[i].name, ctx->dev); +if (ret <0 ) { +dev_err (ctx->dev,"Request lib %s failed:%d\n" , + minfo->lib[i].name, ret); +return ret; + } + +if (skl->is_first_boot) { + ret =snd_skl_parse_uuids (ctx, fw, +BXT_ADSP_FW_BIN_HDR_OFFSET , i); +if (ret <0 ) + goto load_library_failed; + } + + stripped_fw.data = fw->data; + stripped_fw.size = fw->size; +skl_dsp_strip_extended_manifest (&stripped_fw); + + stream_tag = ctx->dsp_ops.prepare (ctx->dev,0x40 , + stripped_fw.size, &dmab); +if (stream_tag <=0 ) { +dev_err (ctx->dev,"Lib prepare DMA err: %x\n" , + stream_tag); + ret = stream_tag; + goto load_library_failed; + } + + dma_id = stream_tag -1 ; +memcpy (dmab.area, stripped_fw.data, stripped_fw.size); + + ctx->dsp_ops.trigger (ctx->dev, true, stream_tag); + ret =skl_sst_ipc_load_library (&skl->ipc, dma_id, i); +if (ret <0 ) +dev_err (ctx->dev,"IPC Load Lib for %s fail: %d\n" , + minfo->lib[i].name, ret); + + ctx->dsp_ops.trigger (ctx->dev, false, stream_tag); + ctx->dsp_ops.cleanup (ctx->dev, &dmab, stream_tag); +release_firmware (fw); + fw =NULL ; + } + +return ret; + +load_library_failed: +release_firmware (fw); +return ret; +} +/* * First boot sequence has some extra steps. Core 0 waits for power * status on core 1, so power up core 1 also momentarily, keep it in
@@ -157,8 +220,6 @@ static int sst_transfer_fw_host_dma(struct sst_dsp *ctx)return ret; } -#define BXT_ADSP_FW_BIN_HDR_OFFSET 0x2000 -static int bxt_load_base_firmware (struct sst_dsp *ctx) {struct firmware stripped_fw;
@@ -233,12 +294,23 @@ static int bxt_set_dsp_D0(struct sst_dsp *ctx, unsigned int core_id)int ret;struct skl_ipc_dxstate_info dx;unsigned int core_mask =SKL_DSP_CORE_MASK (core_id); +struct skl_dfw_manifest *minfo = &skl->manifest;if (skl->fw_loaded == false) { skl->boot_complete = false; ret =bxt_load_base_firmware (ctx); -if (ret <0 ) +if (ret <0 ) {dev_err (ctx->dev,"reload fw failed: %d\n" , ret); +return ret; + } + +if (minfo->lib_count >1 ) { + ret =bxt_load_library (ctx, minfo); +if (ret <0 ) { +dev_err (ctx->dev,"reload libs failed: %d\n" , ret); +return ret; + } + }return ret; }
@@ -344,6 +416,7 @@ static struct skl_dsp_fw_ops bxt_fw_ops = { .set_state_D3 = bxt_set_dsp_D3, .load_fw = bxt_load_base_firmware, .get_fw_errcode = bxt_get_errorcode, + .load_library = bxt_load_library, };static struct sst_ops skl_ops = {
@@ -422,6 +495,13 @@ int bxt_sst_init_fw(struct device *dev, struct skl_sst *ctx)skl_dsp_init_core_state (sst); +if (ctx->manifest.lib_count >1 ) { + ret = sst->fw_ops.load_library (sst, &ctx->manifest); +if (ret <0 ) { +dev_err (dev,"Load Library failed : %x" , ret); +return ret; + } + } ctx->is_first_boot = false;return 0 ;
sound/soc/intel/skylake/skl-sst-dsp.h +2 -0
@@ -133,6 +133,8 @@ enum skl_dsp_states {struct skl_dsp_fw_ops {int (*load_fw)(struct sst_dsp *ctx);/* FW module parser/loader */ +int (*load_library)(struct sst_dsp *ctx, +struct skl_dfw_manifest *minfo);int (*parse_fw)(struct sst_dsp *ctx);int (*set_state_D0)(struct sst_dsp *ctx,unsigned int core_id);int (*set_state_D3)(struct sst_dsp *ctx,unsigned int core_id);
Signature · 1 line
2.8.1
PATCH 11/12 ASoC: Intel: Skylake: Fix a comment style
In reply to Vinod KoulWhile changing code notice bad comment style, so fix it up.
--- sound/soc/intel/skylake/skl-sst-ipc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/intel/skylake/skl-sst-ipc.h +1 -1
@@ -66,7 +66,7 @@ struct skl_sst {/* callback for miscbdge */ void (*enable_miscbdcge)(struct device *dev,bool enable); -/*Is CGCTL.MISCBDCGE disabled*/ +/* Is CGCTL.MISCBDCGE disabled */ bool miscbdcg_disabled;/* Populate module information */
Signature · 1 line
1.9.1
Mark Brown
maintainerApplied "ASoC: Intel: Skylake: Fix a comment style" to the asoc tree
The patch
ASoC: Intel: Skylake: Fix a comment style
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All 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
Quoted 1 line
From
e7d9f10cc64ecb7c8956d48d1cbdb5bbe17e8e85Mon Sep 17 00:00:00 2001
From: Vinod Koul <[email protected]>
Date: Tue, 26 Jul 2016 18:06:49 +0530
Subject: [PATCH] ASoC: Intel: Skylake: Fix a comment style
While changing code notice bad comment style, so fix it up.
--- sound/soc/intel/skylake/skl-sst-ipc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/intel/skylake/skl-sst-ipc.h +1 -1
@@ -66,7 +66,7 @@ struct skl_sst {/* callback for miscbdge */ void (*enable_miscbdcge)(struct device *dev,bool enable); -/*Is CGCTL.MISCBDCGE disabled*/ +/* Is CGCTL.MISCBDCGE disabled */ bool miscbdcg_disabled;/* Populate module information */
Signature · 1 line
2.8.1
PATCH 12/12 ASoC: Intel: Skylake: Add module processing domain support
In reply to Vinod KoulFrom: Senthilnathan Veppur <[email protected]>
A module can be scheduled in deferent processing domains in DSP. Topology specifies the module domain.
--- sound/soc/intel/skylake/skl-messages.c | 1 + sound/soc/intel/skylake/skl-sst-ipc.c | 6 ++++++ sound/soc/intel/skylake/skl-sst-ipc.h | 1 + sound/soc/intel/skylake/skl-topology.c | 1 + sound/soc/intel/skylake/skl-tplg-interface.h | 3 ++- 5 files changed, 11 insertions(+), 1 deletion(-)
sound/soc/intel/skylake/skl-messages.c +1 -0
@@ -870,6 +870,7 @@ int skl_init_module(struct skl_sst *ctx, msg.ppl_instance_id = mconfig->pipe->ppl_id; msg.param_data_size = module_config_size; msg.core_id = mconfig->core_id; + msg.domain = mconfig->domain; ret =skl_ipc_init_instance (&ctx->ipc, &msg, param_data);if (ret <0 ) {
sound/soc/intel/skylake/skl-sst-ipc.c +6 -0
@@ -114,6 +114,11 @@#define IPC_CORE_ID (x) (((x) & IPC_CORE_ID_MASK) \ << IPC_CORE_ID_SHIFT) +#define IPC_DOMAIN_SHIFT 28 +#define IPC_DOMAIN_MASK 0x1 +#define IPC_DOMAIN (x) (((x) & IPC_DOMAIN_MASK) \ + << IPC_DOMAIN_SHIFT) +/* Bind/Unbind message extension register */ #define IPC_DST_MOD_ID_SHIFT 0#define IPC_DST_MOD_ID (x) (((x) & IPC_MOD_ID_MASK) \
@@ -705,6 +710,7 @@ int skl_ipc_init_instance(struct sst_generic_ipc *ipc, header.extension =IPC_CORE_ID (msg->core_id); header.extension |=IPC_PPL_INSTANCE_ID (msg->ppl_instance_id); header.extension |=IPC_PARAM_BLOCK_SIZE (param_block_size); + header.extension |=IPC_DOMAIN (msg->domain);dev_dbg (ipc->dev,"In %s primary =%x ext=%x\n" , __func__, header.primary, header.extension);
sound/soc/intel/skylake/skl-sst-ipc.h +1 -0
@@ -91,6 +91,7 @@ struct skl_ipc_init_instance_msg {u16 param_data_size;u8 ppl_instance_id;u8 core_id; +u8 domain; };struct skl_ipc_bind_unbind_msg {
sound/soc/intel/skylake/skl-topology.c +1 -0
@@ -1656,6 +1656,7 @@ static int skl_tplg_widget_load(struct snd_soc_component *cmpnt, mconfig->max_in_queue = dfw_config->max_in_queue; mconfig->max_out_queue = dfw_config->max_out_queue; mconfig->is_loadable = dfw_config->is_loadable; + mconfig->domain = dfw_config->proc_domain;skl_tplg_fill_fmt (mconfig->in_fmt, dfw_config->in_fmt,MODULE_MAX_IN_PINS ); skl_tplg_fill_fmt(mconfig->out_fmt, dfw_config->out_fmt,
sound/soc/intel/skylake/skl-tplg-interface.h +2 -1
@@ -210,7 +210,8 @@ struct skl_dfw_module { u32 is_dynamic_in_pin:1; u32 is_dynamic_out_pin:1; u32 is_loadable:1; - u32 rsvd3:11; + u32 proc_domain:1; + u32 rsvd3:10;struct skl_dfw_pipe pipe;struct skl_dfw_module_fmt in_fmt[MAX_IN_QUEUE ];
Signature · 1 line
1.9.1
Mark Brown
maintainerApplied "ASoC: Intel: Skylake: Add module processing domain support" to the asoc tree
The patch
ASoC: Intel: Skylake: Add module processing domain support
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All 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
Quoted 1 line
From
e58494ae9c6f956a3b694f402c229fc1d2f6d358Mon Sep 17 00:00:00 2001
From: Senthilnathan Veppur <[email protected]>
Date: Tue, 26 Jul 2016 18:06:50 +0530
Subject: [PATCH] ASoC: Intel: Skylake: Add module processing domain support
A module can be scheduled in deferent processing domains in DSP. Topology specifies the module domain.
--- sound/soc/intel/skylake/skl-messages.c | 1 + sound/soc/intel/skylake/skl-sst-ipc.c | 6 ++++++ sound/soc/intel/skylake/skl-sst-ipc.h | 1 + sound/soc/intel/skylake/skl-topology.c | 1 + sound/soc/intel/skylake/skl-tplg-interface.h | 3 ++- 5 files changed, 11 insertions(+), 1 deletion(-)
sound/soc/intel/skylake/skl-messages.c +1 -0
@@ -870,6 +870,7 @@ int skl_init_module(struct skl_sst *ctx, msg.ppl_instance_id = mconfig->pipe->ppl_id; msg.param_data_size = module_config_size; msg.core_id = mconfig->core_id; + msg.domain = mconfig->domain; ret =skl_ipc_init_instance (&ctx->ipc, &msg, param_data);if (ret <0 ) {
sound/soc/intel/skylake/skl-sst-ipc.c +6 -0
@@ -114,6 +114,11 @@#define IPC_CORE_ID (x) (((x) & IPC_CORE_ID_MASK) \ << IPC_CORE_ID_SHIFT) +#define IPC_DOMAIN_SHIFT 28 +#define IPC_DOMAIN_MASK 0x1 +#define IPC_DOMAIN (x) (((x) & IPC_DOMAIN_MASK) \ + << IPC_DOMAIN_SHIFT) +/* Bind/Unbind message extension register */ #define IPC_DST_MOD_ID_SHIFT 0#define IPC_DST_MOD_ID (x) (((x) & IPC_MOD_ID_MASK) \
@@ -705,6 +710,7 @@ int skl_ipc_init_instance(struct sst_generic_ipc *ipc, header.extension =IPC_CORE_ID (msg->core_id); header.extension |=IPC_PPL_INSTANCE_ID (msg->ppl_instance_id); header.extension |=IPC_PARAM_BLOCK_SIZE (param_block_size); + header.extension |=IPC_DOMAIN (msg->domain);dev_dbg (ipc->dev,"In %s primary =%x ext=%x\n" , __func__, header.primary, header.extension);
sound/soc/intel/skylake/skl-sst-ipc.h +1 -0
@@ -91,6 +91,7 @@ struct skl_ipc_init_instance_msg {u16 param_data_size;u8 ppl_instance_id;u8 core_id; +u8 domain; };struct skl_ipc_bind_unbind_msg {
sound/soc/intel/skylake/skl-topology.c +1 -0
@@ -1656,6 +1656,7 @@ static int skl_tplg_widget_load(struct snd_soc_component *cmpnt, mconfig->max_in_queue = dfw_config->max_in_queue; mconfig->max_out_queue = dfw_config->max_out_queue; mconfig->is_loadable = dfw_config->is_loadable; + mconfig->domain = dfw_config->proc_domain;skl_tplg_fill_fmt (mconfig->in_fmt, dfw_config->in_fmt,MODULE_MAX_IN_PINS ); skl_tplg_fill_fmt(mconfig->out_fmt, dfw_config->out_fmt,
sound/soc/intel/skylake/skl-tplg-interface.h +2 -1
@@ -210,7 +210,8 @@ struct skl_dfw_module { u32 is_dynamic_in_pin:1; u32 is_dynamic_out_pin:1; u32 is_loadable:1; - u32 rsvd3:11; + u32 proc_domain:1; + u32 rsvd3:10;struct skl_dfw_pipe pipe;struct skl_dfw_module_fmt in_fmt[MAX_IN_QUEUE ];
Signature · 1 line
2.8.1