Skip to content

Add multicore support#350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
plbossart merged 7 commits into from
Dec 5, 2018
Merged

Add multicore support #350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c0727d2
ASoC: SOF: introduce ops for power up/down dsp core
ranj063 Dec 3, 2018
1bd442e
ASoC: SOF: add CORE_ENABLE to verbose ipc log
ranj063 Dec 3, 2018
cc7def2
ASoC: SOF: power up schedule core after setting up pipeline comp
ranj063 Dec 3, 2018
c3a0929
ASoC: SOF: power down the pipeline schedule core in widget unload
ranj063 Dec 3, 2018
cbe6b10
ASoC: SOF: clean up widget_unload routine
ranj063 Dec 3, 2018
d589c42
ASoC: SOF: power up pipeline schedule core upon resume
ranj063 Dec 3, 2018
da91011
ASoC: SOF: add core_power_down/up ops implementation for SKL+
ranj063 Dec 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions sound/soc/sof/intel/apl.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,10 @@ struct snd_sof_dsp_ops sof_apl_ops = {
.pre_fw_run = hda_dsp_pre_fw_run,
.post_fw_run = hda_dsp_post_fw_run,

/* dsp core power up/down */
.core_power_up = hda_dsp_enable_core,
.core_power_down = hda_dsp_core_reset_power_down,
Comment thread
plbossart marked this conversation as resolved.
Outdated

/* trace callback */
.trace_init = hda_dsp_trace_init,
.trace_release = hda_dsp_trace_release,
Expand Down
4 changes: 4 additions & 0 deletions sound/soc/sof/intel/cnl.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -237,6 +237,10 @@ struct snd_sof_dsp_ops sof_cnl_ops = {
.pre_fw_run = hda_dsp_pre_fw_run,
.post_fw_run = hda_dsp_post_fw_run,

/* dsp core power up/down */
.core_power_up = hda_dsp_enable_core,
.core_power_down = hda_dsp_core_reset_power_down,

/* firmware run */
.run = hda_dsp_cl_boot_firmware,

Expand Down
4 changes: 4 additions & 0 deletions sound/soc/sof/intel/skl.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -87,6 +87,10 @@ struct snd_sof_dsp_ops sof_skl_ops = {
.pre_fw_run = hda_dsp_pre_fw_run,
.post_fw_run = hda_dsp_post_fw_run,

/* dsp core power up/down */
.core_power_up = hda_dsp_enable_core,
.core_power_down = hda_dsp_core_reset_power_down,

/* firmware run */
.run = hda_dsp_cl_boot_firmware_skl,

Expand Down
2 changes: 2 additions & 0 deletions sound/soc/sof/ipc.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -133,6 +133,8 @@ static void ipc_log_header(struct device *dev, u8 *text, u32 cmd)
str = "GLB_PM_MSG: CLK_GET"; break;
case SOF_IPC_PM_CLK_REQ:
str = "GLB_PM_MSG: CLK_REQ"; break;
case SOF_IPC_PM_CORE_ENABLE:
str = "GLB_PM_MSG: CORE_ENABLE"; break;
default:
str = "GLB_PM_MSG: unknown type"; break;
}
Expand Down
19 changes: 19 additions & 0 deletions sound/soc/sof/ops.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,6 +60,25 @@ static inline int snd_sof_dsp_reset(struct snd_sof_dev *sdev)
return 0;
}

/* dsp core power up/power down */
static inline int snd_sof_dsp_core_power_up(struct snd_sof_dev *sdev,
unsigned int core_mask)
{
if (sdev->ops->core_power_up)
return sdev->ops->core_power_up(sdev, core_mask);

return 0;
}

static inline int snd_sof_dsp_core_power_down(struct snd_sof_dev *sdev,
unsigned int core_mask)
{
if (sdev->ops->core_power_down)
return sdev->ops->core_power_down(sdev, core_mask);

return 0;
}

/* pre/post fw load */
static inline int snd_sof_dsp_pre_fw_run(struct snd_sof_dev *sdev)
{
Expand Down
14 changes: 13 additions & 1 deletion sound/soc/sof/pm.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,6 +70,7 @@ static int sof_restore_pipelines(struct snd_sof_dev *sdev)
{
struct snd_sof_widget *swidget = NULL;
struct snd_sof_route *sroute = NULL;
struct sof_ipc_pipe_new *pipeline;
struct snd_sof_dai *dai;
struct sof_ipc_comp_dai *comp_dai;
struct sof_ipc_hdr *hdr;
Expand All@@ -94,6 +95,17 @@ static int sof_restore_pipelines(struct snd_sof_dev *sdev)
comp_dai, sizeof(*comp_dai),
&r, sizeof(r));
break;
case snd_soc_dapm_scheduler:

/*
* During suspend, all DSP cores are powered off.
* Therefore upon resume, create the pipeline comp
* and power up the core that the pipeline is
* scheduled on.
*/
pipeline = (struct sof_ipc_pipe_new *)swidget->private;
ret = sof_load_pipeline_ipc(sdev, pipeline, &r);
break;
Comment thread
plbossart marked this conversation as resolved.
Outdated
default:
hdr = (struct sof_ipc_hdr *)swidget->private;
ret = sof_ipc_tx_message(sdev->ipc, hdr->cmd,
Expand DownExpand Up@@ -338,7 +350,7 @@ static int sof_suspend(struct device *dev, int runtime_suspend)
/* drop all ipc */
sof_ipc_drop_all(sdev->ipc);

/* power down DSP */
/* power down all DSP cores */
if (runtime_suspend)
ret = snd_sof_dsp_runtime_suspend(sdev, 0);
else
Expand Down
8 changes: 8 additions & 0 deletions sound/soc/sof/sof-priv.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,6 +85,10 @@ struct snd_sof_dsp_ops {
int (*run)(struct snd_sof_dev *sof_dev);
int (*stall)(struct snd_sof_dev *sof_dev);
int (*reset)(struct snd_sof_dev *sof_dev);
int (*core_power_up)(struct snd_sof_dev *sof_dev,
unsigned int core_mask);
int (*core_power_down)(struct snd_sof_dev *sof_dev,
unsigned int core_mask);

/* pre/post firmware run */
int (*pre_fw_run)(struct snd_sof_dev *sof_dev);
Expand DownExpand Up@@ -489,6 +493,10 @@ void snd_sof_free_topology(struct snd_sof_dev *sdev);
int snd_sof_complete_pipeline(struct snd_sof_dev *sdev,
struct snd_sof_widget *swidget);

int sof_load_pipeline_ipc(struct snd_sof_dev *sdev,
struct sof_ipc_pipe_new *pipeline,
struct sof_ipc_comp_reply *r);

Comment thread
plbossart marked this conversation as resolved.
Outdated
/*
* Trace/debug
*/
Expand Down
78 changes: 65 additions & 13 deletions sound/soc/sof/topology.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@
#include <uapi/sound/tlv.h>
#include <uapi/sound/sof/tokens.h>
#include "sof-priv.h"
#include "ops.h"

#define COMP_ID_UNASSIGNED 0xffffffff
/* Constants used in the computation of linear volume gain from dB gain */
Expand DownExpand Up@@ -1088,6 +1089,48 @@ static int sof_widget_load_pcm(struct snd_soc_component *scomp, int index,
/*
* Pipeline Topology
*/
int sof_load_pipeline_ipc(struct snd_sof_dev *sdev,
struct sof_ipc_pipe_new *pipeline,
struct sof_ipc_comp_reply *r)
{
struct sof_ipc_pm_core_config pm_core_config;
int ret = 0;

ret = sof_ipc_tx_message(sdev->ipc, pipeline->hdr.cmd, pipeline,
sizeof(*pipeline), r, sizeof(*r));
if (ret < 0) {
dev_err(sdev->dev, "error: load pipeline ipc failure\n");
return ret;
}

/* power up the core that this pipeline is scheduled on */
ret = snd_sof_dsp_core_power_up(sdev, 1 << pipeline->core);
if (ret < 0) {
dev_err(sdev->dev, "error: powering up pipeline schedule core %d\n",
pipeline->core);
return ret;
}

/*
* Now notify DSP that the core that this pipeline is scheduled on
* has been powered up
*/
memset(&pm_core_config, 0, sizeof(pm_core_config));
pm_core_config.enable_mask = 1 << pipeline->core;

/* configure CORE_ENABLE ipc message */
pm_core_config.hdr.size = sizeof(pm_core_config);
pm_core_config.hdr.cmd = SOF_IPC_GLB_PM_MSG | SOF_IPC_PM_CORE_ENABLE;

/* send ipc */
ret = sof_ipc_tx_message(sdev->ipc, pm_core_config.hdr.cmd,
&pm_core_config, sizeof(pm_core_config),
&pm_core_config, sizeof(pm_core_config));
if (ret < 0)
dev_err(sdev->dev, "error: core enable ipc failure\n");

return ret;
}

static int sof_widget_load_pipeline(struct snd_soc_component *scomp,
int index, struct snd_sof_widget *swidget,
Expand DownExpand Up@@ -1139,8 +1182,8 @@ static int sof_widget_load_pipeline(struct snd_soc_component *scomp,

swidget->private = (void *)pipeline;

ret = sof_ipc_tx_message(sdev->ipc, pipeline->hdr.cmd, pipeline,
sizeof(*pipeline), r, sizeof(*r));
/* send ipc's to create pipeline comp and power up schedule core */
ret = sof_load_pipeline_ipc(sdev, pipeline, r);
if (ret >= 0)
return ret;
err:
Expand DownExpand Up@@ -1742,12 +1785,15 @@ static int sof_widget_ready(struct snd_soc_component *scomp, int index,
static int sof_widget_unload(struct snd_soc_component *scomp,
struct snd_soc_dobj *dobj)
{
struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(scomp);
const struct snd_kcontrol_new *kc = NULL;
struct snd_soc_dapm_widget *widget;
struct sof_ipc_pipe_new *pipeline;
struct snd_sof_control *scontrol;
struct snd_sof_widget *swidget;
struct soc_mixer_control *sm;
struct snd_sof_dai *dai;
int ret = 0;

swidget = dobj->private;
if (!swidget)
Expand All@@ -1758,17 +1804,23 @@ static int sof_widget_unload(struct snd_soc_component *scomp,
switch (swidget->id) {
case snd_soc_dapm_dai_in:
case snd_soc_dapm_dai_out:
dai = swidget->private;

/* free dai config */
kfree(dai->dai_config);
dai = (struct snd_sof_dai *)swidget->private;

/* remove and free dai object */
if (dai) {
/* free dai config */
kfree(dai->dai_config);
Comment thread
plbossart marked this conversation as resolved.
Outdated
list_del(&dai->list);
kfree(dai);
}
break;
case snd_soc_dapm_scheduler:

/* power down the pipeline schedule core */
pipeline = (struct sof_ipc_pipe_new *)swidget->private;
ret = snd_sof_dsp_core_power_down(sdev, 1 << pipeline->core);
if (ret < 0)
dev_err(sdev->dev, "error: powering down pipeline schedule core %d\n",
pipeline->core);
break;
Comment thread
plbossart marked this conversation as resolved.
Outdated
case snd_soc_dapm_pga:

/* get volume kcontrol */
Expand All@@ -1778,19 +1830,19 @@ static int sof_widget_unload(struct snd_soc_component *scomp,

/* free volume table */
kfree(scontrol->volume_table);

/* fallthrough */
break;
Comment thread
plbossart marked this conversation as resolved.
Outdated
default:
/* free private value */
kfree(swidget->private);
break;
}

/* free private value */
kfree(swidget->private);

/* remove and free swidget object */
list_del(&swidget->list);
kfree(swidget);

return 0;
return ret;
}

/*
Expand Down