Skip to content

Revert #5976 and use the upstream version of CORB dma left enabled issue #6011

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
ujfalusi merged 2 commits into from
Nov 2, 2026
Merged

Revert #5976 and use the upstream version of CORB dma left enabled issue #6011

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
3f8bece
Revert "ASoC: SOF: Intel: hda: stop CORB/RIRB DMA in hda_dsp_remove()"
ujfalusi Oct 30, 2026
cf20be4
ASoC: SOF: Intel: hda: Stop the controller before freeing its DMA buf…
Oct 28, 2026
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
1 change: 1 addition & 0 deletions sound/soc/sof/intel/hda-ctrl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,7 @@ void hda_dsp_ctrl_stop_chip(struct snd_sof_dev *sdev)

bus->chip_init = false;
}
EXPORT_SYMBOL_NS(hda_dsp_ctrl_stop_chip, "SND_SOC_SOF_INTEL_HDA_COMMON");

MODULE_LICENSE("Dual BSD/GPL");
MODULE_DESCRIPTION("SOF helpers for HDaudio platforms");
Expand Down
5 changes: 3 additions & 2 deletions sound/soc/sof/intel/hda.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -939,6 +939,7 @@ int hda_dsp_probe(struct snd_sof_dev *sdev)
hda_dsp_ctrl_ppcap_enable(sdev, false);
}
free_ipc_irq:
hda_dsp_ctrl_stop_chip(sdev);
free_irq(sdev->ipc_irq, sdev);
free_irq_vector:
if (sdev->msi_enabled)
Expand Down Expand Up @@ -1006,8 +1007,8 @@ void hda_dsp_remove(struct snd_sof_dev *sdev)
snd_dma_free_pages(&hda->iccmax_dmab);

skip_disable_dsp:
/* stop CORB/RIRB DMA before the ring buffers are freed below */
hda_codec_stop_cmd_io(sdev);
/* stop CORB/RIRB and position buffer DMA before the buffers are freed */
hda_dsp_ctrl_stop_chip(sdev);

free_irq(sdev->ipc_irq, sdev);
if (sdev->msi_enabled)
Expand Down
Loading