Skip to content

ASoC: SOF: save acpi machine descriptor for machine driver#278

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

ASoC: SOF: save acpi machine descriptor for machine driver #278

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
ee69de2
ASoC: SOF: fix a typo
RanderWang Nov 13, 2018
3bbd114
ASoC: SOF: save acpi machine descriptor for machine driver
RanderWang Nov 13, 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
2 changes: 1 addition & 1 deletion include/sound/sof.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ struct snd_sof_dsp_ops;
/* SOF probe type */
enum sof_device_type {
SOF_DEVICE_PCI = 0,
SOF_DEVICE_APCI,
SOF_DEVICE_ACPI,
SOF_DEVICE_SPI
};

Expand Down
18 changes: 13 additions & 5 deletions sound/soc/sof/core.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -233,7 +233,7 @@ static int sof_probe(struct platform_device *pdev)
struct snd_sof_pdata *plat_data = dev_get_platdata(&pdev->dev);
struct snd_sof_dev *sdev;
const char *drv_name;
const void *mach;
const void *data;
int size;
int ret;

Expand DownExpand Up@@ -330,24 +330,32 @@ static int sof_probe(struct platform_device *pdev)
}

/* do we need to generate any machine plat data ? */
if (plat_data->machine->new_mach_data) {
if (plat_data->machine->new_mach_data &&
plat_data->type == SOF_DEVICE_ACPI) {
plat_data->pdev_mach =
plat_data->machine->new_mach_data(plat_data);
} else {
drv_name = plat_data->machine->drv_name;
mach = (const void *)plat_data;
if (plat_data->type == SOF_DEVICE_PCI)
drv_name = plat_data->machine->drv_name;
else
drv_name = plat_data->sof_machine->drv_name;

data = (const void *)plat_data;
size = sizeof(*plat_data);

/* register machine driver, pass machine info as pdata */
plat_data->pdev_mach =
platform_device_register_data(sdev->dev,
drv_name, -1, mach, size);
drv_name, -1, data, size);
}
if (IS_ERR(plat_data->pdev_mach)) {
ret = PTR_ERR(plat_data->pdev_mach);
goto comp_err;
}

/* save acpi machine descriptor for machine driver */
dev_set_drvdata(&plat_data->pdev_mach->dev, (void *)plat_data->machine);

@keyonjiekeyonjieNov 13, 2018

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

better to handle SPI case also, e.g. if (snd_sof_pdata.type == SOF_DEVICE_SPI) then dev_set_drvdata(&plat_data->pdev_mach->dev, plat_data->sof_machine);

@RanderWangRanderWangNov 13, 2018

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

good point, fix it later

@plbossartplbossartNov 13, 2018

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.

Sorry, I don't understand what this patch does and why you'd have a difference between ACPI and PCI, we use the same table structure for the machine drivers?

@plbossartplbossartNov 13, 2018

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.

@RanderWang I think you've found a valid issue but I don't agree with this patch.

There is a difference in the way the machine drivers expect the information to be passed

bxt_pcm512x.c:265:	mach = (&pdev->dev)->platform_data;
bxt_wm8804.c:222:	mach = (&pdev->dev)->platform_data;
bytcht_da7213.c:235:	mach = (&pdev->dev)->platform_data;
bytcht_es8316.c:250:	mach = (&pdev->dev)->platform_data;
bytcr_rt5640.c:1131:	mach = byt_rt5640_card.dev->platform_data;
bytcr_rt5651.c:895:	mach = byt_rt5651_card.dev->platform_data;
cht_bsw_rt5645.c:553:	mach = (&pdev->dev)->platform_data;
cht_bsw_rt5672.c:404:	struct snd_soc_acpi_mach *mach = pdev->dev.platform_data;
skl_hda_dsp_generic.c:150:	mach = dev_get_drvdata(&pdev->dev);

So the first order of business is to realign, not to add a new method that only works for skl_hda_dsp_generic.
I overlooked this point when I tested the SST case.

@RanderWangRanderWangNov 14, 2018

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

yes, I agree with you. First I also found this dev_get_drvdata is used only for skl_hda_dsp but it was upstreamed. If you would refine it, I would wait for your solution.

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

Expand Down
2 changes: 1 addition & 1 deletion sound/soc/sof/sof-acpi-dev.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -251,7 +251,7 @@ static int sof_acpi_probe(struct platform_device *pdev)
sof_pdata->desc = desc;
priv->sof_pdata = sof_pdata;
sof_pdata->dev = &pdev->dev;
sof_pdata->type = SOF_DEVICE_APCI;
sof_pdata->type = SOF_DEVICE_ACPI;
sof_pdata->platform = "sof-audio";
dev_set_drvdata(&pdev->dev, priv);

Expand Down