Skip to content

Commit 7187ec6

Browse files
Tropicaogregkh
authored andcommitted
serial: mctrl_gpio: split disable_ms into sync and no_sync APIs
[ Upstream commit 1bd2aad ] The following splat has been observed on a SAMA5D27 platform using atmel_serial: BUG: sleeping function called from invalid context at kernel/irq/manage.c:738 in_atomic(): 1, irqs_disabled(): 128, non_block: 0, pid: 27, name: kworker/u5:0 preempt_count: 1, expected: 0 INFO: lockdep is turned off. irq event stamp: 0 hardirqs last enabled at (0): [<00000000>] 0x0 hardirqs last disabled at (0): [<c01588f0>] copy_process+0x1c4c/0x7bec softirqs last enabled at (0): [<c0158944>] copy_process+0x1ca0/0x7bec softirqs last disabled at (0): [<00000000>] 0x0 CPU: 0 UID: 0 PID: 27 Comm: kworker/u5:0 Not tainted 6.13.0-rc7+ torvalds#74 Hardware name: Atmel SAMA5 Workqueue: hci0 hci_power_on [bluetooth] Call trace: unwind_backtrace from show_stack+0x18/0x1c show_stack from dump_stack_lvl+0x44/0x70 dump_stack_lvl from __might_resched+0x38c/0x598 __might_resched from disable_irq+0x1c/0x48 disable_irq from mctrl_gpio_disable_ms+0x74/0xc0 mctrl_gpio_disable_ms from atmel_disable_ms.part.0+0x80/0x1f4 atmel_disable_ms.part.0 from atmel_set_termios+0x764/0x11e8 atmel_set_termios from uart_change_line_settings+0x15c/0x994 uart_change_line_settings from uart_set_termios+0x2b0/0x668 uart_set_termios from tty_set_termios+0x600/0x8ec tty_set_termios from ttyport_set_flow_control+0x188/0x1e0 ttyport_set_flow_control from wilc_setup+0xd0/0x524 [hci_wilc] wilc_setup [hci_wilc] from hci_dev_open_sync+0x330/0x203c [bluetooth] hci_dev_open_sync [bluetooth] from hci_dev_do_open+0x40/0xb0 [bluetooth] hci_dev_do_open [bluetooth] from hci_power_on+0x12c/0x664 [bluetooth] hci_power_on [bluetooth] from process_one_work+0x998/0x1a38 process_one_work from worker_thread+0x6e0/0xfb4 worker_thread from kthread+0x3d4/0x484 kthread from ret_from_fork+0x14/0x28 This warning is emitted when trying to toggle, at the highest level, some flow control (with serdev_device_set_flow_control) in a device driver. At the lowest level, the atmel_serial driver is using serial_mctrl_gpio lib to enable/disable the corresponding IRQs accordingly. The warning emitted by CONFIG_DEBUG_ATOMIC_SLEEP is due to disable_irq (called in mctrl_gpio_disable_ms) being possibly called in some atomic context (some tty drivers perform modem lines configuration in regions protected by port lock). Split mctrl_gpio_disable_ms into two differents APIs, a non-blocking one and a blocking one. Replace mctrl_gpio_disable_ms calls with the relevant version depending on whether the call is protected by some port lock. Suggested-by: Jiri Slaby <jirislaby@kernel.org> Signed-off-by: Alexis Lothoré <alexis.lothore@bootlin.com> Acked-by: Richard Genoud <richard.genoud@bootlin.com> Link: https://lore.kernel.org/r/20250217-atomic_sleep_mctrl_serial_gpio-v3-1-59324b313eef@bootlin.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 18ca68f commit 7187ec6

File tree

8 files changed

+47
-16
lines changed

8 files changed

+47
-16
lines changed

Documentation/driver-api/serial/driver.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,4 +103,4 @@ Some helpers are provided in order to set/get modem control lines via GPIO.
103103
.. kernel-doc:: drivers/tty/serial/serial_mctrl_gpio.c
104104
:identifiers: mctrl_gpio_init mctrl_gpio_free mctrl_gpio_to_gpiod
105105
mctrl_gpio_set mctrl_gpio_get mctrl_gpio_enable_ms
106-
mctrl_gpio_disable_ms
106+
mctrl_gpio_disable_ms_sync mctrl_gpio_disable_ms_no_sync

drivers/tty/serial/8250/8250_port.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1680,7 +1680,7 @@ static void serial8250_disable_ms(struct uart_port *port)
16801680
if (up->bugs & UART_BUG_NOMSR)
16811681
return;
16821682

1683-
mctrl_gpio_disable_ms(up->gpios);
1683+
mctrl_gpio_disable_ms_no_sync(up->gpios);
16841684

16851685
up->ier &= ~UART_IER_MSI;
16861686
serial_port_out(port, UART_IER, up->ier);

drivers/tty/serial/atmel_serial.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -700,7 +700,7 @@ static void atmel_disable_ms(struct uart_port *port)
700700

701701
atmel_port->ms_irq_enabled = false;
702702

703-
mctrl_gpio_disable_ms(atmel_port->gpios);
703+
mctrl_gpio_disable_ms_no_sync(atmel_port->gpios);
704704

705705
if (!mctrl_gpio_to_gpiod(atmel_port->gpios, UART_GPIO_CTS))
706706
idr |= ATMEL_US_CTSIC;

