Skip to content

[RFC] Add Multi-client support in SOF#1200

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

Closed
ranj063 wants to merge 39 commits into from
Closed

[RFC] Add Multi-client support in SOF #1200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
51f3229
ASoC: SOF: Add platform device for audio
ranj063 Sep 20, 2019
32634f6
ASoC: SOF: core: modify the signature for snd_sof_create_page_table
ranj063 Oct 23, 2019
6258829
ASoC: SOF: add client_data member in snd_sof_client
ranj063 Oct 23, 2019
d783e91
ASoC: SOF: ipc: Define new API for client IPC TX
ranj063 Oct 23, 2019
4c1f106
ASoC: SOF: Intel: hda-dai: use the sof_client_tx_message() API to sen…
ranj063 Oct 23, 2019
4d6a729
ASoC: SOF: pcm: use the sof_client_tx_message() API to send IPC
ranj063 Oct 23, 2019
a7abd03
ASoC: SOF: topology: use the sof_client_tx_message() API to send IPC
ranj063 Oct 23, 2019
8f7b1eb
ASoC: SOF: ipc: use sof_client_tx_message to send STREAM_POSITION IPC
ranj063 Oct 23, 2019
56e7a07
ASoC: SOF: add client IPC RX callback
ranj063 Oct 23, 2019
0be5fc9
ASoC: SOF: add a ipc_rx_list member to snd_sof_dev
ranj063 Oct 23, 2019
cf215dd
ASoC: SOF: Add support for registering clients for IPC RX
ranj063 Oct 23, 2019
935f0a0
ASoC: SOF: partition audio-specific parts from the SOF core
ranj063 Sep 25, 2019
fb9bcb6
ASoC: SOF: set IPC RX callback for audio client
ranj063 Oct 23, 2019
aec4ef5
ASoC: SOF: add IPC reply callback for audio client
ranj063 Oct 23, 2019
67ae4d8
ASoC: SOF: register audio client to receive IPC
ranj063 Oct 23, 2019
a14456a
ASoC: SOF: set PM ops for the audio platform device
ranj063 Oct 23, 2019
7896a9b
ASoC: SOF: Intel: hda: remove sdev member from sof_intel_hda_stream
ranj063 Oct 17, 2019
34548e5
ASoC: SOF: Split DSP ops into core ops and audio ops
ranj063 Sep 26, 2019
2ae8aff
ASoC: SOF: Introduce default_fw_filename member in sof_dev_desc
ranj063 Oct 17, 2019
ee9d6fb
ASoC: SOF: Add op to select platform-specific machine driver
ranj063 Oct 24, 2019
2d55e9e
ASoC: SOF: Intel: hda: set machine_driver_select op
ranj063 Oct 24, 2019
6b77f49
ASoC: SOF: move machine driver selection to the audio client
ranj063 Sep 27, 2019
83bab61
ASoC: SOF: Add struct to define dai drv info
ranj063 Oct 23, 2019
34559d2
ASoC: SOF: export a few functions
ranj063 Oct 23, 2019
e08d50a
ASoC: SOF: Intel: Add a platform device for SSP DAI's
ranj063 Oct 23, 2019
3a19e06
ASoC: SOF: Intel: Add a platform device for HDA DAI's
ranj063 Oct 23, 2019
5cdc774
ASoC: SOF: Intel: Add generic DMIC machine driver
ranj063 Oct 23, 2019
405ea74
ASoC: SOF: Intel: Add a platform device for DMIC DAI's
ranj063 Oct 23, 2019
fc1e9e3
ASoC: SOF: Add support for multiple clients in snd_sof_dev
ranj063 Oct 23, 2019
d9ed9af
ASoC: SOF: Intel: Add support for multiple audio clients
ranj063 Oct 23, 2019
29551f7
ASoC: SOF: Define number of dai links for nocodec mode
ranj063 Oct 24, 2019
eb5f31f
ASoC: SOF: Separate the audio platform device
ranj063 Oct 23, 2019
7723b18
ASoC: SOF: add a kernel config for multi-client support
ranj063 Oct 17, 2019
cf45b61
ASoC: Intel: bxt_pcm512x: make HDMI dai links conditional
ranj063 Oct 17, 2019
49214ba
Revert "ASoC: Intel: skl_hda_dsp_generic: add DMIC support"
ranj063 Oct 16, 2019
0f6bc9c
Revert "ASoC: Intel: skl-hda-dsp-generic: add dmic dapm widget and ro…
ranj063 Oct 16, 2019
2c57361
ASoC: SOF: fix a comment
ranj063 Oct 17, 2019
a32b294
ASoC: Intel: bxt_da7219_max98357a: make HDMI/DMIC dai links conditional
ranj063 Oct 17, 2019
b46494f
ASoC: Intel: skl_hda_dsp_common: remove DMIC definitions
ranj063 Oct 22, 2019
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
23 changes: 8 additions & 15 deletions include/sound/sof.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,15 +16,14 @@
#include <sound/soc-acpi.h>

