Skip to content

[RFC PATCH] Unifiy ACPI & DT handling inside SOF#1315

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
dbaluta wants to merge 2 commits into from
Closed

[RFC PATCH] Unifiy ACPI & DT handling inside SOF #1315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c6a485
ASoC: SOF: Introduce generic machine driver probing mechanism
dbaluta Oct 13, 2019
7e4eae1
ASoC: SOF: Introduce generic machine driver descriptor
dbaluta Oct 13, 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
26 changes: 25 additions & 1 deletion include/sound/sof.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,30 @@

struct snd_sof_dsp_ops;

enum {
SND_SOC_FW_TYPE_ACPI = 0,
SND_SOC_FW_TYPE_OF,
};

struct snd_soc_fw_mach {
int type;
union {
struct snd_soc_acpi_mach *acpi;
struct device_node *of;
};
};

static inline
const char *sof_mach_get_drv_name(const struct snd_soc_fw_mach *mach)
{
switch (mach->type) {
case SND_SOC_FW_TYPE_ACPI:
return mach->acpi->drv_name;
default:
return NULL;
}
}

/*
* SOF Platform data.
*/
Expand DownExpand Up@@ -48,7 +72,7 @@ struct snd_sof_pdata {

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

void *hw_pdata;
};
Expand Down
20 changes: 2 additions & 18 deletions sound/soc/sof/core.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -296,9 +296,6 @@ static int sof_machine_check(struct snd_sof_dev *sdev)
static int sof_probe_continue(struct snd_sof_dev *sdev)
{
struct snd_sof_pdata *plat_data = sdev->pdata;
const char *drv_name;
const void *mach;
int size;
int ret;

/* probe the DSP hardware */
Expand DownExpand Up@@ -384,22 +381,9 @@ static int sof_probe_continue(struct snd_sof_dev *sdev)
goto fw_run_err;
}

drv_name = plat_data->machine->drv_name;
mach = (const void *)plat_data->machine;
size = sizeof(*plat_data->machine);

/* register machine driver, pass machine info as pdata */
plat_data->pdev_mach =
platform_device_register_data(sdev->dev, drv_name,
PLATFORM_DEVID_NONE, mach, size);

if (IS_ERR(plat_data->pdev_mach)) {
ret = PTR_ERR(plat_data->pdev_mach);
ret = snd_sof_machine_register(sdev);
if (ret < 0)
goto fw_run_err;
}

dev_dbg(sdev->dev, "created machine %s\n",
dev_name(&plat_data->pdev_mach->dev));

if (plat_data->sof_probe_complete)
plat_data->sof_probe_complete(sdev->dev);
Expand Down
7 changes: 7 additions & 0 deletions sound/soc/sof/imx/imx8.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -332,6 +332,11 @@ static int imx8_remove(struct snd_sof_dev *sdev)
return 0;
}

