Skip to content

ASoC: SOF: enable msi for sof hda audio #29

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
Jul 11, 2018
Merged

ASoC: SOF: enable msi for sof hda audio #29

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
34 changes: 26 additions & 8 deletions sound/soc/sof/intel/hda.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,20 +446,35 @@ int hda_dsp_probe(struct snd_sof_dev *sdev)
SOF_HDA_INT_CTRL_EN | SOF_HDA_INT_GLOBAL_EN,
SOF_HDA_INT_CTRL_EN | SOF_HDA_INT_GLOBAL_EN);

dev_dbg(sdev->dev, "using PCI IRQ %d\n", pci->irq);
/*
* register our IRQ
* let's try to enable msi firstly
* if it fails, use legacy interrupt mode
* TODO: support interrupt mode selection with kernel parameter
* support msi multiple vectors
*/
ret = pci_alloc_irq_vectors(pci, 1, 1, PCI_IRQ_MSI);
if (ret < 0) {
dev_info(sdev->dev, "use legacy interrupt mode\n");
sdev->hda->irq = pci->irq;
sdev->ipc_irq = pci->irq;
} else {
dev_info(sdev->dev, "use msi interrupt mode\n");
sdev->hda->irq = pci_irq_vector(pci, 0);
/* ipc irq number is the same of hda irq */
sdev->ipc_irq = sdev->hda->irq;
}

/* register our IRQ */
ret = request_threaded_irq(pci->irq, hda_dsp_stream_interrupt,
dev_dbg(sdev->dev, "using HDA IRQ %d\n", sdev->hda->irq);
ret = request_threaded_irq(sdev->hda->irq, hda_dsp_stream_interrupt,
hda_dsp_stream_threaded_handler,
IRQF_SHARED, "AudioHDA", sdev);
IRQF_SHARED, "AudioHDA", sdev);
if (ret < 0) {
dev_err(sdev->dev, "error: failed to register HDA IRQ %d\n",
sdev->ipc_irq);
sdev->hda->irq);
goto stream_err;
}
sdev->hda->irq = pci->irq;

sdev->ipc_irq = pci->irq;
dev_dbg(sdev->dev, "using IPC IRQ %d\n", sdev->ipc_irq);
ret = request_threaded_irq(sdev->ipc_irq, hda_dsp_ipc_irq_handler,
chip->ops->irq_thread, IRQF_SHARED,
Expand Down Expand Up @@ -494,8 +509,9 @@ int hda_dsp_probe(struct snd_sof_dev *sdev)
return 0;

irq_err:
free_irq(pci->irq, sdev);
free_irq(sdev->hda->irq, sdev);
stream_err:
pci_free_irq_vectors(pci);
hda_dsp_stream_free(sdev);
err:
/* disable DSP */
Expand All @@ -506,6 +522,7 @@ int hda_dsp_probe(struct snd_sof_dev *sdev)

int hda_dsp_remove(struct snd_sof_dev *sdev)
{
struct pci_dev *pci = sdev->pci;
const struct sof_intel_dsp_desc *chip = sdev->hda->desc;

/* disable DSP IRQ */
Expand All @@ -526,6 +543,7 @@ int hda_dsp_remove(struct snd_sof_dev *sdev)

free_irq(sdev->ipc_irq, sdev);
free_irq(sdev->pci->irq, sdev);
pci_free_irq_vectors(pci);

hda_dsp_stream_free(sdev);
return 0;
Expand Down