nuttx/nuttx-update
1
2
Fork 1
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

at32_serial: use small lock in arch/arm/src/at32/at32_serial.c

Browse source 
reason:
We would like to replace the big lock with a small lock.

Signed-off-by: hujun5 <hujun5@xiaomi.com>
This commit is contained in:
hujun5 2024-12-18 15:35:28 +08:00 committed by Xiang Xiao
parent 2852064501
commit d48583604c
1 changed files with 52 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
arch/arm/src/at32/at32_serial.c
View file

@ -196,6 +196,7 @@ struct up_dev_s
struct uart_dev_s dev; /* Generic UART device */ struct uart_dev_s dev; /* Generic UART device */
uint16_t ie; /* Saved interrupt mask bits value */ uint16_t ie; /* Saved interrupt mask bits value */
uint16_t sr; /* Saved status bits */ uint16_t sr; /* Saved status bits */
spinlock_t lock; /* Spinlock */
/* Has been initialized and HW is setup. */ /* Has been initialized and HW is setup. */
@ -1087,10 +1088,10 @@ static inline void up_serialout(struct up_dev_s *priv, int offset,
} }
/**************************************************************************** /****************************************************************************
* Name: up_setusartint * Name: up_setusartint_nolock
****************************************************************************/ ****************************************************************************/
static inline void up_setusartint(struct up_dev_s *priv, uint16_t ie) static inline void up_setusartint_nolock(struct up_dev_s *priv, uint16_t ie)
{ {
uint32_t cr; uint32_t cr;
@ -1117,16 +1118,18 @@ static inline void up_setusartint(struct up_dev_s *priv, uint16_t ie)
* Name: up_restoreusartint * Name: up_restoreusartint
****************************************************************************/ ****************************************************************************/
#if defined(HAVE_RS485) || CONSOLE_UART > 0
static void up_restoreusartint(struct up_dev_s *priv, uint16_t ie) static void up_restoreusartint(struct up_dev_s *priv, uint16_t ie)
{ {
irqstate_t flags; irqstate_t flags;
flags = spin_lock_irqsave(NULL); flags = spin_lock_irqsave(&priv->lock);
up_setusartint(priv, ie); up_setusartint_nolock(priv, ie);
spin_unlock_irqrestore(NULL, flags); spin_unlock_irqrestore(&priv->lock, flags);
} }
#endif
/**************************************************************************** /****************************************************************************
* Name: up_disableusartint * Name: up_disableusartint
@ -1136,7 +1139,7 @@ static void up_disableusartint(struct up_dev_s *priv, uint16_t *ie)
{ {
irqstate_t flags; irqstate_t flags;
flags = spin_lock_irqsave(NULL); flags = spin_lock_irqsave(&priv->lock);
if (ie) if (ie)
{ {
@ -1175,9 +1178,9 @@ static void up_disableusartint(struct up_dev_s *priv, uint16_t *ie)
/* Disable all interrupts */ /* Disable all interrupts */
up_setusartint(priv, 0); up_setusartint_nolock(priv, 0);
spin_unlock_irqrestore(NULL, flags); spin_unlock_irqrestore(&priv->lock, flags);
} }
/**************************************************************************** /****************************************************************************
@ -1490,6 +1493,8 @@ static int up_setup(struct uart_dev_s *dev)
priv->ie = 0; priv->ie = 0;
spin_lock_init(&priv->lock);
/* Mark device as initialized. */ /* Mark device as initialized. */
priv->initialized = true; priv->initialized = true;
@ -2044,13 +2049,13 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
irqstate_t flags; irqstate_t flags;
uint32_t tx_break; uint32_t tx_break;
flags = enter_critical_section(); flags = spin_lock_irqsave(&priv->lock);
/* Disable any further tx activity */ /* Disable any further tx activity */
priv->ie |= USART_CR1_IE_BREAK_INPROGRESS; priv->ie |= USART_CR1_IE_BREAK_INPROGRESS;
up_txint(dev, false); up_txint_nolock(dev, false);
/* Configure TX as a GPIO output pin and Send a break signal */ /* Configure TX as a GPIO output pin and Send a break signal */
@ -2058,7 +2063,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
priv->tx_gpio); priv->tx_gpio);
at32_configgpio(tx_break); at32_configgpio(tx_break);
leave_critical_section(flags); spin_unlock_irqrestore(&priv->lock, flags);
} }
break; break;
@ -2066,7 +2071,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
{ {
irqstate_t flags; irqstate_t flags;
flags = enter_critical_section(); flags = spin_lock_irqsave(&priv->lock);
/* Configure TX back to U(S)ART */ /* Configure TX back to U(S)ART */
@ -2076,9 +2081,9 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
/* Enable further tx activity */ /* Enable further tx activity */
up_txint(dev, true); up_txint_nolock(dev, true);
leave_critical_section(flags); spin_unlock_irqrestore(&priv->lock, flags);
} }
break; break;
# else # else
@ -2087,10 +2092,10 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
uint32_t cr1; uint32_t cr1;
irqstate_t flags; irqstate_t flags;
flags = enter_critical_section(); flags = spin_lock_irqsave(&priv->lock);
cr1 = up_serialin(priv, AT32_USART_CTRL1_OFFSET); cr1 = up_serialin(priv, AT32_USART_CTRL1_OFFSET);
up_serialout(priv, AT32_USART_CTRL1_OFFSET, cr1 | USART_CR1_SBK); up_serialout(priv, AT32_USART_CTRL1_OFFSET, cr1 | USART_CR1_SBK);
leave_critical_section(flags); spin_unlock_irqrestore(&priv->lock, flags);
} }
break; break;
@ -2099,10 +2104,10 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
uint32_t cr1; uint32_t cr1;
irqstate_t flags; irqstate_t flags;
flags = enter_critical_section(); flags = spin_lock_irqsave(&priv->lock);
cr1 = up_serialin(priv, AT32_USART_CTRL1_OFFSET); cr1 = up_serialin(priv, AT32_USART_CTRL1_OFFSET);
up_serialout(priv, AT32_USART_CTRL1_OFFSET, cr1 & ~USART_CR1_SBK); up_serialout(priv, AT32_USART_CTRL1_OFFSET, cr1 & ~USART_CR1_SBK);
leave_critical_section(flags); spin_unlock_irqrestore(&priv->lock, flags);
} }
break; break;
# endif # endif
@ -2156,10 +2161,9 @@ static int up_receive(struct uart_dev_s *dev, unsigned int *status)
****************************************************************************/ ****************************************************************************/
#if defined(SERIAL_HAVE_TXDMA_OPS) || defined(SERIAL_HAVE_NODMA_OPS) #if defined(SERIAL_HAVE_TXDMA_OPS) || defined(SERIAL_HAVE_NODMA_OPS)
static void up_rxint(struct uart_dev_s *dev, bool enable) static void up_rxint_nolock(struct uart_dev_s *dev, bool enable)
{ {
struct up_dev_s *priv = (struct up_dev_s *)dev->priv; struct up_dev_s *priv = (struct up_dev_s *)dev->priv;
irqstate_t flags;
uint16_t ie; uint16_t ie;
/* USART receive interrupts: /* USART receive interrupts:
@ -2177,7 +2181,6 @@ static void up_rxint(struct uart_dev_s *dev, bool enable)
* " " USART_STS_ROERR Overrun Error Detected * " " USART_STS_ROERR Overrun Error Detected
*/ */
flags = enter_critical_section();
ie = priv->ie; ie = priv->ie;
if (enable) if (enable)
{ {
@ -2201,8 +2204,17 @@ static void up_rxint(struct uart_dev_s *dev, bool enable)
/* Then set the new interrupt state */ /* Then set the new interrupt state */
up_restoreusartint(priv, ie); up_setusartint_nolock(priv, ie);
leave_critical_section(flags); }
static void up_rxint(struct uart_dev_s *dev, bool enable)
{
struct up_dev_s *priv = (struct up_dev_s *)dev->priv;
irqstate_t flags;
flags = spin_lock_irqsave(&priv->lock);
up_rxint_nolock(dev, enable);
spin_unlock_irqrestore(&priv->lock, flags);
} }
#endif #endif
@ -2563,10 +2575,10 @@ static void up_dma_txint(struct uart_dev_s *dev, bool enable)
#if defined(SERIAL_HAVE_RXDMA_OPS) || defined(SERIAL_HAVE_NODMA_OPS) || \ #if defined(SERIAL_HAVE_RXDMA_OPS) || defined(SERIAL_HAVE_NODMA_OPS) || \
defined(CONFIG_AT32_SERIALBRK_BSDCOMPAT) defined(CONFIG_AT32_SERIALBRK_BSDCOMPAT)
static void up_txint(struct uart_dev_s *dev, bool enable)
static void up_txint_nolock(struct uart_dev_s *dev, bool enable)
{ {
struct up_dev_s *priv = (struct up_dev_s *)dev->priv; struct up_dev_s *priv = (struct up_dev_s *)dev->priv;
irqstate_t flags;
/* USART transmit interrupts: /* USART transmit interrupts:
* *
@ -2577,7 +2589,6 @@ static void up_txint(struct uart_dev_s *dev, bool enable)
* USART_CTRL3_CTSCFIEN USART_SR_CTS CTS flag (not used) * USART_CTRL3_CTSCFIEN USART_SR_CTS CTS flag (not used)
*/ */
flags = enter_critical_section();
if (enable) if (enable)
{ {
/* Set to receive an interrupt when the TX data register is empty */ /* Set to receive an interrupt when the TX data register is empty */
@ -2599,12 +2610,11 @@ static void up_txint(struct uart_dev_s *dev, bool enable)
# ifdef CONFIG_AT32_SERIALBRK_BSDCOMPAT # ifdef CONFIG_AT32_SERIALBRK_BSDCOMPAT
if (priv->ie & USART_CR1_IE_BREAK_INPROGRESS) if (priv->ie & USART_CR1_IE_BREAK_INPROGRESS)
{ {
leave_critical_section(flags);
return; return;
} }
# endif # endif
up_restoreusartint(priv, ie); up_setusartint_nolock(priv, ie);
#else #else
/* Fake a TX interrupt here by just calling uart_xmitchars() with /* Fake a TX interrupt here by just calling uart_xmitchars() with
@ -2618,11 +2628,20 @@ static void up_txint(struct uart_dev_s *dev, bool enable)
{ {
/* Disable the TX interrupt */ /* Disable the TX interrupt */
up_restoreusartint(priv, priv->ie & ~USART_CTRL1_TDBEIEN); up_setusartint_nolock(priv, priv->ie & ~USART_CTRL1_TDBEIEN);
} }
leave_critical_section(flags);
} }
static void up_txint(struct uart_dev_s *dev, bool enable)
{
struct up_dev_s *priv = (struct up_dev_s *)dev->priv;
irqstate_t flags;
flags = spin_lock_irqsave(&priv->lock);
up_txint_nolock(dev, enable);
spin_unlock_irqrestore(&priv->lock, flags);
}
#endif #endif
/**************************************************************************** /****************************************************************************
@ -2929,7 +2948,7 @@ void at32_serial_dma_poll(void)
{ {
irqstate_t flags; irqstate_t flags;
flags = enter_critical_section(); flags = spin_lock_irqsave(&priv->lock);
#ifdef CONFIG_USART1_RXDMA #ifdef CONFIG_USART1_RXDMA
if (g_usart1priv.rxdma != NULL) if (g_usart1priv.rxdma != NULL)
@ -2987,7 +3006,7 @@ void at32_serial_dma_poll(void)
} }
#endif #endif
leave_critical_section(flags); spin_unlock_irqrestore(&priv->lock, flags);
} }
#endif #endif