Skip to content

wait: print register values if poll_for_register_delay fails #4251

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
lgirdwood merged 1 commit into from
May 26, 2021
Merged

wait: print register values if poll_for_register_delay fails #4251

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
4 changes: 3 additions & 1 deletion src/drivers/dw/dma.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -888,8 +888,10 @@ static int dw_dma_copy(struct dma_chan_data *channel, int bytes,
DW_DMA_CHAN_EN,
DW_CHAN(channel->index), 0,
DW_DMA_TIMEOUT);
if (ret < 0)
if (ret < 0) {
tr_dbg(&dwdma_tr, "dw_dma_copy(): poll_for_register_delay timeout");
return ret;
}
}

dw_dma_verify_transfer(channel, &next);
Expand Down
20 changes: 14 additions & 6 deletions src/drivers/imx/sai.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ static void sai_stop(struct dai *dai, int direction)
dai_info(dai, "SAI: sai_stop");

uint32_t xcsr = 0U;
int ret = 0;

/* Disable DMA request */
dai_update_bits(dai, REG_SAI_XCSR(direction),
Expand All @@ -119,24 +120,31 @@ static void sai_stop(struct dai *dai, int direction)
/* Disable transmitter/receiver */
if (direction == DAI_DIR_CAPTURE) {
dai_update_bits(dai, REG_SAI_XCSR(DAI_DIR_CAPTURE), REG_SAI_CSR_TERE, 0);
poll_for_register_delay(dai_base(dai) + REG_SAI_XCSR(DAI_DIR_CAPTURE),
REG_SAI_CSR_TERE, 0, 100);
ret = poll_for_register_delay(dai_base(dai) +
REG_SAI_XCSR(DAI_DIR_CAPTURE),
REG_SAI_CSR_TERE, 0, 100);

/* Check if the opposite direction is also disabled */
xcsr = dai_read(dai, REG_SAI_XCSR(DAI_DIR_PLAYBACK));
if (!(xcsr & REG_SAI_CSR_FRDE)) {
dai_update_bits(dai, REG_SAI_XCSR(DAI_DIR_PLAYBACK), REG_SAI_CSR_TERE, 0);
poll_for_register_delay(dai_base(dai) + REG_SAI_XCSR(DAI_DIR_PLAYBACK),
REG_SAI_CSR_TERE, 0, 100);
ret = poll_for_register_delay(dai_base(dai) +
REG_SAI_XCSR(DAI_DIR_PLAYBACK),
REG_SAI_CSR_TERE, 0, 100);
}
} else {
/* Check if the opposite direction is also disabled */
xcsr = dai_read(dai, REG_SAI_XCSR(DAI_DIR_CAPTURE));
if (!(xcsr & REG_SAI_CSR_FRDE)) {
dai_update_bits(dai, REG_SAI_XCSR(DAI_DIR_PLAYBACK), REG_SAI_CSR_TERE, 0);
poll_for_register_delay(dai_base(dai) + REG_SAI_XCSR(DAI_DIR_PLAYBACK),
REG_SAI_CSR_TERE, 0, 100);
ret = poll_for_register_delay(dai_base(dai) +
REG_SAI_XCSR(DAI_DIR_PLAYBACK),
REG_SAI_CSR_TERE, 0, 100);
}
}

if (ret < 0)
dai_warn(dai, "sai: poll for register delay failed");
}

static int sai_context_store(struct dai *dai)
Expand Down
3 changes: 2 additions & 1 deletion src/lib/wait.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ int poll_for_register_delay(uint32_t reg, uint32_t mask,

while ((io_reg_read(reg) & mask) != val) {
if (!tries--) {
tr_err(&wait_tr, "ewt");
tr_err(&wait_tr, "poll timeout reg %u mask %u val %u us %u",
reg, mask, val, (uint32_t)us);
return -EIO;
}
wait_delay(delta);
Expand Down