Skip to content

ASoC: SOF: Intel: fix suspend/resume for non-HDA mode. #152

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
merged 1 commit into from
Sep 20, 2018
Merged

ASoC: SOF: Intel: fix suspend/resume for non-HDA mode. #152

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 14 additions & 1 deletion sound/soc/sof/intel/hda-dsp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,8 +262,10 @@ static int hda_suspend(struct snd_sof_dev *sdev, int state)
struct hdac_bus *bus = sof_to_bus(sdev);
int ret = 0;

#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)
/* power down all hda link */
snd_hdac_ext_bus_link_power_down_all(bus);
#endif

/* power down DSP */
ret = hda_dsp_core_reset_power_down(sdev, chip->cores_mask);
Expand All @@ -273,18 +275,25 @@ static int hda_suspend(struct snd_sof_dev *sdev, int state)
return ret;
}

#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)
/* disable ppcap interrupt */
snd_hdac_ext_bus_ppcap_int_enable(bus, false);
snd_hdac_ext_bus_ppcap_enable(bus, false);

/* disable hda bus irw and i/o */
snd_hdac_bus_stop_chip(bus);
#endif

/* disable LP retention mode */
snd_sof_pci_update_bits(sdev, PCI_TCSEL,
PCI_CGCTL_LSRMD_MASK, PCI_CGCTL_LSRMD_MASK);

return 0;
/* reset HDA controller */
ret = hda_dsp_ctrl_link_reset(sdev);
if (ret < 0)
dev_err(sdev->dev, "error: failed to reset HDA controller\n");

return ret;
}

static int hda_resume(struct snd_sof_dev *sdev)
Expand All @@ -300,6 +309,7 @@ static int hda_resume(struct snd_sof_dev *sdev)
*/
snd_sof_pci_update_bits(sdev, PCI_TCSEL, 0x07, 0);

#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)
/* reset and start hda controller */
ret = hda_dsp_ctrl_init_chip(sdev, true);
if (ret < 0) {
Expand All @@ -319,6 +329,7 @@ static int hda_resume(struct snd_sof_dev *sdev)
/* enable ppcap interrupt */
snd_hdac_ext_bus_ppcap_enable(bus, true);
snd_hdac_ext_bus_ppcap_int_enable(bus, true);
#endif

/* power up the DSP */
ret = hda_dsp_core_power_up(sdev, chip->cores_mask);
Expand All @@ -328,6 +339,7 @@ static int hda_resume(struct snd_sof_dev *sdev)
return ret;
}

#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)
/* turn off the links that were off before suspend */
list_for_each_entry(hlink, &bus->hlink_list, list) {
if (!hlink->ref_count)
Expand All @@ -337,6 +349,7 @@ static int hda_resume(struct snd_sof_dev *sdev)
/* check dma status and clean up CORB/RIRB buffers */
if (!bus->cmd_dma_state)
snd_hdac_bus_stop_cmd_io(bus);
#endif

return 0;
}
Expand Down