Skip to content
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

Jump to bottom

STM32H7 serial TX DMA fix #11871

Closed
wants to merge 4 commits into from
Closed

STM32H7 serial TX DMA fix #11871

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ebcc4db
Revert "stm32h7:serial make TX DMA busy when there are an outstanding…
kk-thrane Mar 8, 2024
12abf9c
Revert "stm32h7:serial Remove .txdmasem = SEM_INITIALIZER(1) fro…
kk-thrane Mar 8, 2024
7e95326
Revert "stm32h7:Serial refactor out tx dma semaphore"
kk-thrane Mar 8, 2024
48d521f
stm32h7/serial: fix TX DMA
kk-thrane Mar 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
40 changes: 30 additions & 10 deletions arch/arm/src/stm32h7/stm32_serial.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,6 +628,7 @@ struct up_dev_s
#ifdef SERIAL_HAVE_TXDMA
const unsigned int txdma_channel; /* DMA channel assigned */
DMA_HANDLE txdma; /* currently-open trasnmit DMA stream */
sem_t txdmasem; /* Indicate TX DMA completion */
#endif

/* RX DMA state */
Expand Down Expand Up @@ -964,6 +965,7 @@ static struct up_dev_s g_usart1priv =
#endif
#ifdef CONFIG_USART1_TXDMA
.txdma_channel = DMAMAP_USART1_TX,
.txdmasem = SEM_INITIALIZER(1),
#endif
#ifdef CONFIG_USART1_RXDMA
.rxdma_channel = DMAMAP_USART1_RX,
Expand Down Expand Up @@ -1033,6 +1035,7 @@ static struct up_dev_s g_usart2priv =
#endif
#ifdef CONFIG_USART2_TXDMA
.txdma_channel = DMAMAP_USART2_TX,
.txdmasem = SEM_INITIALIZER(1),
#endif
#ifdef CONFIG_USART2_RXDMA
.rxdma_channel = DMAMAP_USART2_RX,
Expand Down Expand Up @@ -1102,6 +1105,7 @@ static struct up_dev_s g_usart3priv =
#endif
#ifdef CONFIG_USART3_TXDMA
.txdma_channel = DMAMAP_USART3_TX,
.txdmasem = SEM_INITIALIZER(1),
#endif
#ifdef CONFIG_USART3_RXDMA
.rxdma_channel = DMAMAP_USART3_RX,
Expand Down Expand Up @@ -1171,6 +1175,7 @@ static struct up_dev_s g_uart4priv =
.rx_gpio = GPIO_UART4_RX,
#ifdef CONFIG_UART4_TXDMA
.txdma_channel = DMAMAP_UART4_TX,
.txdmasem = SEM_INITIALIZER(1),
#endif
#ifdef CONFIG_UART4_RXDMA
.rxdma_channel = DMAMAP_UART4_RX,
Expand Down Expand Up @@ -1240,6 +1245,7 @@ static struct up_dev_s g_uart5priv =
.rx_gpio = GPIO_UART5_RX,
#ifdef CONFIG_UART5_TXDMA
.txdma_channel = DMAMAP_UART5_TX,
.txdmasem = SEM_INITIALIZER(1),
#endif
#ifdef CONFIG_UART5_RXDMA
.rxdma_channel = DMAMAP_UART5_RX,
Expand Down Expand Up @@ -1309,6 +1315,7 @@ static struct up_dev_s g_usart6priv =
#endif
#ifdef CONFIG_USART6_TXDMA
.txdma_channel = DMAMAP_USART6_TX,
.txdmasem = SEM_INITIALIZER(1),
#endif
#ifdef CONFIG_USART6_RXDMA
.rxdma_channel = DMAMAP_USART6_RX,
Expand Down Expand Up @@ -1378,6 +1385,7 @@ static struct up_dev_s g_uart7priv =
#endif
#ifdef CONFIG_UART7_TXDMA
.txdma_channel = DMAMAP_UART7_TX,
.txdmasem = SEM_INITIALIZER(1),
#endif
#ifdef CONFIG_UART7_RXDMA
.rxdma_channel = DMAMAP_UART7_RX,
Expand Down Expand Up @@ -1447,6 +1455,7 @@ static struct up_dev_s g_uart8priv =
#endif
#ifdef CONFIG_UART8_TXDMA
.txdma_channel = DMAMAP_UART8_TX,
.txdmasem = SEM_INITIALIZER(1),
#endif
#ifdef CONFIG_UART8_RXDMA
.rxdma_channel = DMAMAP_UART8_RX,
Expand Down Expand Up @@ -3290,9 +3299,8 @@ static bool up_dma_rxavailable(struct uart_dev_s *dev)
* Name: up_dma_txcallback
*
* Description:
* This function clears dma buffer at completion of DMA transfer. It wakes
* up threads waiting for space in buffer and restarts the DMA if there is
* more data to send.
* This function clears dma buffer at complete of DMA transfer and wakes up
* threads waiting for space in buffer.
*
****************************************************************************/

Expand Down Expand Up @@ -3338,9 +3346,16 @@ static void up_dma_txcallback(DMA_HANDLE handle, uint8_t status, void *arg)

uart_xmitchars_done(&priv->dev);

/* Send more if availaible */
/* Initiate another transmit if data is ready */

up_dma_txavailable(&priv->dev);
if (priv->dev.xmit.tail != priv->dev.xmit.head)
{
uart_xmitchars_dma(&priv->dev);
}
else
{
nxsem_post(&priv->txdmasem);
}
}
#endif

Expand All @@ -3356,17 +3371,22 @@ static void up_dma_txcallback(DMA_HANDLE handle, uint8_t status, void *arg)
static void up_dma_txavailable(struct uart_dev_s *dev)
{
struct up_dev_s *priv = (struct up_dev_s *)dev->priv;
irqstate_t flags = enter_critical_section();

/* Only send when the DMA is idle */

if ((priv->dev.dmatx.length && priv->dev.dmatx.nlength) == 0 &&
stm32_dmaresidual(priv->txdma) == 0)
int rv = nxsem_trywait(&priv->txdmasem);
if (rv == OK)
{
if (dev->xmit.head == dev->xmit.tail)
{
/* No data to transfer. Release semaphore. */

nxsem_post(&priv->txdmasem);
return;
}

uart_xmitchars_dma(dev);
}

leave_critical_section(flags);
}
#endif

Expand Down