lupyuen/local-nuttx-update
1
0
Fork 0
forked from nuttx/nuttx-update
Code Pull requests Activity

s32k1xx_serial: arch/arm/src/s32k1xx/s32k1xx_serial.c

Browse source 
reason:
We hope to remove all instances of spin_lock_irqsave(NULL).

Signed-off-by: hujun5 <hujun5@xiaomi.com>
This commit is contained in:
hujun5 2024-12-05 20:25:40 +08:00 committed by Xiang Xiao
parent ae5c7a7fd8
commit cbd07a86c9
1 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
arch/arm/src/s32k1xx/s32k1xx_serial.c
View file

@ -179,6 +179,7 @@
struct s32k1xx_uart_s struct s32k1xx_uart_s
{ {
struct uart_dev_s dev; /* Generic UART device */ struct uart_dev_s dev; /* Generic UART device */
spinlock_t lock; /* Spinlock */
uint32_t uartbase; /* Base address of UART registers */ uint32_t uartbase; /* Base address of UART registers */
uint32_t baud; /* Configured baud */ uint32_t baud; /* Configured baud */
uint32_t ie; /* Saved enabled interrupts */ uint32_t ie; /* Saved enabled interrupts */
@ -450,6 +451,7 @@ static struct s32k1xx_uart_s g_lpuart0priv =
# endif # endif
.priv = &g_lpuart0priv, .priv = &g_lpuart0priv,
}, },
.lock = SP_UNLOCKED,
.uartbase = S32K1XX_LPUART0_BASE, .uartbase = S32K1XX_LPUART0_BASE,
.baud = CONFIG_LPUART0_BAUD, .baud = CONFIG_LPUART0_BAUD,
.irq = S32K1XX_IRQ_LPUART0, .irq = S32K1XX_IRQ_LPUART0,
@ -515,6 +517,7 @@ static struct s32k1xx_uart_s g_lpuart1priv =
.priv = &g_lpuart1priv, .priv = &g_lpuart1priv,
}, },
.lock = SP_UNLOCKED,
.uartbase = S32K1XX_LPUART1_BASE, .uartbase = S32K1XX_LPUART1_BASE,
.baud = CONFIG_LPUART1_BAUD, .baud = CONFIG_LPUART1_BAUD,
.irq = S32K1XX_IRQ_LPUART1, .irq = S32K1XX_IRQ_LPUART1,
@ -577,6 +580,7 @@ static struct s32k1xx_uart_s g_lpuart2priv =
.priv = &g_lpuart2priv, .priv = &g_lpuart2priv,
}, },
.lock = SP_UNLOCKED,
.uartbase = S32K1XX_LPUART2_BASE, .uartbase = S32K1XX_LPUART2_BASE,
.baud = CONFIG_LPUART2_BAUD, .baud = CONFIG_LPUART2_BAUD,
.irq = S32K1XX_IRQ_LPUART2, .irq = S32K1XX_IRQ_LPUART2,
@ -669,10 +673,8 @@ static int s32k1xx_dma_nextrx(struct s32k1xx_uart_s *priv)
static inline void s32k1xx_disableuartint(struct s32k1xx_uart_s *priv, static inline void s32k1xx_disableuartint(struct s32k1xx_uart_s *priv,
uint32_t *ie) uint32_t *ie)
{ {
irqstate_t flags;
uint32_t regval; uint32_t regval;
flags = spin_lock_irqsave(NULL);
regval = s32k1xx_serialin(priv, S32K1XX_LPUART_CTRL_OFFSET); regval = s32k1xx_serialin(priv, S32K1XX_LPUART_CTRL_OFFSET);
/* Return the current Rx and Tx interrupt state */ /* Return the current Rx and Tx interrupt state */
@ -684,7 +686,6 @@ static inline void s32k1xx_disableuartint(struct s32k1xx_uart_s *priv,
regval &= ~LPUART_ALL_INTS; regval &= ~LPUART_ALL_INTS;
s32k1xx_serialout(priv, S32K1XX_LPUART_CTRL_OFFSET, regval); s32k1xx_serialout(priv, S32K1XX_LPUART_CTRL_OFFSET, regval);
spin_unlock_irqrestore(NULL, flags);
} }
/**************************************************************************** /****************************************************************************
@ -694,19 +695,16 @@ static inline void s32k1xx_disableuartint(struct s32k1xx_uart_s *priv,
static inline void s32k1xx_restoreuartint(struct s32k1xx_uart_s *priv, static inline void s32k1xx_restoreuartint(struct s32k1xx_uart_s *priv,
uint32_t ie) uint32_t ie)
{ {
irqstate_t flags;
uint32_t regval; uint32_t regval;
/* Enable/disable any interrupts that are currently disabled but should be /* Enable/disable any interrupts that are currently disabled but should be
* enabled/disabled. * enabled/disabled.
*/ */
flags = spin_lock_irqsave(NULL);
regval = s32k1xx_serialin(priv, S32K1XX_LPUART_CTRL_OFFSET); regval = s32k1xx_serialin(priv, S32K1XX_LPUART_CTRL_OFFSET);
regval &= ~LPUART_ALL_INTS; regval &= ~LPUART_ALL_INTS;
regval |= ie; regval |= ie;
s32k1xx_serialout(priv, S32K1XX_LPUART_CTRL_OFFSET, regval); s32k1xx_serialout(priv, S32K1XX_LPUART_CTRL_OFFSET, regval);
spin_unlock_irqrestore(NULL, flags);
} }
/**************************************************************************** /****************************************************************************
@ -1329,7 +1327,7 @@ static int s32k1xx_ioctl(struct file *filep, int cmd, unsigned long arg)
* implement TCSADRAIN / TCSAFLUSH * implement TCSADRAIN / TCSAFLUSH
*/ */
flags = spin_lock_irqsave(NULL); flags = spin_lock_irqsave(&priv->lock);
s32k1xx_disableuartint(priv, &ie); s32k1xx_disableuartint(priv, &ie);
ret = dev->ops->setup(dev); ret = dev->ops->setup(dev);
@ -1337,7 +1335,7 @@ static int s32k1xx_ioctl(struct file *filep, int cmd, unsigned long arg)
s32k1xx_restoreuartint(priv, ie); s32k1xx_restoreuartint(priv, ie);
priv->ie = ie; priv->ie = ie;
spin_unlock_irqrestore(NULL, flags); spin_unlock_irqrestore(&priv->lock, flags);
} }
} }
break; break;
@ -1351,7 +1349,7 @@ static int s32k1xx_ioctl(struct file *filep, int cmd, unsigned long arg)
uint32_t regval; uint32_t regval;
struct s32k1xx_uart_s *priv = (struct s32k1xx_uart_s *)dev->priv; struct s32k1xx_uart_s *priv = (struct s32k1xx_uart_s *)dev->priv;
flags = spin_lock_irqsave(NULL); flags = spin_lock_irqsave(&priv->lock);
ctrl = s32k1xx_serialin(priv, S32K1XX_LPUART_CTRL_OFFSET); ctrl = s32k1xx_serialin(priv, S32K1XX_LPUART_CTRL_OFFSET);
stat = s32k1xx_serialin(priv, S32K1XX_LPUART_STAT_OFFSET); stat = s32k1xx_serialin(priv, S32K1XX_LPUART_STAT_OFFSET);
regval = ctrl; regval = ctrl;
@ -1387,7 +1385,7 @@ static int s32k1xx_ioctl(struct file *filep, int cmd, unsigned long arg)
s32k1xx_serialout(priv, S32K1XX_LPUART_STAT_OFFSET, stat); s32k1xx_serialout(priv, S32K1XX_LPUART_STAT_OFFSET, stat);
s32k1xx_serialout(priv, S32K1XX_LPUART_CTRL_OFFSET, ctrl); s32k1xx_serialout(priv, S32K1XX_LPUART_CTRL_OFFSET, ctrl);
spin_unlock_irqrestore(NULL, flags); spin_unlock_irqrestore(&priv->lock, flags);
} }
break; break;
#endif #endif
@ -1441,7 +1439,7 @@ static void s32k1xx_rxint(struct uart_dev_s *dev, bool enable)
/* Enable interrupts for data available at Rx */ /* Enable interrupts for data available at Rx */
flags = spin_lock_irqsave(NULL); flags = spin_lock_irqsave(&priv->lock);
if (enable) if (enable)
{ {
#ifndef CONFIG_SUPPRESS_SERIAL_INTS #ifndef CONFIG_SUPPRESS_SERIAL_INTS
@ -1457,7 +1455,7 @@ static void s32k1xx_rxint(struct uart_dev_s *dev, bool enable)
regval &= ~LPUART_ALL_INTS; regval &= ~LPUART_ALL_INTS;
regval |= priv->ie; regval |= priv->ie;
s32k1xx_serialout(priv, S32K1XX_LPUART_CTRL_OFFSET, regval); s32k1xx_serialout(priv, S32K1XX_LPUART_CTRL_OFFSET, regval);
spin_unlock_irqrestore(NULL, flags); spin_unlock_irqrestore(&priv->lock, flags);
} }
#endif #endif
@ -1890,7 +1888,7 @@ static void s32k1xx_txint(struct uart_dev_s *dev, bool enable)
/* Enable interrupt for TX complete */ /* Enable interrupt for TX complete */
flags = spin_lock_irqsave(NULL); flags = spin_lock_irqsave(&priv->lock);
if (enable) if (enable)
{ {
#ifndef CONFIG_SUPPRESS_SERIAL_INTS #ifndef CONFIG_SUPPRESS_SERIAL_INTS
@ -1906,7 +1904,7 @@ static void s32k1xx_txint(struct uart_dev_s *dev, bool enable)
regval &= ~LPUART_ALL_INTS; regval &= ~LPUART_ALL_INTS;
regval |= priv->ie; regval |= priv->ie;
s32k1xx_serialout(priv, S32K1XX_LPUART_CTRL_OFFSET, regval); s32k1xx_serialout(priv, S32K1XX_LPUART_CTRL_OFFSET, regval);
spin_unlock_irqrestore(NULL, flags); spin_unlock_irqrestore(&priv->lock, flags);
} }
#endif #endif
@ -2549,11 +2547,14 @@ void up_putc(int ch)
#ifdef CONSOLE_DEV #ifdef CONSOLE_DEV
struct s32k1xx_uart_s *priv = struct s32k1xx_uart_s *priv =
(struct s32k1xx_uart_s *)CONSOLE_DEV.dev.priv; (struct s32k1xx_uart_s *)CONSOLE_DEV.dev.priv;
irqstate_t flags;
uint32_t ie; uint32_t ie;
flags = spin_lock_irqsave(&priv->lock);
s32k1xx_disableuartint(priv, &ie); s32k1xx_disableuartint(priv, &ie);
s32k1xx_lowputc(ch); s32k1xx_lowputc(ch);
s32k1xx_restoreuartint(priv, ie); s32k1xx_restoreuartint(priv, ie);
spin_unlock_irqrestore(&priv->lock, flags);
#endif #endif
} }