| Message ID | 20190723084104.12639-4-daniel.baluta@nxp.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add DSP node for i.MX8QXP board to be used by DSP SOF driver | expand |
> diff --git a/sound/soc/sof/Kconfig b/sound/soc/sof/Kconfig > index 61b97fc55bb2..2aa3a1cdf60c 100644 > --- a/sound/soc/sof/Kconfig > +++ b/sound/soc/sof/Kconfig > @@ -36,6 +36,15 @@ config SND_SOC_SOF_ACPI > Say Y if you need this option > If unsure select "N". > > +config SND_SOC_SOF_DT > + tristate "SOF DT enumeration support" > + select SND_SOC_SOF > + select SND_SOC_SOF_OPTIONS > + help > + This adds support for Device Tree enumeration. This option is > + required to enable i.MX8 devices. > + Say Y if you need this option. If unsure select "N". > + [snip] > diff --git a/sound/soc/sof/imx/Kconfig b/sound/soc/sof/imx/Kconfig > index fff64a9970f0..fa35994a79c4 100644 > --- a/sound/soc/sof/imx/Kconfig > +++ b/sound/soc/sof/imx/Kconfig > @@ -12,6 +12,7 @@ if SND_SOC_SOF_IMX_TOPLEVEL > > config SND_SOC_SOF_IMX8 > tristate "SOF support for i.MX8" > + select SND_SOC_SOF_DT This looks upside down. You should select SOF_DT first then include the NXP stuff. > help > This adds support for Sound Open Firmware for NXP i.MX8 platforms > Say Y if you have such a device. > diff --git a/sound/soc/sof/sof-dt-dev.c b/sound/soc/sof/sof-dt-dev.c > new file mode 100644 > index 000000000000..31429bbb5c7e > --- /dev/null > +++ b/sound/soc/sof/sof-dt-dev.c > @@ -0,0 +1,159 @@ > +// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) > +// > +// Copyright 2019 NXP > +// > +// Author: Daniel Baluta <daniel.baluta@nxp.com> > +// > + > +#include <linux/firmware.h> > +#include <linux/module.h> > +#include <linux/pm_runtime.h> > +#include <sound/sof.h> > + > +#include "ops.h" > + > +extern struct snd_sof_dsp_ops sof_imx8_ops; > + > +static char *fw_path; > +module_param(fw_path, charp, 0444); > +MODULE_PARM_DESC(fw_path, "alternate path for SOF firmware."); > + > +static char *tplg_path; > +module_param(tplg_path, charp, 0444); > +MODULE_PARM_DESC(tplg_path, "alternate path for SOF topology."); > + > +/* platform specific devices */ > +#if IS_ENABLED(CONFIG_SND_SOC_SOF_IMX8) > +static struct sof_dev_desc sof_dt_imx8qxp_desc = { > + .default_fw_path = "imx/sof", > + .default_tplg_path = "imx/sof-tplg", > + .nocodec_fw_filename = "sof-imx8.ri", > + .nocodec_tplg_filename = "sof-imx8-nocodec.tplg", > + .ops = &sof_imx8_ops, > +}; > +#endif > + > +static const struct dev_pm_ops sof_dt_pm = { > + SET_SYSTEM_SLEEP_PM_OPS(snd_sof_suspend, snd_sof_resume) > + SET_RUNTIME_PM_OPS(snd_sof_runtime_suspend, snd_sof_runtime_resume, > + NULL) > +}; > + > +static void sof_dt_probe_complete(struct device *dev) > +{ > + /* allow runtime_pm */ > + pm_runtime_set_autosuspend_delay(dev, SND_SOF_SUSPEND_DELAY_MS); > + pm_runtime_use_autosuspend(dev); > + pm_runtime_enable(dev); > +} > + > +static int sof_dt_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + const struct sof_dev_desc *desc; > + /*TODO: create a generic snd_soc_xxx_mach */ > + struct snd_soc_acpi_mach *mach; I wonder if you really need to use the same structures. For Intel we get absolutely zero info from the firmware so rely on an ACPI codec ID as a key to find information on which firmware and topology to use, and which machine driver to load. You could have all this information in a DT blob? > + struct snd_sof_pdata *sof_pdata; > + const struct snd_sof_dsp_ops *ops; > + int ret; > + > + dev_info(&pdev->dev, "DT DSP detected"); > + > + sof_pdata = devm_kzalloc(dev, sizeof(*sof_pdata), GFP_KERNEL); > + if (!sof_pdata) > + return -ENOMEM; > + > + desc = device_get_match_data(dev); > + if (!desc) > + return -ENODEV; > + > + /* get ops for platform */ > + ops = desc->ops; > + if (!ops) { > + dev_err(dev, "error: no matching DT descriptor ops\n"); > + return -ENODEV; > + } > + > +#if IS_ENABLED(CONFIG_SND_SOC_SOF_FORCE_NOCODEC_MODE) > + /* force nocodec mode */ > + dev_warn(dev, "Force to use nocodec mode\n"); > + mach = devm_kzalloc(dev, sizeof(*mach), GFP_KERNEL); > + if (!mach) > + return -ENOMEM; > + ret = sof_nocodec_setup(dev, sof_pdata, mach, desc, ops); > + if (ret < 0) > + return ret; > +#else > + /* TODO: implement case where we actually have a codec */ > + return -ENODEV; > +#endif > + > + if (mach) > + mach->mach_params.platform = dev_name(dev); > + > + sof_pdata->machine = mach; > + sof_pdata->desc = desc; > + sof_pdata->dev = &pdev->dev; > + sof_pdata->platform = dev_name(dev); > + > + /* alternate fw and tplg filenames */ > + if (fw_path) > + sof_pdata->fw_filename_prefix = fw_path; > + else > + sof_pdata->fw_filename_prefix = > + sof_pdata->desc->default_fw_path; > + if (tplg_path) > + sof_pdata->tplg_filename_prefix = tplg_path; > + else > + sof_pdata->tplg_filename_prefix = > + sof_pdata->desc->default_tplg_path; > + > +#if IS_ENABLED(CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE) > + /* set callback to enable runtime_pm */ > + sof_pdata->sof_probe_complete = sof_dt_probe_complete; > +#endif > + /* call sof helper for DSP hardware probe */ > + ret = snd_sof_device_probe(dev, sof_pdata); > + if (ret) { > + dev_err(dev, "error: failed to probe DSP hardware\n"); > + return ret; > + } > + > +#if !IS_ENABLED(CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE) > + sof_dt_probe_complete(dev); > +#endif > + > + return ret; > +} > + > +static int sof_dt_remove(struct platform_device *pdev) > +{ > + pm_runtime_disable(&pdev->dev); > + > + /* call sof helper for DSP hardware remove */ > + snd_sof_device_remove(&pdev->dev); > + > + return 0; > +} > + > +static const struct of_device_id sof_dt_ids[] = { > +#if IS_ENABLED(CONFIG_SND_SOC_SOF_IMX8) > + { .compatible = "fsl,imx8qxp-dsp", .data = &sof_dt_imx8qxp_desc}, > +#endif > + { } > +}; > +MODULE_DEVICE_TABLE(of, sof_dt_ids); > + > +/* DT driver definition */ > +static struct platform_driver snd_sof_dt_driver = { > + .probe = sof_dt_probe, > + .remove = sof_dt_remove, > + .driver = { > + .name = "sof-audio-dt", > + .pm = &sof_dt_pm, > + .of_match_table = sof_dt_ids > + }, > +}; > +module_platform_driver(snd_sof_dt_driver); > + > +MODULE_LICENSE("Dual BSD/GPL"); >
On Tue, Jul 23, 2019 at 6:19 PM Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> wrote: > > > > diff --git a/sound/soc/sof/Kconfig b/sound/soc/sof/Kconfig > > index 61b97fc55bb2..2aa3a1cdf60c 100644 > > --- a/sound/soc/sof/Kconfig > > +++ b/sound/soc/sof/Kconfig > > @@ -36,6 +36,15 @@ config SND_SOC_SOF_ACPI > > Say Y if you need this option > > If unsure select "N". > > > > +config SND_SOC_SOF_DT > > + tristate "SOF DT enumeration support" > > + select SND_SOC_SOF > > + select SND_SOC_SOF_OPTIONS > > + help > > + This adds support for Device Tree enumeration. This option is > > + required to enable i.MX8 devices. > > + Say Y if you need this option. If unsure select "N". > > + > > [snip] > > > diff --git a/sound/soc/sof/imx/Kconfig b/sound/soc/sof/imx/Kconfig > > index fff64a9970f0..fa35994a79c4 100644 > > --- a/sound/soc/sof/imx/Kconfig > > +++ b/sound/soc/sof/imx/Kconfig > > @@ -12,6 +12,7 @@ if SND_SOC_SOF_IMX_TOPLEVEL > > > > config SND_SOC_SOF_IMX8 > > tristate "SOF support for i.MX8" > > + select SND_SOC_SOF_DT > > This looks upside down. You should select SOF_DT first then include the > NXP stuff. > > > help > > This adds support for Sound Open Firmware for NXP i.MX8 platforms > > Say Y if you have such a device. > > diff --git a/sound/soc/sof/sof-dt-dev.c b/sound/soc/sof/sof-dt-dev.c > > new file mode 100644 > > index 000000000000..31429bbb5c7e > > --- /dev/null > > +++ b/sound/soc/sof/sof-dt-dev.c > > @@ -0,0 +1,159 @@ > > +// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) > > +// > > +// Copyright 2019 NXP > > +// > > +// Author: Daniel Baluta <daniel.baluta@nxp.com> > > +// > > + > > +#include <linux/firmware.h> > > +#include <linux/module.h> > > +#include <linux/pm_runtime.h> > > +#include <sound/sof.h> > > + > > +#include "ops.h" > > + > > +extern struct snd_sof_dsp_ops sof_imx8_ops; > > + > > +static char *fw_path; > > +module_param(fw_path, charp, 0444); > > +MODULE_PARM_DESC(fw_path, "alternate path for SOF firmware."); > > + > > +static char *tplg_path; > > +module_param(tplg_path, charp, 0444); > > +MODULE_PARM_DESC(tplg_path, "alternate path for SOF topology."); > > + > > +/* platform specific devices */ > > +#if IS_ENABLED(CONFIG_SND_SOC_SOF_IMX8) > > +static struct sof_dev_desc sof_dt_imx8qxp_desc = { > > + .default_fw_path = "imx/sof", > > + .default_tplg_path = "imx/sof-tplg", > > + .nocodec_fw_filename = "sof-imx8.ri", > > + .nocodec_tplg_filename = "sof-imx8-nocodec.tplg", > > + .ops = &sof_imx8_ops, > > +}; > > +#endif > > + > > +static const struct dev_pm_ops sof_dt_pm = { > > + SET_SYSTEM_SLEEP_PM_OPS(snd_sof_suspend, snd_sof_resume) > > + SET_RUNTIME_PM_OPS(snd_sof_runtime_suspend, snd_sof_runtime_resume, > > + NULL) > > +}; > > + > > +static void sof_dt_probe_complete(struct device *dev) > > +{ > > + /* allow runtime_pm */ > > + pm_runtime_set_autosuspend_delay(dev, SND_SOF_SUSPEND_DELAY_MS); > > + pm_runtime_use_autosuspend(dev); > > + pm_runtime_enable(dev); > > +} > > + > > +static int sof_dt_probe(struct platform_device *pdev) > > +{ > > + struct device *dev = &pdev->dev; > > + const struct sof_dev_desc *desc; > > + /*TODO: create a generic snd_soc_xxx_mach */ > > + struct snd_soc_acpi_mach *mach; > > I wonder if you really need to use the same structures. For Intel we get > absolutely zero info from the firmware so rely on an ACPI codec ID as a > key to find information on which firmware and topology to use, and which > machine driver to load. You could have all this information in a DT blob? Yes. I see your point. I will still need to make a generic structure for snd_soc_acpi_mach so that everyone can use sof_nocodec_setup function. Maybe something like this: struct snd_soc_mach { union { struct snd_soc_acpi_mach acpi_mach; struct snd_soc_of_mach of_mach; } }; and then change the prototype of sof_nocodec_setup.
On Wed, Jul 24, 2019 at 10:04 AM Daniel Baluta <daniel.baluta@gmail.com> wrote: > > On Tue, Jul 23, 2019 at 6:19 PM Pierre-Louis Bossart > <pierre-louis.bossart@linux.intel.com> wrote: > > > > > > > diff --git a/sound/soc/sof/Kconfig b/sound/soc/sof/Kconfig > > > index 61b97fc55bb2..2aa3a1cdf60c 100644 > > > --- a/sound/soc/sof/Kconfig > > > +++ b/sound/soc/sof/Kconfig > > > @@ -36,6 +36,15 @@ config SND_SOC_SOF_ACPI > > > Say Y if you need this option > > > If unsure select "N". > > > > > > +config SND_SOC_SOF_DT > > > + tristate "SOF DT enumeration support" > > > + select SND_SOC_SOF > > > + select SND_SOC_SOF_OPTIONS > > > + help > > > + This adds support for Device Tree enumeration. This option is > > > + required to enable i.MX8 devices. > > > + Say Y if you need this option. If unsure select "N". > > > + > > > > [snip] > > > > > diff --git a/sound/soc/sof/imx/Kconfig b/sound/soc/sof/imx/Kconfig > > > index fff64a9970f0..fa35994a79c4 100644 > > > --- a/sound/soc/sof/imx/Kconfig > > > +++ b/sound/soc/sof/imx/Kconfig > > > @@ -12,6 +12,7 @@ if SND_SOC_SOF_IMX_TOPLEVEL > > > > > > config SND_SOC_SOF_IMX8 > > > tristate "SOF support for i.MX8" > > > + select SND_SOC_SOF_DT > > > > This looks upside down. You should select SOF_DT first then include the > > NXP stuff. > > > > > help > > > This adds support for Sound Open Firmware for NXP i.MX8 platforms > > > Say Y if you have such a device. > > > diff --git a/sound/soc/sof/sof-dt-dev.c b/sound/soc/sof/sof-dt-dev.c > > > new file mode 100644 > > > index 000000000000..31429bbb5c7e > > > --- /dev/null > > > +++ b/sound/soc/sof/sof-dt-dev.c > > > @@ -0,0 +1,159 @@ > > > +// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) > > > +// > > > +// Copyright 2019 NXP > > > +// > > > +// Author: Daniel Baluta <daniel.baluta@nxp.com> > > > +// > > > + > > > +#include <linux/firmware.h> > > > +#include <linux/module.h> > > > +#include <linux/pm_runtime.h> > > > +#include <sound/sof.h> > > > + > > > +#include "ops.h" > > > + > > > +extern struct snd_sof_dsp_ops sof_imx8_ops; > > > + > > > +static char *fw_path; > > > +module_param(fw_path, charp, 0444); > > > +MODULE_PARM_DESC(fw_path, "alternate path for SOF firmware."); > > > + > > > +static char *tplg_path; > > > +module_param(tplg_path, charp, 0444); > > > +MODULE_PARM_DESC(tplg_path, "alternate path for SOF topology."); > > > + > > > +/* platform specific devices */ > > > +#if IS_ENABLED(CONFIG_SND_SOC_SOF_IMX8) > > > +static struct sof_dev_desc sof_dt_imx8qxp_desc = { > > > + .default_fw_path = "imx/sof", > > > + .default_tplg_path = "imx/sof-tplg", > > > + .nocodec_fw_filename = "sof-imx8.ri", > > > + .nocodec_tplg_filename = "sof-imx8-nocodec.tplg", > > > + .ops = &sof_imx8_ops, > > > +}; > > > +#endif > > > + > > > +static const struct dev_pm_ops sof_dt_pm = { > > > + SET_SYSTEM_SLEEP_PM_OPS(snd_sof_suspend, snd_sof_resume) > > > + SET_RUNTIME_PM_OPS(snd_sof_runtime_suspend, snd_sof_runtime_resume, > > > + NULL) > > > +}; > > > + > > > +static void sof_dt_probe_complete(struct device *dev) > > > +{ > > > + /* allow runtime_pm */ > > > + pm_runtime_set_autosuspend_delay(dev, SND_SOF_SUSPEND_DELAY_MS); > > > + pm_runtime_use_autosuspend(dev); > > > + pm_runtime_enable(dev); > > > +} > > > + > > > +static int sof_dt_probe(struct platform_device *pdev) > > > +{ > > > + struct device *dev = &pdev->dev; > > > + const struct sof_dev_desc *desc; > > > + /*TODO: create a generic snd_soc_xxx_mach */ > > > + struct snd_soc_acpi_mach *mach; > > > > I wonder if you really need to use the same structures. For Intel we get > > absolutely zero info from the firmware so rely on an ACPI codec ID as a > > key to find information on which firmware and topology to use, and which > > machine driver to load. You could have all this information in a DT blob? > > Yes. I see your point. I will still need to make a generic structure for > snd_soc_acpi_mach so that everyone can use sof_nocodec_setup function. > > Maybe something like this: > > struct snd_soc_mach { > union { > struct snd_soc_acpi_mach acpi_mach; > struct snd_soc_of_mach of_mach; > } > }; > > and then change the prototype of sof_nocodec_setup. Hi Pierre, I fixed all the comments except the one above. Replacing snd_soc_acpi_mach with a generic snd_soc_mach is not trivial task. I wonder if it is acceptable to get the initial patches as they are now and later switch to generic ACPI/OF abstraction. Asking this because for the moment on the i.MX side I have only implemented no codec version and we don't probe any of the machine drivers we have. So, there is this only one member of snd_soc_acpi_mach that imx version is making use of: mach->drv_name = "sof-nocodec"; That's all. I think the change as it is now is very clean and non-intrusive. Later we will get options to read firmware name and stuff from DT. Anyhow, I don't think we can get rid of snd_dev_desc structure on i.MX. This will be used to store the information read from DT: static struct sof_dev_desc sof_of_imx8qxp_desc = { » .default_fw_path = "imx/sof", » .default_tplg_path = "imx/sof-tplg", » .nocodec_fw_filename = "sof-imx8.ri", » .nocodec_tplg_filename = "sof-imx8-nocodec.tplg", » .ops = &sof_imx8_ops, }; For the moment we will only use the default values. thanks, Daniel.
>>>> +static int sof_dt_probe(struct platform_device *pdev) >>>> +{ >>>> + struct device *dev = &pdev->dev; >>>> + const struct sof_dev_desc *desc; >>>> + /*TODO: create a generic snd_soc_xxx_mach */ >>>> + struct snd_soc_acpi_mach *mach; >>> >>> I wonder if you really need to use the same structures. For Intel we get >>> absolutely zero info from the firmware so rely on an ACPI codec ID as a >>> key to find information on which firmware and topology to use, and which >>> machine driver to load. You could have all this information in a DT blob? >> >> Yes. I see your point. I will still need to make a generic structure for >> snd_soc_acpi_mach so that everyone can use sof_nocodec_setup function. >> >> Maybe something like this: >> >> struct snd_soc_mach { >> union { >> struct snd_soc_acpi_mach acpi_mach; >> struct snd_soc_of_mach of_mach; >> } >> }; >> >> and then change the prototype of sof_nocodec_setup. > > Hi Pierre, > > I fixed all the comments except the one above. Replacing snd_soc_acpi_mach > with a generic snd_soc_mach is not trivial task. > > I wonder if it is acceptable to get the initial patches as they are > now and later switch to > generic ACPI/OF abstraction. > > Asking this because for the moment on the i.MX side I have only > implemented no codec > version and we don't probe any of the machine drivers we have. > > So, there is this only one member of snd_soc_acpi_mach that imx > version is making use of: > > mach->drv_name = "sof-nocodec"; > > That's all. > > I think the change as it is now is very clean and non-intrusive. Later > we will get options to > read firmware name and stuff from DT. > > Anyhow, I don't think we can get rid of snd_dev_desc structure on > i.MX. This will be used > to store the information read from DT: > > static struct sof_dev_desc sof_of_imx8qxp_desc = { > » .default_fw_path = "imx/sof", > » .default_tplg_path = "imx/sof-tplg", > » .nocodec_fw_filename = "sof-imx8.ri", > » .nocodec_tplg_filename = "sof-imx8-nocodec.tplg", > » .ops = &sof_imx8_ops, > }; > > For the moment we will only use the default values. Yes, that's fine for now. If you don't have a real machine driver then there's nothing urgent to change. Is the new version on GitHub? Thanks -Pierre
On Wed, Aug 7, 2019 at 6:22 PM Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> wrote: > > > >>>> +static int sof_dt_probe(struct platform_device *pdev) > >>>> +{ > >>>> + struct device *dev = &pdev->dev; > >>>> + const struct sof_dev_desc *desc; > >>>> + /*TODO: create a generic snd_soc_xxx_mach */ > >>>> + struct snd_soc_acpi_mach *mach; > >>> > >>> I wonder if you really need to use the same structures. For Intel we get > >>> absolutely zero info from the firmware so rely on an ACPI codec ID as a > >>> key to find information on which firmware and topology to use, and which > >>> machine driver to load. You could have all this information in a DT blob? > >> > >> Yes. I see your point. I will still need to make a generic structure for > >> snd_soc_acpi_mach so that everyone can use sof_nocodec_setup function. > >> > >> Maybe something like this: > >> > >> struct snd_soc_mach { > >> union { > >> struct snd_soc_acpi_mach acpi_mach; > >> struct snd_soc_of_mach of_mach; > >> } > >> }; > >> > >> and then change the prototype of sof_nocodec_setup. > > > > Hi Pierre, > > > > I fixed all the comments except the one above. Replacing snd_soc_acpi_mach > > with a generic snd_soc_mach is not trivial task. > > > > I wonder if it is acceptable to get the initial patches as they are > > now and later switch to > > generic ACPI/OF abstraction. > > > > Asking this because for the moment on the i.MX side I have only > > implemented no codec > > version and we don't probe any of the machine drivers we have. > > > > So, there is this only one member of snd_soc_acpi_mach that imx > > version is making use of: > > > > mach->drv_name = "sof-nocodec"; > > > > That's all. > > > > I think the change as it is now is very clean and non-intrusive. Later > > we will get options to > > read firmware name and stuff from DT. > > > > Anyhow, I don't think we can get rid of snd_dev_desc structure on > > i.MX. This will be used > > to store the information read from DT: > > > > static struct sof_dev_desc sof_of_imx8qxp_desc = { > > » .default_fw_path = "imx/sof", > > » .default_tplg_path = "imx/sof-tplg", > > » .nocodec_fw_filename = "sof-imx8.ri", > > » .nocodec_tplg_filename = "sof-imx8-nocodec.tplg", > > » .ops = &sof_imx8_ops, > > }; > > > > For the moment we will only use the default values. > > Yes, that's fine for now. If you don't have a real machine driver then > there's nothing urgent to change. > > Is the new version on GitHub? Not yet, will push it today and ping you.
On Tue, Jul 23, 2019 at 6:19 PM Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> wrote: > > > > diff --git a/sound/soc/sof/Kconfig b/sound/soc/sof/Kconfig > > index 61b97fc55bb2..2aa3a1cdf60c 100644 > > --- a/sound/soc/sof/Kconfig > > +++ b/sound/soc/sof/Kconfig > > @@ -36,6 +36,15 @@ config SND_SOC_SOF_ACPI > > Say Y if you need this option > > If unsure select "N". > > > > +config SND_SOC_SOF_DT > > + tristate "SOF DT enumeration support" > > + select SND_SOC_SOF > > + select SND_SOC_SOF_OPTIONS > > + help > > + This adds support for Device Tree enumeration. This option is > > + required to enable i.MX8 devices. > > + Say Y if you need this option. If unsure select "N". > > + > > [snip] > > > diff --git a/sound/soc/sof/imx/Kconfig b/sound/soc/sof/imx/Kconfig > > index fff64a9970f0..fa35994a79c4 100644 > > --- a/sound/soc/sof/imx/Kconfig > > +++ b/sound/soc/sof/imx/Kconfig > > @@ -12,6 +12,7 @@ if SND_SOC_SOF_IMX_TOPLEVEL > > > > config SND_SOC_SOF_IMX8 > > tristate "SOF support for i.MX8" > > + select SND_SOC_SOF_DT > > This looks upside down. You should select SOF_DT first then include the > NXP stuff. One more thing: So this should be 'depends on SND_SOC_SOF_DT' right?
On 8/7/19 10:29 AM, Daniel Baluta wrote: > On Tue, Jul 23, 2019 at 6:19 PM Pierre-Louis Bossart > <pierre-louis.bossart@linux.intel.com> wrote: >> >> >>> diff --git a/sound/soc/sof/Kconfig b/sound/soc/sof/Kconfig >>> index 61b97fc55bb2..2aa3a1cdf60c 100644 >>> --- a/sound/soc/sof/Kconfig >>> +++ b/sound/soc/sof/Kconfig >>> @@ -36,6 +36,15 @@ config SND_SOC_SOF_ACPI >>> Say Y if you need this option >>> If unsure select "N". >>> >>> +config SND_SOC_SOF_DT >>> + tristate "SOF DT enumeration support" >>> + select SND_SOC_SOF >>> + select SND_SOC_SOF_OPTIONS >>> + help >>> + This adds support for Device Tree enumeration. This option is >>> + required to enable i.MX8 devices. >>> + Say Y if you need this option. If unsure select "N". >>> + >> >> [snip] >> >>> diff --git a/sound/soc/sof/imx/Kconfig b/sound/soc/sof/imx/Kconfig >>> index fff64a9970f0..fa35994a79c4 100644 >>> --- a/sound/soc/sof/imx/Kconfig >>> +++ b/sound/soc/sof/imx/Kconfig >>> @@ -12,6 +12,7 @@ if SND_SOC_SOF_IMX_TOPLEVEL >>> >>> config SND_SOC_SOF_IMX8 >>> tristate "SOF support for i.MX8" >>> + select SND_SOC_SOF_DT >> >> This looks upside down. You should select SOF_DT first then include the >> NXP stuff. > > One more thing: So this should be 'depends on SND_SOC_SOF_DT' right? I would do this: config SND_SOC_SOF_DT tristate "SOF DT enumeration support" depends on OF # or whatever the top-level DT dependency is select SND_SOC_SOF select SND_SOC_SOF_OPTIONS config SND_SOC_SOF_IMX_TOPLEVEL bool "SOF support for NXP i.MX audio DSPs" depends on ARM64 && SND_SOC_SOF_DT || COMPILE_TEST if SND_SOC_SOF_IMX_TOPLEVEL config SND_SOC_SOF_IMX8 tristate "SOF support for i.MX8" In other words push the dependencies at a higher level.
On Wed, Aug 7, 2019 at 6:28 PM Daniel Baluta <daniel.baluta@gmail.com> wrote: > > On Wed, Aug 7, 2019 at 6:22 PM Pierre-Louis Bossart > <pierre-louis.bossart@linux.intel.com> wrote: > > > > > > >>>> +static int sof_dt_probe(struct platform_device *pdev) > > >>>> +{ > > >>>> + struct device *dev = &pdev->dev; > > >>>> + const struct sof_dev_desc *desc; > > >>>> + /*TODO: create a generic snd_soc_xxx_mach */ > > >>>> + struct snd_soc_acpi_mach *mach; > > >>> > > >>> I wonder if you really need to use the same structures. For Intel we get > > >>> absolutely zero info from the firmware so rely on an ACPI codec ID as a > > >>> key to find information on which firmware and topology to use, and which > > >>> machine driver to load. You could have all this information in a DT blob? > > >> > > >> Yes. I see your point. I will still need to make a generic structure for > > >> snd_soc_acpi_mach so that everyone can use sof_nocodec_setup function. > > >> > > >> Maybe something like this: > > >> > > >> struct snd_soc_mach { > > >> union { > > >> struct snd_soc_acpi_mach acpi_mach; > > >> struct snd_soc_of_mach of_mach; > > >> } > > >> }; > > >> > > >> and then change the prototype of sof_nocodec_setup. > > > > > > Hi Pierre, > > > > > > I fixed all the comments except the one above. Replacing snd_soc_acpi_mach > > > with a generic snd_soc_mach is not trivial task. > > > > > > I wonder if it is acceptable to get the initial patches as they are > > > now and later switch to > > > generic ACPI/OF abstraction. > > > > > > Asking this because for the moment on the i.MX side I have only > > > implemented no codec > > > version and we don't probe any of the machine drivers we have. > > > > > > So, there is this only one member of snd_soc_acpi_mach that imx > > > version is making use of: > > > > > > mach->drv_name = "sof-nocodec"; > > > > > > That's all. > > > > > > I think the change as it is now is very clean and non-intrusive. Later > > > we will get options to > > > read firmware name and stuff from DT. > > > > > > Anyhow, I don't think we can get rid of snd_dev_desc structure on > > > i.MX. This will be used > > > to store the information read from DT: > > > > > > static struct sof_dev_desc sof_of_imx8qxp_desc = { > > > » .default_fw_path = "imx/sof", > > > » .default_tplg_path = "imx/sof-tplg", > > > » .nocodec_fw_filename = "sof-imx8.ri", > > > » .nocodec_tplg_filename = "sof-imx8-nocodec.tplg", > > > » .ops = &sof_imx8_ops, > > > }; > > > > > > For the moment we will only use the default values. > > > > Yes, that's fine for now. If you don't have a real machine driver then > > there's nothing urgent to change. > > > > Is the new version on GitHub? > > Not yet, will push it today and ping you. PR updated: https://github.com/thesofproject/linux/pull/1048
diff --git a/sound/soc/sof/Kconfig b/sound/soc/sof/Kconfig index 61b97fc55bb2..2aa3a1cdf60c 100644 --- a/sound/soc/sof/Kconfig +++ b/sound/soc/sof/Kconfig @@ -36,6 +36,15 @@ config SND_SOC_SOF_ACPI Say Y if you need this option If unsure select "N". +config SND_SOC_SOF_DT + tristate "SOF DT enumeration support" + select SND_SOC_SOF + select SND_SOC_SOF_OPTIONS + help + This adds support for Device Tree enumeration. This option is + required to enable i.MX8 devices. + Say Y if you need this option. If unsure select "N". + config SND_SOC_SOF_OPTIONS tristate help diff --git a/sound/soc/sof/Makefile b/sound/soc/sof/Makefile index 6e43d411ffef..8025d9cec4fb 100644 --- a/sound/soc/sof/Makefile +++ b/sound/soc/sof/Makefile @@ -5,6 +5,8 @@ snd-sof-objs := core.o ops.o loader.o ipc.o pcm.o pm.o debug.o topology.o\ snd-sof-pci-objs := sof-pci-dev.o snd-sof-acpi-objs := sof-acpi-dev.o +snd-sof-dt-objs := sof-dt-dev.o + snd-sof-nocodec-objs := nocodec.o obj-$(CONFIG_SND_SOC_SOF) += snd-sof.o @@ -12,6 +14,7 @@ obj-$(CONFIG_SND_SOC_SOF_NOCODEC) += snd-sof-nocodec.o obj-$(CONFIG_SND_SOC_SOF_ACPI) += sof-acpi-dev.o +obj-$(CONFIG_SND_SOC_SOF_DT) += sof-dt-dev.o obj-$(CONFIG_SND_SOC_SOF_PCI) += sof-pci-dev.o obj-$(CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL) += intel/ diff --git a/sound/soc/sof/imx/Kconfig b/sound/soc/sof/imx/Kconfig index fff64a9970f0..fa35994a79c4 100644 --- a/sound/soc/sof/imx/Kconfig +++ b/sound/soc/sof/imx/Kconfig @@ -12,6 +12,7 @@ if SND_SOC_SOF_IMX_TOPLEVEL config SND_SOC_SOF_IMX8 tristate "SOF support for i.MX8" + select SND_SOC_SOF_DT help This adds support for Sound Open Firmware for NXP i.MX8 platforms Say Y if you have such a device. diff --git a/sound/soc/sof/sof-dt-dev.c b/sound/soc/sof/sof-dt-dev.c new file mode 100644 index 000000000000..31429bbb5c7e --- /dev/null +++ b/sound/soc/sof/sof-dt-dev.c @@ -0,0 +1,159 @@ +// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) +// +// Copyright 2019 NXP +// +// Author: Daniel Baluta <daniel.baluta@nxp.com> +// + +#include <linux/firmware.h> +#include <linux/module.h> +#include <linux/pm_runtime.h> +#include <sound/sof.h> + +#include "ops.h" + +extern struct snd_sof_dsp_ops sof_imx8_ops; + +static char *fw_path; +module_param(fw_path, charp, 0444); +MODULE_PARM_DESC(fw_path, "alternate path for SOF firmware."); + +static char *tplg_path; +module_param(tplg_path, charp, 0444); +MODULE_PARM_DESC(tplg_path, "alternate path for SOF topology."); + +/* platform specific devices */ +#if IS_ENABLED(CONFIG_SND_SOC_SOF_IMX8) +static struct sof_dev_desc sof_dt_imx8qxp_desc = { + .default_fw_path = "imx/sof", + .default_tplg_path = "imx/sof-tplg", + .nocodec_fw_filename = "sof-imx8.ri", + .nocodec_tplg_filename = "sof-imx8-nocodec.tplg", + .ops = &sof_imx8_ops, +}; +#endif + +static const struct dev_pm_ops sof_dt_pm = { + SET_SYSTEM_SLEEP_PM_OPS(snd_sof_suspend, snd_sof_resume) + SET_RUNTIME_PM_OPS(snd_sof_runtime_suspend, snd_sof_runtime_resume, + NULL) +}; + +static void sof_dt_probe_complete(struct device *dev) +{ + /* allow runtime_pm */ + pm_runtime_set_autosuspend_delay(dev, SND_SOF_SUSPEND_DELAY_MS); + pm_runtime_use_autosuspend(dev); + pm_runtime_enable(dev); +} + +static int sof_dt_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + const struct sof_dev_desc *desc; + /*TODO: create a generic snd_soc_xxx_mach */ + struct snd_soc_acpi_mach *mach; + struct snd_sof_pdata *sof_pdata; + const struct snd_sof_dsp_ops *ops; + int ret; + + dev_info(&pdev->dev, "DT DSP detected"); + + sof_pdata = devm_kzalloc(dev, sizeof(*sof_pdata), GFP_KERNEL); + if (!sof_pdata) + return -ENOMEM; + + desc = device_get_match_data(dev); + if (!desc) + return -ENODEV; + + /* get ops for platform */ + ops = desc->ops; + if (!ops) { + dev_err(dev, "error: no matching DT descriptor ops\n"); + return -ENODEV; + } + +#if IS_ENABLED(CONFIG_SND_SOC_SOF_FORCE_NOCODEC_MODE) + /* force nocodec mode */ + dev_warn(dev, "Force to use nocodec mode\n"); + mach = devm_kzalloc(dev, sizeof(*mach), GFP_KERNEL); + if (!mach) + return -ENOMEM; + ret = sof_nocodec_setup(dev, sof_pdata, mach, desc, ops); + if (ret < 0) + return ret; +#else + /* TODO: implement case where we actually have a codec */ + return -ENODEV; +#endif + + if (mach) + mach->mach_params.platform = dev_name(dev); + + sof_pdata->machine = mach; + sof_pdata->desc = desc; + sof_pdata->dev = &pdev->dev; + sof_pdata->platform = dev_name(dev); + + /* alternate fw and tplg filenames */ + if (fw_path) + sof_pdata->fw_filename_prefix = fw_path; + else + sof_pdata->fw_filename_prefix = + sof_pdata->desc->default_fw_path; + if (tplg_path) + sof_pdata->tplg_filename_prefix = tplg_path; + else + sof_pdata->tplg_filename_prefix = + sof_pdata->desc->default_tplg_path; + +#if IS_ENABLED(CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE) + /* set callback to enable runtime_pm */ + sof_pdata->sof_probe_complete = sof_dt_probe_complete; +#endif + /* call sof helper for DSP hardware probe */ + ret = snd_sof_device_probe(dev, sof_pdata); + if (ret) { + dev_err(dev, "error: failed to probe DSP hardware\n"); + return ret; + } + +#if !IS_ENABLED(CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE) + sof_dt_probe_complete(dev); +#endif + + return ret; +} + +static int sof_dt_remove(struct platform_device *pdev) +{ + pm_runtime_disable(&pdev->dev); + + /* call sof helper for DSP hardware remove */ + snd_sof_device_remove(&pdev->dev); + + return 0; +} + +static const struct of_device_id sof_dt_ids[] = { +#if IS_ENABLED(CONFIG_SND_SOC_SOF_IMX8) + { .compatible = "fsl,imx8qxp-dsp", .data = &sof_dt_imx8qxp_desc}, +#endif + { } +}; +MODULE_DEVICE_TABLE(of, sof_dt_ids); + +/* DT driver definition */ +static struct platform_driver snd_sof_dt_driver = { + .probe = sof_dt_probe, + .remove = sof_dt_remove, + .driver = { + .name = "sof-audio-dt", + .pm = &sof_dt_pm, + .of_match_table = sof_dt_ids + }, +}; +module_platform_driver(snd_sof_dt_driver); + +MODULE_LICENSE("Dual BSD/GPL");
Add support for device tree based SOF DSP devices. Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com> --- This is also on review with SOF community here: https://github.com/thesofproject/linux/pull/1048 sound/soc/sof/Kconfig | 9 +++ sound/soc/sof/Makefile | 3 + sound/soc/sof/imx/Kconfig | 1 + sound/soc/sof/sof-dt-dev.c | 159 +++++++++++++++++++++++++++++++++++++ 4 files changed, 172 insertions(+) create mode 100644 sound/soc/sof/sof-dt-dev.c