From e49c2d9edfcb5ed3efbeb3a94eb3b4378a0e0ed0 Mon Sep 17 00:00:00 2001 From: Adrian Warecki Date: Thu, 19 Jan 2023 16:50:21 +0100 Subject: [PATCH 1/2] zephyr: west: Update zephyr revision Updated zephyr revision to 5d902ea621e43ec9a3916eed8dea5ab3647d81c3 Signed-off-by: Adrian Warecki --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index 48176be00051..7af299ec2b3b 100644 --- a/west.yml +++ b/west.yml @@ -43,7 +43,7 @@ manifest: - name: zephyr repo-path: zephyr - revision: d9c4ec31fc49e7eef3c8c3b0d07827cc04e6efee + revision: 0de83109de16d438192d93c4ceb1ba2e416c1082 remote: zephyrproject # Import some projects listed in zephyr/west.yml@revision # From 617899f5b21e0d980780b4d96ba0eab205009b9b Mon Sep 17 00:00:00 2001 From: Adrian Warecki Date: Wed, 18 Jan 2023 15:17:49 +0100 Subject: [PATCH 2/2] zephyr: dai: Check error code before xrun report The dma_get_status function returns -EINVAL if it detects an invalid parameter, -EPIPE if it detects an xrun. Added error code check before calling xrun handler. Signed-off-by: Adrian Warecki --- src/audio/dai-zephyr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/audio/dai-zephyr.c b/src/audio/dai-zephyr.c index c78d93c56670..51e8a93c8dbd 100644 --- a/src/audio/dai-zephyr.c +++ b/src/audio/dai-zephyr.c @@ -1227,7 +1227,8 @@ static int dai_copy(struct comp_dev *dev) /* get data sizes from DMA */ ret = dma_get_status(dd->chan->dma->z_dev, dd->chan->index, &stat); if (ret < 0) { - dai_report_xrun(dev, 0); + if (ret == -EPIPE) + dai_report_xrun(dev, 0); return ret; } avail_bytes = stat.pending_length;