sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

s32k3xxx:serial ensure the cache is updated if the DMA has updated again

Browse Source
This commit is contained in:
David Sidrane 2023-10-25 03:59:54 -07:00 committed by Xiang Xiao
parent 0bc897df15
commit e0c883f487
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/arm/src/s32k3xx/s32k3xx_serial.c
View File

@ -2814,6 +2814,7 @@ static inline void s32k3xx_serialout(struct s32k3xx_uart_s *priv,
static int s32k3xx_dma_nextrx(struct s32k3xx_uart_s *priv) static int s32k3xx_dma_nextrx(struct s32k3xx_uart_s *priv)
{ {
int dmaresidual = s32k3xx_dmach_getcount(priv->rxdma); int dmaresidual = s32k3xx_dmach_getcount(priv->rxdma);
DEBUGASSERT(dmaresidual <= RXDMA_BUFFER_SIZE);
return (RXDMA_BUFFER_SIZE - dmaresidual) % RXDMA_BUFFER_SIZE; return (RXDMA_BUFFER_SIZE - dmaresidual) % RXDMA_BUFFER_SIZE;
} }
@ -3780,6 +3781,7 @@ static bool s32k3xx_rxflowcontrol(struct uart_dev_s *dev,
static int s32k3xx_dma_receive(struct uart_dev_s *dev, unsigned int *status) static int s32k3xx_dma_receive(struct uart_dev_s *dev, unsigned int *status)
{ {
struct s32k3xx_uart_s *priv = (struct s32k3xx_uart_s *)dev; struct s32k3xx_uart_s *priv = (struct s32k3xx_uart_s *)dev;
static uint32_t last_nextrx = -1;
uint32_t nextrx = s32k3xx_dma_nextrx(priv); uint32_t nextrx = s32k3xx_dma_nextrx(priv);
int c = 0; int c = 0;
@ -3787,6 +3789,17 @@ static int s32k3xx_dma_receive(struct uart_dev_s *dev, unsigned int *status)
if (nextrx != priv->rxdmanext) if (nextrx != priv->rxdmanext)
{ {
/* Now we must ensure the cache is updated if the DMA has
* updated again.
*/
if (last_nextrx != nextrx)
{
up_invalidate_dcache((uintptr_t)priv->rxfifo,
(uintptr_t)priv->rxfifo + RXDMA_BUFFER_SIZE);
last_nextrx = nextrx;
}
/* Now read from the DMA buffer */ /* Now read from the DMA buffer */
c = priv->rxfifo[priv->rxdmanext]; c = priv->rxfifo[priv->rxdmanext];
@ -4155,9 +4168,6 @@ static void s32k3xx_dma_rxcallback(DMACH_HANDLE handle, void *arg, bool done,
struct s32k3xx_uart_s *priv = (struct s32k3xx_uart_s *)arg; struct s32k3xx_uart_s *priv = (struct s32k3xx_uart_s *)arg;
uint32_t sr; uint32_t sr;
up_invalidate_dcache((uintptr_t)priv->rxfifo,
(uintptr_t)priv->rxfifo + RXDMA_BUFFER_SIZE);
if (priv->rxenable && s32k3xx_dma_rxavailable(&priv->dev)) if (priv->rxenable && s32k3xx_dma_rxavailable(&priv->dev))
{ {
uart_recvchars(&priv->dev); uart_recvchars(&priv->dev);