drivers/tty/serial/imx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1608,7 +1608,7 @@ static void imx_uart_shutdown(struct uart_port *port)
16081608
imx_uart_dma_exit(sport);
16091609
}
16101610

1611-
mctrl_gpio_disable_ms(sport->gpios);
1611+
mctrl_gpio_disable_ms_sync(sport->gpios);
16121612

16131613
uart_port_lock_irqsave(&sport->port, &flags);
16141614
ucr2 = imx_uart_readl(sport, UCR2);

drivers/tty/serial/serial_mctrl_gpio.c

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -322,11 +322,7 @@ void mctrl_gpio_enable_ms(struct mctrl_gpios *gpios)
322322
}
323323
EXPORT_SYMBOL_GPL(mctrl_gpio_enable_ms);
324324

325-
/**
326-
* mctrl_gpio_disable_ms - disable irqs and handling of changes to the ms lines
327-
* @gpios: gpios to disable
328-
*/
329-
void mctrl_gpio_disable_ms(struct mctrl_gpios *gpios)
325+
static void mctrl_gpio_disable_ms(struct mctrl_gpios *gpios, bool sync)
330326
{
331327
enum mctrl_gpio_idx i;
332328

@@ -342,10 +338,34 @@ void mctrl_gpio_disable_ms(struct mctrl_gpios *gpios)
342338
if (!gpios->irq[i])
343339
continue;
344340

345-
disable_irq(gpios->irq[i]);
341+
if (sync)
342+
disable_irq(gpios->irq[i]);
343+
else
344+
disable_irq_nosync(gpios->irq[i]);
346345
}
347346
}
348-
EXPORT_SYMBOL_GPL(mctrl_gpio_disable_ms);
347+
348+
/**
349+
* mctrl_gpio_disable_ms_sync - disable irqs and handling of changes to the ms
350+
* lines, and wait for any pending IRQ to be processed
351+
* @gpios: gpios to disable
352+
*/
353+
void mctrl_gpio_disable_ms_sync(struct mctrl_gpios *gpios)
354+
{
355+
mctrl_gpio_disable_ms(gpios, true);
356+
}
357+
EXPORT_SYMBOL_GPL(mctrl_gpio_disable_ms_sync);
358+
359+
/**
360+
* mctrl_gpio_disable_ms_no_sync - disable irqs and handling of changes to the
361+
* ms lines, and return immediately
362+
* @gpios: gpios to disable
363+
*/
364+
void mctrl_gpio_disable_ms_no_sync(struct mctrl_gpios *gpios)
365+
{
366+
mctrl_gpio_disable_ms(gpios, false);
367+
}
368+
EXPORT_SYMBOL_GPL(mctrl_gpio_disable_ms_no_sync);
349369

350370
void mctrl_gpio_enable_irq_wake(struct mctrl_gpios *gpios)
351371
{

drivers/tty/serial/serial_mctrl_gpio.h

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,16 @@ void mctrl_gpio_free(struct device *dev, struct mctrl_gpios *gpios);
8787
void mctrl_gpio_enable_ms(struct mctrl_gpios *gpios);
8888

8989
/*
90-
* Disable gpio interrupts to report status line changes.
90+
* Disable gpio interrupts to report status line changes, and block until
91+
* any corresponding IRQ is processed
9192
*/
92-
void mctrl_gpio_disable_ms(struct mctrl_gpios *gpios);
93+
void mctrl_gpio_disable_ms_sync(struct mctrl_gpios *gpios);
94+
95+
/*
96+
* Disable gpio interrupts to report status line changes, and return
97+
* immediately
98+
*/
99+
void mctrl_gpio_disable_ms_no_sync(struct mctrl_gpios *gpios);
93100

94101
/*
95102
* Enable gpio wakeup interrupts to enable wake up source.
@@ -148,7 +155,11 @@ static inline void mctrl_gpio_enable_ms(struct mctrl_gpios *gpios)
148155
{
149156
}
150157

151-
static inline void mctrl_gpio_disable_ms(struct mctrl_gpios *gpios)
158+
static inline void mctrl_gpio_disable_ms_sync(struct mctrl_gpios *gpios)
159+
{
160+
}
161+
162+
static inline void mctrl_gpio_disable_ms_no_sync(struct mctrl_gpios *gpios)
152163
{
153164
}
154165

drivers/tty/serial/sh-sci.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2298,7 +2298,7 @@ static void sci_shutdown(struct uart_port *port)
22982298
dev_dbg(port->dev, "%s(%d)\n", __func__, port->line);
22992299

23002300
s->autorts = false;
2301-
mctrl_gpio_disable_ms(to_sci_port(port)->gpios);
2301+
mctrl_gpio_disable_ms_sync(to_sci_port(port)->gpios);
23022302

23032303
uart_port_lock_irqsave(port, &flags);
23042304
sci_stop_rx(port);

drivers/tty/serial/stm32-usart.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -944,7 +944,7 @@ static void stm32_usart_enable_ms(struct uart_port *port)
944944

945945
static void stm32_usart_disable_ms(struct uart_port *port)
946946
{
947-
mctrl_gpio_disable_ms(to_stm32_port(port)->gpios);
947+
mctrl_gpio_disable_ms_sync(to_stm32_port(port)->gpios);
948948
}
949949

950950
/* Transmit stop */

0 commit comments

Comments
 (0)