struct snd_sof_dsp_ops;
struct snd_sof_audio_ops;

/*
* SOF Platform data.
*/
struct snd_sof_pdata {
const struct firmware *fw;
const char *drv_name;
const char *name;
const char *platform;

struct device *dev;

Expand All@@ -40,15 +39,9 @@ struct snd_sof_pdata {
/* descriptor */
const struct sof_dev_desc *desc;

/* firmware and topology filenames */
/* firmware filename */
const char *fw_filename_prefix;
const char *fw_filename;
const char *tplg_filename_prefix;
const char *tplg_filename;

/* machine */
struct platform_device *pdev_mach;
const struct snd_soc_acpi_mach *machine;

void *hw_pdata;

@dbalutadbalutaOct 22, 2019

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is there a reason for which we move tplg_* away but we keep file_filename inside snd_sof_pdata? If there is a good reason I think we should also do the same modification for sof_dev_desc.

In sof-acpi-dev.c the sof_dev_desc structs contain some default_tplg* members which I think might be removed, right?

@ranj063ranj063Oct 22, 2019•
edited
Loading

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dbaluta fw_filename is hardware-specific but not audio specific. It is required when the HW initialization is done by the core. So thats why I left it there.

Yes, I think it makes sense to move the tplg members from sof_dev_desc to chip_info maybe.

What about machines? Should I move that too?

@dbalutadbalutaOct 22, 2019

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ranj063 reading the code as we speak, will leave a comment later.

};
Expand DownExpand Up@@ -91,13 +84,13 @@ struct sof_dev_desc {
const char *default_fw_path;
const char *default_tplg_path;

/* default firmware name */
const char *default_fw_filename;

Comment thread
dbaluta marked this conversation as resolved.
const struct snd_sof_dsp_ops *ops;
const struct sof_arch_ops *arch_ops;
};

int sof_nocodec_setup(struct device *dev,
struct snd_sof_pdata *sof_pdata,
struct snd_soc_acpi_mach *mach,
const struct sof_dev_desc *desc,
const struct snd_sof_dsp_ops *ops);
/* client ops */
const struct snd_sof_audio_ops *audio_ops;
};
#endif
35 changes: 33 additions & 2 deletions sound/soc/intel/boards/bxt_da7219_max98357a.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@
#define QUAD_CHANNEL 4

static struct snd_soc_jack broxton_headset;
#if !IS_ENABLED(CONFIG_SND_SOC_SOF_CLIENT) && IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)
static struct snd_soc_jack broxton_hdmi[3];

