Skip to content

arch/arm/gd32f4: fix missing CTL selector bits in up_disableusartint. #19112

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

Open
lccosy wants to merge 2 commits into
base: master
Choose a base branch
from
+27 −5
Open

arch/arm/gd32f4: fix missing CTL selector bits in up_disableusartint. #19112

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4dda730
arch/arm/gd32f4: fix NULL pointer dereference in arm_earlyserialinit.
lccosy Jun 4, 2026
6cd56e5
arch/arm/gd32f4: fix missing CTL selector bits in up_disableusartint.
lccosy Jun 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 27 additions & 5 deletions arch/arm/src/gd32f4/gd32f4xx_serial.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1142,25 +1142,47 @@ static void up_disableusartint(struct up_dev_s *priv, uint32_t *ie)
{
uint32_t ctl;

ctl_ie = 0;

/* Save interrupt in CTL0 register */

ctl = up_serialin(priv, GD32_USART_CTL0_OFFSET);
ctl_ie = ((ctl & USART_CTL0_USED_INTS) >> USART_CFG_CTL0_INT_SHIFT);
if (ctl & USART_CTL0_USED_INTS)
{
ctl_ie |= ((ctl & USART_CTL0_USED_INTS) >>
USART_CFG_CTL0_INT_SHIFT);
ctl_ie |= (USART_CFG_CTL0_INT << USART_CFG_SHIFT);
}

/* Save interrupt in CTL1 register */

ctl = up_serialin(priv, GD32_USART_CTL1_OFFSET);
ctl_ie |= ((ctl & USART_CTL1_USED_INTS) >> USART_CFG_CTL1_INT_SHIFT);
if (ctl & USART_CTL1_USED_INTS)
{
ctl_ie |= ((ctl & USART_CTL1_USED_INTS) >>
USART_CFG_CTL1_INT_SHIFT);
ctl_ie |= (USART_CFG_CTL1_INT << USART_CFG_SHIFT);
}

/* Save interrupt in CTL2 register */

ctl = up_serialin(priv, GD32_USART_CTL2_OFFSET);
ctl_ie |= ((ctl & USART_CTL2_USED_INTS) << USART_CFG_CTL2_INT_SHIFT);
if (ctl & USART_CTL2_USED_INTS)
{
ctl_ie |= ((ctl & USART_CTL2_USED_INTS) <<
USART_CFG_CTL2_INT_SHIFT);
ctl_ie |= (USART_CFG_CTL2_INT << USART_CFG_SHIFT);
}

/* Save interrupt in CTL3 register */

ctl = up_serialin(priv, GD32_USART_CTL3_OFFSET);
ctl_ie |= ((ctl & USART_CTL3_USED_INTS) << USART_CFG_CTL3_INT_SHIFT);
if (ctl & USART_CTL3_USED_INTS)
{
ctl_ie |= ((ctl & USART_CTL3_USED_INTS) <<
USART_CFG_CTL3_INT_SHIFT);
ctl_ie |= (USART_CFG_CTL3_INT << USART_CFG_SHIFT);
}

*ie = ctl_ie;
}
Expand Down Expand Up @@ -2763,7 +2785,7 @@ void arm_earlyserialinit(void)

for (i = 0; i < GD32_NUSART; i++)
{
if (g_uart_devs[i]->priv)
if (g_uart_devs[i] && g_uart_devs[i]->priv)
{
up_disableusartint(g_uart_devs[i]->priv, 0);
}
Expand Down
Loading