Skip to content

ASoC: SOF: refine interrupt function on BDW & HSW #381

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 1 commit into from
Dec 7, 2018
Merged

ASoC: SOF: refine interrupt function on BDW & HSW #381

Show file tree
Hide file tree
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
38 changes: 17 additions & 21 deletions sound/soc/sof/intel/bdw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,37 +251,27 @@ static irqreturn_t bdw_irq_handler(int irq, void *context)

/* Interrupt arrived, check src */
isr = snd_sof_dsp_read(sdev, BDW_DSP_BAR, SHIM_ISRX);
if (isr & SHIM_ISRX_DONE) {
/* Mask Done interrupt before return */
snd_sof_dsp_update_bits_unlocked(sdev, BDW_DSP_BAR,
SHIM_IMRX, SHIM_IMRX_DONE,
SHIM_IMRX_DONE);
if (isr & (SHIM_ISRX_DONE | SHIM_ISRX_BUSY))
ret = IRQ_WAKE_THREAD;
}

if (isr & SHIM_ISRX_BUSY) {
/* Mask Busy interrupt before return */
snd_sof_dsp_update_bits_unlocked(sdev, BDW_DSP_BAR,
SHIM_IMRX, SHIM_IMRX_BUSY,
SHIM_IMRX_BUSY);
ret = IRQ_WAKE_THREAD;
}

return ret;
}

static irqreturn_t bdw_irq_thread(int irq, void *context)
{
struct snd_sof_dev *sdev = (struct snd_sof_dev *)context;
u32 ipcx, ipcd, hdr;
u32 ipcx, ipcd, imrx;

imrx = snd_sof_dsp_read64(sdev, BDW_DSP_BAR, SHIM_IMRX);
ipcx = snd_sof_dsp_read(sdev, BDW_DSP_BAR, SHIM_IPCX);

/* reply message from DSP */
if (ipcx & SHIM_IPCX_DONE) {
/* Handle Immediate reply from DSP Core */
sof_mailbox_read(sdev, sdev->host_box.offset, &hdr,
sizeof(hdr));
if (ipcx & SHIM_IPCX_DONE &&
!(imrx & SHIM_IMRX_DONE)) {
/* Mask Done interrupt before return */
snd_sof_dsp_update_bits_unlocked(sdev, BDW_DSP_BAR,
SHIM_IMRX, SHIM_IMRX_DONE,
SHIM_IMRX_DONE);

/*
* handle immediate reply from DSP core. If the msg is
Expand All @@ -290,14 +280,20 @@ static irqreturn_t bdw_irq_thread(int irq, void *context)
* because the done bit can't be set in cmd_done function
* which is triggered by msg
*/
if (snd_sof_ipc_reply(sdev, hdr))
if (snd_sof_ipc_reply(sdev, ipcx))
bdw_cmd_done(sdev, SOF_IPC_DSP_REPLY);
}

ipcd = snd_sof_dsp_read(sdev, BDW_DSP_BAR, SHIM_IPCD);

/* new message from DSP */
if (ipcd & SHIM_IPCD_BUSY) {
if (ipcd & SHIM_IPCD_BUSY &&
!(imrx & SHIM_IMRX_BUSY)) {
/* Mask Busy interrupt before return */
snd_sof_dsp_update_bits_unlocked(sdev, BDW_DSP_BAR,
SHIM_IMRX, SHIM_IMRX_BUSY,
SHIM_IMRX_BUSY);

/* Handle messages from DSP Core */
if ((ipcd & SOF_IPC_PANIC_MAGIC_MASK) == SOF_IPC_PANIC_MAGIC) {
snd_sof_dsp_panic(sdev, BDW_PANIC_OFFSET(ipcx) +
Expand Down
38 changes: 17 additions & 21 deletions sound/soc/sof/intel/hsw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,21 +251,8 @@ static irqreturn_t hsw_irq_handler(int irq, void *context)

/* Interrupt arrived, check src */
isr = snd_sof_dsp_read(sdev, HSW_DSP_BAR, SHIM_ISRX);
if (isr & SHIM_ISRX_DONE) {
/* Mask Done interrupt before return */
snd_sof_dsp_update_bits_unlocked(sdev, HSW_DSP_BAR, SHIM_IMRX,
SHIM_IMRX_DONE,
SHIM_IMRX_DONE);
if (isr & (SHIM_ISRX_DONE | SHIM_ISRX_BUSY))
ret = IRQ_WAKE_THREAD;
}

if (isr & SHIM_ISRX_BUSY) {
/* Mask Busy interrupt before return */
snd_sof_dsp_update_bits_unlocked(sdev, HSW_DSP_BAR, SHIM_IMRX,
SHIM_IMRX_BUSY,
SHIM_IMRX_BUSY);
ret = IRQ_WAKE_THREAD;
}

spin_unlock(&sdev->hw_lock);
return ret;
Expand All @@ -274,15 +261,18 @@ static irqreturn_t hsw_irq_handler(int irq, void *context)
static irqreturn_t hsw_irq_thread(int irq, void *context)
{
struct snd_sof_dev *sdev = (struct snd_sof_dev *)context;
u32 ipcx, ipcd, hdr;
u32 ipcx, ipcd, imrx;

imrx = snd_sof_dsp_read64(sdev, HSW_DSP_BAR, SHIM_IMRX);
ipcx = snd_sof_dsp_read(sdev, HSW_DSP_BAR, SHIM_IPCX);

/* reply message from DSP */
if (ipcx & SHIM_IPCX_DONE) {
/* Handle Immediate reply from DSP Core */
sof_mailbox_read(sdev, sdev->host_box.offset, &hdr,
sizeof(hdr));
if (ipcx & SHIM_IPCX_DONE &&
!(imrx & SHIM_IMRX_DONE)) {
/* Mask Done interrupt before return */
snd_sof_dsp_update_bits_unlocked(sdev, HSW_DSP_BAR,
SHIM_IMRX, SHIM_IMRX_DONE,
SHIM_IMRX_DONE);

/*
* handle immediate reply from DSP core. If the msg is
Expand All @@ -291,14 +281,20 @@ static irqreturn_t hsw_irq_thread(int irq, void *context)
* because the done bit can't be set in cmd_done function
* which is triggered by msg
*/
if (snd_sof_ipc_reply(sdev, hdr))
if (snd_sof_ipc_reply(sdev, ipcx))
hsw_cmd_done(sdev, SOF_IPC_DSP_REPLY);
}

ipcd = snd_sof_dsp_read(sdev, HSW_DSP_BAR, SHIM_IPCD);

/* new message from DSP */
if (ipcd & SHIM_IPCD_BUSY) {
if (ipcd & SHIM_IPCD_BUSY &&
!(imrx & SHIM_IMRX_BUSY)) {
/* Mask Busy interrupt before return */
snd_sof_dsp_update_bits_unlocked(sdev, HSW_DSP_BAR,
SHIM_IMRX, SHIM_IMRX_BUSY,
SHIM_IMRX_BUSY);

/* Handle messages from DSP Core */
if ((ipcd & SOF_IPC_PANIC_MAGIC_MASK) == SOF_IPC_PANIC_MAGIC) {
snd_sof_dsp_panic(sdev, HSW_PANIC_OFFSET(ipcx) +
Expand Down