struct bxt_hdmi_pcm {
Expand All@@ -39,6 +40,7 @@ struct bxt_hdmi_pcm {
struct bxt_card_private {
struct list_head hdmi_pcm_list;
};
#endif

enum {
BXT_DPCM_AUDIO_PB = 0,
Expand DownExpand Up@@ -109,8 +111,10 @@ static const struct snd_soc_dapm_route audio_map[] = {
/* other jacks */
{"MIC", NULL, "Headset Mic"},

#if !IS_ENABLED(CONFIG_SND_SOC_SOF_CLIENT)
/* digital mics */
{"DMic", NULL, "SoC DMIC"},
#if IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)

/* CODEC BE connections */
{"HDMI1", NULL, "hif5-0 Output"},
Expand All@@ -123,10 +127,11 @@ static const struct snd_soc_dapm_route audio_map[] = {
{"iDisp2 Tx", NULL, "iDisp2_out"},
{"hifi1", NULL, "iDisp1 Tx"},
{"iDisp1 Tx", NULL, "iDisp1_out"},

#endif
/* DMIC */
{"dmic01_hifi", NULL, "DMIC01 Rx"},
{"DMIC01 Rx", NULL, "DMIC AIF"},
#endif

{ "Headphone Jack", NULL, "Platform Clock" },
{ "Headset Mic", NULL, "Platform Clock" },
Expand DownExpand Up@@ -221,6 +226,7 @@ static int broxton_da7219_codec_init(struct snd_soc_pcm_runtime *rtd)
return ret;
}

#if !IS_ENABLED(CONFIG_SND_SOC_SOF_CLIENT) && IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)
static int broxton_hdmi_init(struct snd_soc_pcm_runtime *rtd)
{
struct bxt_card_private *ctx = snd_soc_card_get_drvdata(rtd->card);
Expand All@@ -238,6 +244,7 @@ static int broxton_hdmi_init(struct snd_soc_pcm_runtime *rtd)

return 0;
}
#endif

static int broxton_da7219_fe_init(struct snd_soc_pcm_runtime *rtd)
{
Expand DownExpand Up@@ -308,6 +315,7 @@ static const struct snd_soc_ops broxton_da7219_fe_ops = {
.startup = bxt_fe_startup,
};

#if !IS_ENABLED(CONFIG_SND_SOC_SOF_CLIENT)
static int broxton_dmic_fixup(struct snd_soc_pcm_runtime *rtd,
struct snd_pcm_hw_params *params)
{
Expand DownExpand Up@@ -336,6 +344,7 @@ static int broxton_dmic_startup(struct snd_pcm_substream *substream)
static const struct snd_soc_ops broxton_dmic_ops = {
.startup = broxton_dmic_startup,
};
#endif

static const unsigned int rates_16000[] = {
16000,
Expand DownExpand Up@@ -384,9 +393,11 @@ SND_SOC_DAILINK_DEF(system2,
SND_SOC_DAILINK_DEF(reference,
DAILINK_COMP_ARRAY(COMP_CPU("Reference Pin")));

#if !IS_ENABLED(CONFIG_SND_SOC_SOF_CLIENT)
SND_SOC_DAILINK_DEF(dmic,
DAILINK_COMP_ARRAY(COMP_CPU("DMIC Pin")));

#if IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)
SND_SOC_DAILINK_DEF(hdmi1,
DAILINK_COMP_ARRAY(COMP_CPU("HDMI1 Pin")));

Expand All@@ -395,6 +406,8 @@ SND_SOC_DAILINK_DEF(hdmi2,

SND_SOC_DAILINK_DEF(hdmi3,
DAILINK_COMP_ARRAY(COMP_CPU("HDMI3 Pin")));
#endif
#endif

/* Back End DAI */
SND_SOC_DAILINK_DEF(ssp5_pin,
Expand All@@ -409,6 +422,7 @@ SND_SOC_DAILINK_DEF(ssp1_codec,
DAILINK_COMP_ARRAY(COMP_CODEC("i2c-DLGS7219:00",
BXT_DIALOG_CODEC_DAI)));

#if !IS_ENABLED(CONFIG_SND_SOC_SOF_CLIENT)
SND_SOC_DAILINK_DEF(dmic_pin,
DAILINK_COMP_ARRAY(COMP_CPU("DMIC01 Pin")));

Expand All@@ -418,6 +432,7 @@ SND_SOC_DAILINK_DEF(dmic16k_pin,
SND_SOC_DAILINK_DEF(dmic_codec,
DAILINK_COMP_ARRAY(COMP_CODEC("dmic-codec", "dmic-hifi")));

#if IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)
SND_SOC_DAILINK_DEF(idisp1_pin,
DAILINK_COMP_ARRAY(COMP_CPU("iDisp1 Pin")));
SND_SOC_DAILINK_DEF(idisp1_codec,
Expand All@@ -434,6 +449,8 @@ SND_SOC_DAILINK_DEF(idisp3_pin,
SND_SOC_DAILINK_DEF(idisp3_codec,
DAILINK_COMP_ARRAY(COMP_CODEC("ehdaudio0D2",
"intel-hdmi-hifi3")));
#endif
#endif

SND_SOC_DAILINK_DEF(platform,
DAILINK_COMP_ARRAY(COMP_PLATFORM("0000:00:0e.0")));
Expand DownExpand Up@@ -487,6 +504,7 @@ static struct snd_soc_dai_link broxton_dais[] = {
.ops = &broxton_refcap_ops,
SND_SOC_DAILINK_REG(reference, dummy, platform),
},
#if !IS_ENABLED(CONFIG_SND_SOC_SOF_CLIENT)
[BXT_DPCM_AUDIO_DMIC_CP] =
{
.name = "Bxt Audio DMIC cap",
Expand DownExpand Up@@ -528,6 +546,7 @@ static struct snd_soc_dai_link broxton_dais[] = {
.dynamic = 1,
SND_SOC_DAILINK_REG(hdmi3, dummy, platform),
},
#endif
/* Back End DAI links */
{
/* SSP5 - Codec */
Expand DownExpand Up@@ -556,6 +575,7 @@ static struct snd_soc_dai_link broxton_dais[] = {
.dpcm_capture = 1,
SND_SOC_DAILINK_REG(ssp1_pin, ssp1_codec, platform),
},
#if !IS_ENABLED(CONFIG_SND_SOC_SOF_CLIENT)
{
.name = "dmic01",
.id = 2,
Expand All@@ -565,6 +585,7 @@ static struct snd_soc_dai_link broxton_dais[] = {
.no_pcm = 1,
SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform),
},
#if IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)
{
.name = "iDisp1",
.id = 3,
Expand All@@ -589,6 +610,7 @@ static struct snd_soc_dai_link broxton_dais[] = {
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform),
},
#endif
{
.name = "dmic16k",
.id = 6,
Expand All@@ -597,8 +619,10 @@ static struct snd_soc_dai_link broxton_dais[] = {
.no_pcm = 1,
SND_SOC_DAILINK_REG(dmic16k_pin, dmic_codec, platform),
},
#endif
};

#if !IS_ENABLED(CONFIG_SND_SOC_SOF_CLIENT) && IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)
#define NAME_SIZE 32
static int bxt_card_late_probe(struct snd_soc_card *card)
{
Expand DownExpand Up@@ -639,6 +663,7 @@ static int bxt_card_late_probe(struct snd_soc_card *card)

return hdac_hdmi_jack_port_init(component, &card->dapm);
}
#endif

/* broxton audio machine driver for SPT + da7219 */
static struct snd_soc_card broxton_audio_card = {
Expand All@@ -653,24 +678,30 @@ static struct snd_soc_card broxton_audio_card = {
.dapm_routes = audio_map,
.num_dapm_routes = ARRAY_SIZE(audio_map),
.fully_routed = true,
#if !IS_ENABLED(CONFIG_SND_SOC_SOF_CLIENT) && IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)
.late_probe = bxt_card_late_probe,
#endif
};

static int broxton_audio_probe(struct platform_device *pdev)
{
struct bxt_card_private *ctx;
struct snd_soc_acpi_mach *mach;
const char *platform_name;
int ret;
#if !IS_ENABLED(CONFIG_SND_SOC_SOF_CLIENT) && IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)
struct bxt_card_private *ctx;

ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL);
if (!ctx)
return -ENOMEM;

INIT_LIST_HEAD(&ctx->hdmi_pcm_list);
#endif

broxton_audio_card.dev = &pdev->dev;
#if !IS_ENABLED(CONFIG_SND_SOC_SOF_CLIENT) && IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)
snd_soc_card_set_drvdata(&broxton_audio_card, ctx);
#endif
if (soc_intel_is_glk()) {
unsigned int i;

Expand Down
16 changes: 8 additions & 8 deletions sound/soc/intel/boards/bxt_pcm512x.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@ struct bxt_card_private {
struct list_head hdmi_pcm_list;
};
Comment thread
dbaluta marked this conversation as resolved.

#if IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)
#if !IS_ENABLED(CONFIG_SND_SOC_SOF_CLIENT) && IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)
static struct snd_soc_jack broxton_hdmi[3];

struct bxt_hdmi_pcm {
Expand DownExpand Up@@ -89,11 +89,6 @@ static int bxt_card_late_probe(struct snd_soc_card *card)

return hdac_hdmi_jack_port_init(component, &card->dapm);
}
#else
static int bxt_card_late_probe(struct snd_soc_card *card)
{
return 0;
}
#endif

static const struct snd_soc_dapm_widget dapm_widgets[] = {
Expand DownExpand Up@@ -175,6 +170,7 @@ SND_SOC_DAILINK_DEF(ssp5_codec,
SND_SOC_DAILINK_DEF(platform,
DAILINK_COMP_ARRAY(COMP_PLATFORM("0000:00:0e.0")));

#if !IS_ENABLED(CONFIG_SND_SOC_SOF_CLIENT) && IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)
SND_SOC_DAILINK_DEF(idisp1_pin,
DAILINK_COMP_ARRAY(COMP_CPU("iDisp1 Pin")));
SND_SOC_DAILINK_DEF(idisp1_codec,
Expand All@@ -189,6 +185,7 @@ SND_SOC_DAILINK_DEF(idisp3_pin,
DAILINK_COMP_ARRAY(COMP_CPU("iDisp3 Pin")));
SND_SOC_DAILINK_DEF(idisp3_codec,
DAILINK_COMP_ARRAY(COMP_CODEC("ehdaudio0D2", "intel-hdmi-hifi3")));
#endif

static struct snd_soc_dai_link dailink[] = {
/* CODEC<->CODEC link */
Expand All@@ -206,7 +203,7 @@ static struct snd_soc_dai_link dailink[] = {
.dpcm_capture = 1,
SND_SOC_DAILINK_REG(ssp5_pin, ssp5_codec, platform),
},
#if IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)
#if !IS_ENABLED(CONFIG_SND_SOC_SOF_CLIENT) && IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)
{
.name = "iDisp1",
.id = 1,
Expand DownExpand Up@@ -244,7 +241,9 @@ static struct snd_soc_card bxt_pcm512x_card = {
.num_dapm_widgets = ARRAY_SIZE(dapm_widgets),
.dapm_routes = audio_map,
.num_dapm_routes = ARRAY_SIZE(audio_map),
#if !IS_ENABLED(CONFIG_SND_SOC_SOF_CLIENT) && IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)
.late_probe = bxt_card_late_probe,
#endif
};

/* i2c-<HID>:00 with HID being 8 chars */
Expand All@@ -264,9 +263,10 @@ static int bxt_pcm512x_probe(struct platform_device *pdev)
if (!ctx)
return -ENOMEM;

#if !IS_ENABLED(CONFIG_SND_SOC_SOF_CLIENT) && IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)
if (IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI))
INIT_LIST_HEAD(&ctx->hdmi_pcm_list);

#endif
mach = (&pdev->dev)->platform_data;
card = &bxt_pcm512x_card;
card->dev = &pdev->dev;
Expand Down
25 changes: 2 additions & 23 deletions sound/soc/intel/boards/skl_hda_dsp_common.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,15 +60,6 @@ SND_SOC_DAILINK_DEF(digital_cpu,
SND_SOC_DAILINK_DEF(digital_codec,
DAILINK_COMP_ARRAY(COMP_CODEC("ehdaudio0D0", "Digital Codec DAI")));

SND_SOC_DAILINK_DEF(dmic_pin,
DAILINK_COMP_ARRAY(COMP_CPU("DMIC01 Pin")));

SND_SOC_DAILINK_DEF(dmic_codec,
DAILINK_COMP_ARRAY(COMP_CODEC("dmic-codec", "dmic-hifi")));

SND_SOC_DAILINK_DEF(dmic16k,
DAILINK_COMP_ARRAY(COMP_CPU("DMIC16k Pin")));

SND_SOC_DAILINK_DEF(platform,
DAILINK_COMP_ARRAY(COMP_PLATFORM("0000:00:1f.3")));

Expand DownExpand Up@@ -101,6 +92,7 @@ struct snd_soc_dai_link skl_hda_be_dai_links[HDA_DSP_MAX_BE_DAI_LINKS] = {
.id = 4,
.dpcm_playback = 1,
.dpcm_capture = 1,
.init = NULL,
.no_pcm = 1,
SND_SOC_DAILINK_REG(analog_cpu, analog_codec, platform),
},
Expand All@@ -109,23 +101,10 @@ struct snd_soc_dai_link skl_hda_be_dai_links[HDA_DSP_MAX_BE_DAI_LINKS] = {
.id = 5,
.dpcm_playback = 1,
.dpcm_capture = 1,
.init = NULL,
.no_pcm = 1,
SND_SOC_DAILINK_REG(digital_cpu, digital_codec, platform),
},
{
.name = "dmic01",
.id = 6,
.dpcm_capture = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform),
},
{
.name = "dmic16k",
.id = 7,
.dpcm_capture = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(dmic16k, dmic_codec, platform),
},
};

int skl_hda_hdmi_jack_init(struct snd_soc_card *card)
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/intel/boards/skl_hda_dsp_common.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@
#include <sound/core.h>
#include <sound/jack.h>

#define HDA_DSP_MAX_BE_DAI_LINKS 7
#define HDA_DSP_MAX_BE_DAI_LINKS 5

struct skl_hda_hdmi_pcm {
struct list_head head;
Expand Down
Loading