Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-28 11:56:10 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

imxrt_serial: use small lock in arch/arm/src/imxrt/imxrt_serial.c

Browse Source 
Signed-off-by: hujun5 <hujun5@xiaomi.com>
This commit is contained in:
hujun5
2024-11-29 20:44:52 +08:00
committed by Xiang Xiao
parent 0bdc9d24ab
commit 30940d9251
1 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/imxrt/imxrt_serial.c
+31 -18
View File
@@ -730,6 +730,7 @@ struct imxrt_uart_s
struct uart_dev_s dev; /* Generic UART device */ struct uart_dev_s dev; /* Generic UART device */
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 */
spinlock_t lock; /* Spinlock */
uint32_t ie; /* Saved enabled interrupts */ uint32_t ie; /* Saved enabled interrupts */
uint8_t irq; /* IRQ associated with this UART */ uint8_t irq; /* IRQ associated with this UART */
uint8_t parity; /* 0=none, 1=odd, 2=even */ uint8_t parity; /* 0=none, 1=odd, 2=even */
@@ -1145,6 +1146,7 @@ static struct imxrt_uart_s g_lpuart1priv =
.uartbase = IMXRT_LPUART1_BASE, .uartbase = IMXRT_LPUART1_BASE,
.baud = CONFIG_LPUART1_BAUD, .baud = CONFIG_LPUART1_BAUD,
.lock = SP_UNLOCKED,
.irq = IMXRT_IRQ_LPUART1, .irq = IMXRT_IRQ_LPUART1,
.parity = CONFIG_LPUART1_PARITY, .parity = CONFIG_LPUART1_PARITY,
.bits = CONFIG_LPUART1_BITS, .bits = CONFIG_LPUART1_BITS,
@@ -1214,6 +1216,7 @@ static struct imxrt_uart_s g_lpuart2priv =
.uartbase = IMXRT_LPUART2_BASE, .uartbase = IMXRT_LPUART2_BASE,
.baud = CONFIG_LPUART2_BAUD, .baud = CONFIG_LPUART2_BAUD,
.lock = SP_UNLOCKED,
.irq = IMXRT_IRQ_LPUART2, .irq = IMXRT_IRQ_LPUART2,
.parity = CONFIG_LPUART2_PARITY, .parity = CONFIG_LPUART2_PARITY,
.bits = CONFIG_LPUART2_BITS, .bits = CONFIG_LPUART2_BITS,
@@ -1280,6 +1283,7 @@ static struct imxrt_uart_s g_lpuart3priv =
.uartbase = IMXRT_LPUART3_BASE, .uartbase = IMXRT_LPUART3_BASE,
.baud = CONFIG_LPUART3_BAUD, .baud = CONFIG_LPUART3_BAUD,
.lock = SP_UNLOCKED,
.irq = IMXRT_IRQ_LPUART3, .irq = IMXRT_IRQ_LPUART3,
.parity = CONFIG_LPUART3_PARITY, .parity = CONFIG_LPUART3_PARITY,
.bits = CONFIG_LPUART3_BITS, .bits = CONFIG_LPUART3_BITS,
@@ -1346,6 +1350,7 @@ static struct imxrt_uart_s g_lpuart4priv =
.uartbase = IMXRT_LPUART4_BASE, .uartbase = IMXRT_LPUART4_BASE,
.baud = CONFIG_LPUART4_BAUD, .baud = CONFIG_LPUART4_BAUD,
.lock = SP_UNLOCKED,
.irq = IMXRT_IRQ_LPUART4, .irq = IMXRT_IRQ_LPUART4,
.parity = CONFIG_LPUART4_PARITY, .parity = CONFIG_LPUART4_PARITY,
.bits = CONFIG_LPUART4_BITS, .bits = CONFIG_LPUART4_BITS,
@@ -1412,6 +1417,7 @@ static struct imxrt_uart_s g_lpuart5priv =
.uartbase = IMXRT_LPUART5_BASE, .uartbase = IMXRT_LPUART5_BASE,
.baud = CONFIG_LPUART5_BAUD, .baud = CONFIG_LPUART5_BAUD,
.lock = SP_UNLOCKED,
.irq = IMXRT_IRQ_LPUART5, .irq = IMXRT_IRQ_LPUART5,
.parity = CONFIG_LPUART5_PARITY, .parity = CONFIG_LPUART5_PARITY,
.bits = CONFIG_LPUART5_BITS, .bits = CONFIG_LPUART5_BITS,
@@ -1478,6 +1484,7 @@ static struct imxrt_uart_s g_lpuart6priv =
.uartbase = IMXRT_LPUART6_BASE, .uartbase = IMXRT_LPUART6_BASE,
.baud = CONFIG_LPUART6_BAUD, .baud = CONFIG_LPUART6_BAUD,
.lock = SP_UNLOCKED,
.irq = IMXRT_IRQ_LPUART6, .irq = IMXRT_IRQ_LPUART6,
.parity = CONFIG_LPUART6_PARITY, .parity = CONFIG_LPUART6_PARITY,
.bits = CONFIG_LPUART6_BITS, .bits = CONFIG_LPUART6_BITS,
@@ -1544,6 +1551,7 @@ static struct imxrt_uart_s g_lpuart7priv =
.uartbase = IMXRT_LPUART7_BASE, .uartbase = IMXRT_LPUART7_BASE,
.baud = CONFIG_LPUART7_BAUD, .baud = CONFIG_LPUART7_BAUD,
.lock = SP_UNLOCKED,
.irq = IMXRT_IRQ_LPUART7, .irq = IMXRT_IRQ_LPUART7,
.parity = CONFIG_LPUART7_PARITY, .parity = CONFIG_LPUART7_PARITY,
.bits = CONFIG_LPUART7_BITS, .bits = CONFIG_LPUART7_BITS,
@@ -1610,6 +1618,7 @@ static struct imxrt_uart_s g_lpuart8priv =
.uartbase = IMXRT_LPUART8_BASE, .uartbase = IMXRT_LPUART8_BASE,
.baud = CONFIG_LPUART8_BAUD, .baud = CONFIG_LPUART8_BAUD,
.lock = SP_UNLOCKED,
.irq = IMXRT_IRQ_LPUART8, .irq = IMXRT_IRQ_LPUART8,
.parity = CONFIG_LPUART8_PARITY, .parity = CONFIG_LPUART8_PARITY,
.bits = CONFIG_LPUART8_BITS, .bits = CONFIG_LPUART8_BITS,
@@ -1676,6 +1685,7 @@ static struct imxrt_uart_s g_lpuart9priv =
.uartbase = IMXRT_LPUART9_BASE, .uartbase = IMXRT_LPUART9_BASE,
.baud = CONFIG_LPUART9_BAUD, .baud = CONFIG_LPUART9_BAUD,
.lock = SP_UNLOCKED,
.irq = IMXRT_IRQ_LPUART9, .irq = IMXRT_IRQ_LPUART9,
.parity = CONFIG_LPUART9_PARITY, .parity = CONFIG_LPUART9_PARITY,
.bits = CONFIG_LPUART9_BITS, .bits = CONFIG_LPUART9_BITS,
@@ -1742,6 +1752,7 @@ static struct imxrt_uart_s g_lpuart10priv =
.uartbase = IMXRT_LPUART10_BASE, .uartbase = IMXRT_LPUART10_BASE,
.baud = CONFIG_LPUART10_BAUD, .baud = CONFIG_LPUART10_BAUD,
.lock = SP_UNLOCKED,
.irq = IMXRT_IRQ_LPUART10, .irq = IMXRT_IRQ_LPUART10,
.parity = CONFIG_LPUART10_PARITY, .parity = CONFIG_LPUART10_PARITY,
.bits = CONFIG_LPUART10_BITS, .bits = CONFIG_LPUART10_BITS,
@@ -1808,6 +1819,7 @@ static struct imxrt_uart_s g_lpuart11priv =
.uartbase = IMXRT_LPUART11_BASE, .uartbase = IMXRT_LPUART11_BASE,
.baud = CONFIG_LPUART11_BAUD, .baud = CONFIG_LPUART11_BAUD,
.lock = SP_UNLOCKED,
.irq = IMXRT_IRQ_LPUART11, .irq = IMXRT_IRQ_LPUART11,
.parity = CONFIG_LPUART11_PARITY, .parity = CONFIG_LPUART11_PARITY,
.bits = CONFIG_LPUART11_BITS, .bits = CONFIG_LPUART11_BITS,
@@ -1874,6 +1886,7 @@ static struct imxrt_uart_s g_lpuart12priv =
.uartbase = IMXRT_LPUART12_BASE, .uartbase = IMXRT_LPUART12_BASE,
.baud = CONFIG_LPUART12_BAUD, .baud = CONFIG_LPUART12_BAUD,
.lock = SP_UNLOCKED,
.irq = IMXRT_IRQ_LPUART12, .irq = IMXRT_IRQ_LPUART12,
.parity = CONFIG_LPUART12_PARITY, .parity = CONFIG_LPUART12_PARITY,
.bits = CONFIG_LPUART12_BITS, .bits = CONFIG_LPUART12_BITS,
@@ -1973,7 +1986,7 @@ static inline void imxrt_disableuartint(struct imxrt_uart_s *priv,
irqstate_t flags; irqstate_t flags;
uint32_t regval; uint32_t regval;
flags = spin_lock_irqsave(NULL); flags = spin_lock_irqsave(&priv->lock);
regval = imxrt_serialin(priv, IMXRT_LPUART_CTRL_OFFSET); regval = imxrt_serialin(priv, IMXRT_LPUART_CTRL_OFFSET);
/* Return the current Rx and Tx interrupt state */ /* Return the current Rx and Tx interrupt state */
@@ -1985,7 +1998,7 @@ static inline void imxrt_disableuartint(struct imxrt_uart_s *priv,
regval &= ~LPUART_ALL_INTS; regval &= ~LPUART_ALL_INTS;
imxrt_serialout(priv, IMXRT_LPUART_CTRL_OFFSET, regval); imxrt_serialout(priv, IMXRT_LPUART_CTRL_OFFSET, regval);
spin_unlock_irqrestore(NULL, flags); spin_unlock_irqrestore(&priv->lock, flags);
} }
#endif #endif
@@ -2004,12 +2017,12 @@ static inline void imxrt_restoreuartint(struct imxrt_uart_s *priv,
* enabled/disabled. * enabled/disabled.
*/ */
flags = spin_lock_irqsave(NULL); flags = spin_lock_irqsave(&priv->lock);
regval = imxrt_serialin(priv, IMXRT_LPUART_CTRL_OFFSET); regval = imxrt_serialin(priv, IMXRT_LPUART_CTRL_OFFSET);
regval &= ~LPUART_ALL_INTS; regval &= ~LPUART_ALL_INTS;
regval |= ie; regval |= ie;
imxrt_serialout(priv, IMXRT_LPUART_CTRL_OFFSET, regval); imxrt_serialout(priv, IMXRT_LPUART_CTRL_OFFSET, regval);
spin_unlock_irqrestore(NULL, flags); spin_unlock_irqrestore(&priv->lock, flags);
} }
#endif #endif
@@ -2631,7 +2644,7 @@ static int imxrt_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);
imxrt_disableuartint(priv, &ie); imxrt_disableuartint(priv, &ie);
ret = dev->ops->setup(dev); ret = dev->ops->setup(dev);
@@ -2639,7 +2652,7 @@ static int imxrt_ioctl(struct file *filep, int cmd, unsigned long arg)
imxrt_restoreuartint(priv, ie); imxrt_restoreuartint(priv, ie);
priv->ie = ie; priv->ie = ie;
spin_unlock_irqrestore(NULL, flags); spin_unlock_irqrestore(&priv->lock, flags);
} }
} }
break; break;
@@ -2652,7 +2665,7 @@ static int imxrt_ioctl(struct file *filep, int cmd, unsigned long arg)
irqstate_t flags; irqstate_t flags;
struct imxrt_uart_s *priv = (struct imxrt_uart_s *)dev; struct imxrt_uart_s *priv = (struct imxrt_uart_s *)dev;
flags = spin_lock_irqsave(NULL); flags = spin_lock_irqsave(&priv->lock);
regval = imxrt_serialin(priv, IMXRT_LPUART_CTRL_OFFSET); regval = imxrt_serialin(priv, IMXRT_LPUART_CTRL_OFFSET);
if ((arg & SER_SINGLEWIRE_ENABLED) != 0) if ((arg & SER_SINGLEWIRE_ENABLED) != 0)
@@ -2686,7 +2699,7 @@ static int imxrt_ioctl(struct file *filep, int cmd, unsigned long arg)
imxrt_serialout(priv, IMXRT_LPUART_CTRL_OFFSET, regval); imxrt_serialout(priv, IMXRT_LPUART_CTRL_OFFSET, regval);
spin_unlock_irqrestore(NULL, flags); spin_unlock_irqrestore(&priv->lock, flags);
} }
break; break;
#endif #endif
@@ -2700,7 +2713,7 @@ static int imxrt_ioctl(struct file *filep, int cmd, unsigned long arg)
irqstate_t flags; irqstate_t flags;
struct imxrt_uart_s *priv = (struct imxrt_uart_s *)dev; struct imxrt_uart_s *priv = (struct imxrt_uart_s *)dev;
flags = spin_lock_irqsave(NULL); flags = spin_lock_irqsave(&priv->lock);
ctrl = imxrt_serialin(priv, IMXRT_LPUART_CTRL_OFFSET); ctrl = imxrt_serialin(priv, IMXRT_LPUART_CTRL_OFFSET);
stat = imxrt_serialin(priv, IMXRT_LPUART_STAT_OFFSET); stat = imxrt_serialin(priv, IMXRT_LPUART_STAT_OFFSET);
regval = ctrl; regval = ctrl;
@@ -2736,7 +2749,7 @@ static int imxrt_ioctl(struct file *filep, int cmd, unsigned long arg)
imxrt_serialout(priv, IMXRT_LPUART_STAT_OFFSET, stat); imxrt_serialout(priv, IMXRT_LPUART_STAT_OFFSET, stat);
imxrt_serialout(priv, IMXRT_LPUART_CTRL_OFFSET, ctrl); imxrt_serialout(priv, IMXRT_LPUART_CTRL_OFFSET, ctrl);
spin_unlock_irqrestore(NULL, flags); spin_unlock_irqrestore(&priv->lock, flags);
} }
break; break;
#endif #endif
@@ -2790,7 +2803,7 @@ static void imxrt_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
@@ -2806,7 +2819,7 @@ static void imxrt_rxint(struct uart_dev_s *dev, bool enable)
regval &= ~LPUART_ALL_INTS; regval &= ~LPUART_ALL_INTS;
regval |= priv->ie; regval |= priv->ie;
imxrt_serialout(priv, IMXRT_LPUART_CTRL_OFFSET, regval); imxrt_serialout(priv, IMXRT_LPUART_CTRL_OFFSET, regval);
spin_unlock_irqrestore(NULL, flags); spin_unlock_irqrestore(&priv->lock, flags);
} }
#endif #endif
@@ -3258,12 +3271,12 @@ static void imxrt_singlewire_send(struct uart_dev_s *dev, int ch)
uint32_t regval; uint32_t regval;
irqstate_t flags; irqstate_t flags;
flags = spin_lock_irqsave(NULL); flags = spin_lock_irqsave(&priv->lock);
regval = imxrt_serialin(priv, IMXRT_LPUART_CTRL_OFFSET); regval = imxrt_serialin(priv, IMXRT_LPUART_CTRL_OFFSET);
regval &= ~(LPUART_CTRL_RSRC); regval &= ~(LPUART_CTRL_RSRC);
regval |= (LPUART_CTRL_TXDIR); regval |= (LPUART_CTRL_TXDIR);
imxrt_serialout(priv, IMXRT_LPUART_CTRL_OFFSET, regval); imxrt_serialout(priv, IMXRT_LPUART_CTRL_OFFSET, regval);
spin_unlock_irqrestore(NULL, flags); spin_unlock_irqrestore(&priv->lock, flags);
imxrt_serialout(priv, IMXRT_LPUART_DATA_OFFSET, (uint32_t)ch); imxrt_serialout(priv, IMXRT_LPUART_DATA_OFFSET, (uint32_t)ch);
} }
@@ -3323,7 +3336,7 @@ static void imxrt_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
@@ -3339,7 +3352,7 @@ static void imxrt_txint(struct uart_dev_s *dev, bool enable)
regval &= ~LPUART_ALL_INTS; regval &= ~LPUART_ALL_INTS;
regval |= priv->ie; regval |= priv->ie;
imxrt_serialout(priv, IMXRT_LPUART_CTRL_OFFSET, regval); imxrt_serialout(priv, IMXRT_LPUART_CTRL_OFFSET, regval);
spin_unlock_irqrestore(NULL, flags); spin_unlock_irqrestore(&priv->lock, flags);
} }
#endif #endif
@@ -3360,7 +3373,7 @@ static void imxrt_singlewire_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);
regval = imxrt_serialin(priv, IMXRT_LPUART_CTRL_OFFSET); regval = imxrt_serialin(priv, IMXRT_LPUART_CTRL_OFFSET);
if (enable) if (enable)
{ {
@@ -3384,7 +3397,7 @@ static void imxrt_singlewire_txint(struct uart_dev_s *dev, bool enable)
regval |= priv->ie; regval |= priv->ie;
imxrt_serialout(priv, IMXRT_LPUART_CTRL_OFFSET, regval); imxrt_serialout(priv, IMXRT_LPUART_CTRL_OFFSET, regval);
spin_unlock_irqrestore(NULL, flags); spin_unlock_irqrestore(&priv->lock, flags);
} }
#endif #endif