Skip to content

Topic/skl rom init timeout #717

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 2 commits into from
Apr 3, 2019
Merged

Topic/skl rom init timeout #717

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
470e20a
ASoc:SOF:skl make ROM init timeout skl specific
zhuyingjiang Apr 1, 2019
7b223da
ASoC:SOF:skl fix some comments error
zhuyingjiang Mar 15, 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
7 changes: 5 additions & 2 deletions sound/soc/sof/intel/hda-loader-skl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,8 @@ static void cl_cleanup_skl(struct snd_sof_dev *sdev)

static int cl_dsp_init_skl(struct snd_sof_dev *sdev)
{
struct sof_intel_hda_dev *hda = sdev->pdata->hw_pdata;
const struct sof_intel_dsp_desc *chip = hda->desc;
unsigned int sts;
int ret;

Expand All @@ -328,7 +330,7 @@ static int cl_dsp_init_skl(struct snd_sof_dev *sdev)
} else {
/*
* if not enabled, power down it first and
* then powerup and runthe core.
* then powerup and run the core.
*/
ret = hda_dsp_core_reset_power_down(sdev, HDA_DSP_CORE_MASK(0));
if (ret < 0) {
Expand Down Expand Up @@ -359,7 +361,8 @@ static int cl_dsp_init_skl(struct snd_sof_dev *sdev)
((sts & HDA_DSP_ROM_STS_MASK)
== HDA_DSP_ROM_INIT),
HDA_DSP_REG_POLL_INTERVAL_US,
HDA_DSP_INIT_TIMEOUT_US);
chip->rom_init_timeout *
USEC_PER_MSEC);
if (ret < 0)
goto err;

Expand Down
2 changes: 1 addition & 1 deletion sound/soc/sof/intel/skl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ const struct snd_sof_dsp_ops sof_skl_ops = {
EXPORT_SYMBOL(sof_skl_ops);

const struct sof_intel_dsp_desc skl_chip_info = {
/* Apollolake */
/* Skylake */

@plbossart plbossart Mar 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.

this is really not related to the timeout, you need to provide patches that match the commit message

@zhuyingjiang zhuyingjiang Mar 15, 2019

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.

@plbossart OK, will sub another PR

.cores_num = 2,
.init_core_mask = 1,
.cores_mask = HDA_DSP_CORE_MASK(0) | HDA_DSP_CORE_MASK(1),
Expand Down