static int imx8_machine_register(struct snd_sof_dev *sdev)
{
return devm_of_platform_populate(sdev->dev);

@plbossartplbossartOct 14, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

what is this supposed to do?

@dbalutadbalutaOct 15, 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.

The SOF DSP DT will look like this:


dsp {
compatible = "fsl,imx8qxp-dsp";
reg = <0x596e8000 0x88000>;
clocks = <..>
mach_drv: mach_drv {
compatible = "simple-scu-audio-card";
simple-audio-card,widgets =<..>
simple-audio-card,routing =<..>
simple-audio-card,dai-link {
format = "i2s";
codec {
sound-dai = <&cs42888>;
};
};
};

devm_of_platform_populate - walks the device tree and creates devices from nodes.

Now, it starts from DSP root node and it will find mach_drv child node. It reads the node and creates a platform_device from it. It is similar with platform_device_register_data but it reads the information from DT instead of having them passed via pdata argument of platform_device_register_data.

}

/* on i.MX8 there is 1 to 1 match between type and BAR idx */
static int imx8_get_bar_index(struct snd_sof_dev *sdev, u32 type)
{
Expand DownExpand Up@@ -363,6 +368,8 @@ struct snd_sof_dsp_ops sof_imx8_ops = {
/* probe and remove */
.probe = imx8_probe,
.remove = imx8_remove,
.machine_register = imx8_machine_register,

/* DSP core boot */
.run = imx8_run,

Expand Down
1 change: 1 addition & 0 deletions sound/soc/sof/intel/apl.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ const struct snd_sof_dsp_ops sof_apl_ops = {
/* probe and remove */
.probe = hda_dsp_probe,
.remove = hda_dsp_remove,
.machine_register = sof_machine_register,

/* Register IO */
.write = sof_io_write,
Expand Down
1 change: 1 addition & 0 deletions sound/soc/sof/intel/bdw.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -550,6 +550,7 @@ static struct snd_soc_dai_driver bdw_dai[] = {
const struct snd_sof_dsp_ops sof_bdw_ops = {
/*Device init */
.probe = bdw_probe,
.machine_register = sof_machine_register,

/* DSP Core Control */
.run = bdw_run,
Expand Down
3 changes: 3 additions & 0 deletions sound/soc/sof/intel/byt.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -486,6 +486,7 @@ static int tangier_pci_probe(struct snd_sof_dev *sdev)
const struct snd_sof_dsp_ops sof_tng_ops = {
/* device init */
.probe = tangier_pci_probe,
.machine_register = sof_machine_register,

/* DSP core boot / reset */
.run = byt_run,
Expand DownExpand Up@@ -647,6 +648,7 @@ static int byt_acpi_probe(struct snd_sof_dev *sdev)
const struct snd_sof_dsp_ops sof_byt_ops = {
/* device init */
.probe = byt_acpi_probe,
.machine_register = sof_machine_register,

/* DSP core boot / reset */
.run = byt_run,
Expand DownExpand Up@@ -706,6 +708,7 @@ EXPORT_SYMBOL(byt_chip_info);
const struct snd_sof_dsp_ops sof_cht_ops = {
/* device init */
.probe = byt_acpi_probe,
.machine_register = sof_machine_register,

/* DSP core boot / reset */
.run = byt_run,
Expand Down
1 change: 1 addition & 0 deletions sound/soc/sof/intel/cnl.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -187,6 +187,7 @@ const struct snd_sof_dsp_ops sof_cnl_ops = {
/* probe and remove */
.probe = hda_dsp_probe,
.remove = hda_dsp_remove,
.machine_register = sof_machine_register,

/* Register IO */
.write = sof_io_write,
Expand Down
26 changes: 26 additions & 0 deletions sound/soc/sof/loader.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -574,3 +574,29 @@ void snd_sof_fw_unload(struct snd_sof_dev *sdev)
/* TODO: support module unloading at runtime */
}
EXPORT_SYMBOL(snd_sof_fw_unload);

int sof_machine_register(struct snd_sof_dev *sdev)
{
struct snd_sof_pdata *plat_data = sdev->pdata;
const char *drv_name;
const void *mach;
int size;

drv_name = sof_mach_get_drv_name(plat_data->machine);
mach = (const void *)plat_data->machine->acpi;
size = sizeof(*plat_data->machine->acpi);

/* register machine driver, pass machine info as pdata */
plat_data->pdev_mach =
platform_device_register_data(sdev->dev, drv_name,
PLATFORM_DEVID_NONE, mach, size);

if (IS_ERR(plat_data->pdev_mach))
return PTR_ERR(plat_data->pdev_mach);

dev_dbg(sdev->dev, "created machine %s\n",
dev_name(&plat_data->pdev_mach->dev));

return 0;
}
EXPORT_SYMBOL(sof_machine_register);
5 changes: 5 additions & 0 deletions sound/soc/sof/ops.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,11 @@ static inline int snd_sof_remove(struct snd_sof_dev *sdev)
return 0;
}

static inline int snd_sof_machine_register(struct snd_sof_dev *sdev)
{
return sof_ops(sdev)->machine_register(sdev);
}

/* control */

/*
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/sof/pcm.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -746,7 +746,7 @@ void snd_sof_new_platform_drv(struct snd_sof_dev *sdev)
struct snd_sof_pdata *plat_data = sdev->pdata;
const char *drv_name;

drv_name = plat_data->machine->drv_name;
drv_name = sof_mach_get_drv_name(plat_data->machine);

pd->name = "sof-audio-component";
pd->probe = sof_pcm_probe;
Expand Down
26 changes: 16 additions & 10 deletions sound/soc/sof/sof-acpi-dev.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -140,7 +140,7 @@ static int sof_acpi_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
const struct sof_dev_desc *desc;
struct snd_soc_acpi_mach *mach;
struct snd_soc_fw_mach *mach;
struct snd_sof_pdata *sof_pdata;
const struct snd_sof_dsp_ops *ops;
int ret;
Expand All@@ -150,6 +150,11 @@ static int sof_acpi_probe(struct platform_device *pdev)
sof_pdata = devm_kzalloc(dev, sizeof(*sof_pdata), GFP_KERNEL);
if (!sof_pdata)
return -ENOMEM;
mach = devm_kzalloc(dev, sizeof(*mach), GFP_KERNEL);
if (!mach)
return -ENOMEM;

mach->type = SND_SOC_FW_TYPE_ACPI;

desc = device_get_match_data(dev);
if (!desc)
Expand All@@ -170,26 +175,27 @@ static int sof_acpi_probe(struct platform_device *pdev)
#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)
mach->acpi = devm_kzalloc(dev, sizeof(*mach), GFP_KERNEL);
if (!mach->acpi)
return -ENOMEM;
ret = sof_nocodec_setup(dev, sof_pdata, mach, desc, ops);
if (ret < 0)
return ret;
#else
/* find machine */
mach = snd_soc_acpi_find_machine(desc->machines);
if (!mach) {
mach->acpi = snd_soc_acpi_find_machine(desc->machines);
if (!mach->acpi) {
dev_warn(dev, "warning: No matching ASoC machine driver found\n");
} else {
sof_pdata->fw_filename = mach->sof_fw_filename;
sof_pdata->tplg_filename = mach->sof_tplg_filename;
sof_pdata->fw_filename = mach->acpi->sof_fw_filename;
sof_pdata->tplg_filename = mach->acpi->sof_tplg_filename;
}
#endif

if (mach) {
mach->mach_params.platform = dev_name(dev);
mach->mach_params.acpi_ipc_irq_index = desc->irqindex_host_ipc;
if (mach->acpi) {
mach->acpi->mach_params.platform = dev_name(dev);
mach->acpi->mach_params.acpi_ipc_irq_index =
desc->irqindex_host_ipc;
}

sof_pdata->machine = mach;
Expand Down
8 changes: 6 additions & 2 deletions sound/soc/sof/sof-of-dev.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@ static int sof_of_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_soc_fw_mach *mach;
struct snd_sof_pdata *sof_pdata;
const struct snd_sof_dsp_ops *ops;
int ret;
Expand All@@ -54,6 +54,9 @@ static int sof_of_probe(struct platform_device *pdev)
sof_pdata = devm_kzalloc(dev, sizeof(*sof_pdata), GFP_KERNEL);
if (!sof_pdata)
return -ENOMEM;
mach = devm_kzalloc(dev, sizeof(*mach), GFP_KERNEL);
if (!mach)
return -ENOMEM;

desc = device_get_match_data(dev);
if (!desc)
Expand All@@ -69,7 +72,8 @@ static int sof_of_probe(struct platform_device *pdev)
#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);
mach->type = SND_SOC_FW_TYPE_ACPI;
mach->acpi = devm_kzalloc(dev, sizeof(*mach), GFP_KERNEL);
if (!mach)
return -ENOMEM;
ret = sof_nocodec_setup(dev, sof_pdata, mach, desc, ops);
Expand Down
22 changes: 14 additions & 8 deletions sound/soc/sof/sof-pci-dev.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -281,7 +281,7 @@ static int sof_pci_probe(struct pci_dev *pci,
struct device *dev = &pci->dev;
const struct sof_dev_desc *desc =
(const struct sof_dev_desc *)pci_id->driver_data;
struct snd_soc_acpi_mach *mach;
struct snd_soc_fw_mach *mach;
struct snd_sof_pdata *sof_pdata;
const struct snd_sof_dsp_ops *ops;
int ret;
Expand All@@ -299,6 +299,12 @@ static int sof_pci_probe(struct pci_dev *pci,
if (!sof_pdata)
return -ENOMEM;

mach = devm_kzalloc(dev, sizeof(*mach), GFP_KERNEL);
if (!mach)
return -ENOMEM;

mach->type = SND_SOC_FW_TYPE_ACPI;

ret = pcim_enable_device(pci);
if (ret < 0)
return ret;
Expand All@@ -310,8 +316,8 @@ static int sof_pci_probe(struct pci_dev *pci,
#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) {
mach->acpi = devm_kzalloc(dev, sizeof(*mach->acpi), GFP_KERNEL);
if (!mach->acpi) {
ret = -ENOMEM;
goto release_regions;
}
Expand All@@ -321,13 +327,13 @@ static int sof_pci_probe(struct pci_dev *pci,

#else
/* find machine */
mach = snd_soc_acpi_find_machine(desc->machines);
if (!mach) {
mach->acpi = snd_soc_acpi_find_machine(desc->machines);
if (!mach->acpi) {
dev_warn(dev, "warning: No matching ASoC machine driver found\n");
} else {
mach->mach_params.platform = dev_name(dev);
sof_pdata->fw_filename = mach->sof_fw_filename;
sof_pdata->tplg_filename = mach->sof_tplg_filename;
mach->acpi->mach_params.platform = dev_name(dev);
sof_pdata->fw_filename = mach->acpi->sof_fw_filename;
sof_pdata->tplg_filename = mach->acpi->sof_tplg_filename;
}
#endif /* CONFIG_SND_SOC_SOF_FORCE_NOCODEC_MODE */

Expand Down
4 changes: 4 additions & 0 deletions sound/soc/sof/sof-priv.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,6 +93,9 @@ struct snd_sof_dsp_ops {
int (*probe)(struct snd_sof_dev *sof_dev); /* mandatory */
int (*remove)(struct snd_sof_dev *sof_dev); /* optional */

/* machine driver probing */
int (*machine_register)(struct snd_sof_dev *sof_dev); /* mandatory */

@plbossartplbossartOct 14, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

should this be optional?

@dbalutadbalutaOct 15, 2019

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.

I think yes, although I haven't seen any platform which doesn't have a "codec" scenario.

/* DSP core boot / reset */
int (*run)(struct snd_sof_dev *sof_dev); /* mandatory */
int (*stall)(struct snd_sof_dev *sof_dev); /* optional */
Expand DownExpand Up@@ -489,6 +492,7 @@ int snd_sof_create_page_table(struct snd_sof_dev *sdev,
struct snd_dma_buffer *dmab,
unsigned char *page_table, size_t size);

int sof_machine_register(struct snd_sof_dev *sdev);
/*
* Firmware loading.
*/
Expand Down