You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ac...@apache.org on 2020/01/11 11:10:33 UTC
[incubator-nuttx] branch pr77 updated: arch/stm32 ensure all spi
dma handler check the result
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch pr77
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/pr77 by this push:
new 756c718 arch/stm32 ensure all spi dma handler check the result
756c718 is described below
commit 756c7185365d97eb82ecdded50c5d04df1abcd7a
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sat Jan 11 17:27:39 2020 +0800
arch/stm32 ensure all spi dma handler check the result
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/arm/src/stm32/stm32_spi.c | 20 ++++++++++++++++++--
arch/arm/src/stm32h7/stm32_spi.c | 10 +++++++++-
arch/arm/src/stm32l4/stm32l4_spi.c | 10 +++++++++-
3 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/arch/arm/src/stm32/stm32_spi.c b/arch/arm/src/stm32/stm32_spi.c
index 48f2e90..4c91a9b 100644
--- a/arch/arm/src/stm32/stm32_spi.c
+++ b/arch/arm/src/stm32/stm32_spi.c
@@ -800,7 +800,15 @@ static inline bool spi_16bitmode(FAR struct stm32_spidev_s *priv)
#ifdef CONFIG_STM32_SPI_DMA
static void spi_dmarxwait(FAR struct stm32_spidev_s *priv)
{
- nxsem_wait_uninterruptible(&priv->rxsem);
+ /* Take the semaphore (perhaps waiting). If the result is zero, then the DMA
+ * must not really have completed???
+ */
+
+ do
+ {
+ nxsem_wait_uninterruptible(&priv->rxsem);
+ }
+ while (priv->rxresult == 0);
}
#endif
@@ -815,7 +823,15 @@ static void spi_dmarxwait(FAR struct stm32_spidev_s *priv)
#ifdef CONFIG_STM32_SPI_DMA
static void spi_dmatxwait(FAR struct stm32_spidev_s *priv)
{
- nxsem_wait_uninterruptible(&priv->txsem);
+ /* Take the semaphore (perhaps waiting). If the result is zero, then the DMA
+ * must not really have completed???
+ */
+
+ do
+ {
+ nxsem_wait_uninterruptible(&priv->txsem);
+ }
+ while (priv->txresult == 0);
}
#endif
diff --git a/arch/arm/src/stm32h7/stm32_spi.c b/arch/arm/src/stm32h7/stm32_spi.c
index f90578d..513994b 100644
--- a/arch/arm/src/stm32h7/stm32_spi.c
+++ b/arch/arm/src/stm32h7/stm32_spi.c
@@ -853,7 +853,15 @@ static void spi_dmarxwait(FAR struct stm32_spidev_s *priv)
#ifdef CONFIG_STM32H7_SPI_DMA
static void spi_dmatxwait(FAR struct stm32_spidev_s *priv)
{
- nxsem_wait_uninterruptible(&priv->txsem);
+ /* Take the semaphore (perhaps waiting). If the result is zero, then the DMA
+ * must not really have completed???
+ */
+
+ do
+ {
+ nxsem_wait_uninterruptible(&priv->txsem);
+ }
+ while (priv->txresult == 0);
}
#endif
diff --git a/arch/arm/src/stm32l4/stm32l4_spi.c b/arch/arm/src/stm32l4/stm32l4_spi.c
index 76a3724..c91218a 100644
--- a/arch/arm/src/stm32l4/stm32l4_spi.c
+++ b/arch/arm/src/stm32l4/stm32l4_spi.c
@@ -637,7 +637,15 @@ static void spi_dmarxwait(FAR struct stm32l4_spidev_s *priv)
#ifdef CONFIG_STM32L4_SPI_DMA
static void spi_dmatxwait(FAR struct stm32l4_spidev_s *priv)
{
- nxsem_wait_uninterruptible(&priv->txsem);
+ /* Take the semaphore (perhaps waiting). If the result is zero, then the DMA
+ * must not really have completed???
+ */
+
+ do
+ {
+ nxsem_wait_uninterruptible(&priv->txsem);
+ }
+ while (priv->txresult == 0);
}
#endif