Skip to contentSkip to conversation

Bunch of serial warnings in next at least with omap-serial

PATCH Peter Hurley 2 participants 2 messages May 3, 2016 1 message not in the archive TTY layer and serial drivers

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

Hi Tony,

Quoted 6 lines · Tony Lindgren

Hi Peter,

Looks like probably commit 4047b37122d1 ("serial: core: Prevent unsafe uart port access, part 1") in Linux next causes tons of warnings with at least omap-serial. It does not revert cleanly I have not tested with that reverted. Any ideas? Dmesg output of the errors below.

Thanks for the report.
Patch below should fix that.

--- >% ---
Subject: [PATCH] serial: core: Fix port mutex assert if lockdep disabled

commit 4047b37122d1 ("serial: core: Prevent unsafe uart port access, part 1") added lockdep assertion for port mutex but fails to check if debug_locks has disabled lockdep (so lock state is no longer reliable).

Use lockdep_assert_held() instead, which properly checks lockdep state as well.

---
 drivers/tty/serial/serial_core.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/tty/serial/serial_core.c +1 -3
index 0e66923..b88a054 100644
@@ -95,9 +95,7 @@ static inline void uart_port_deref(struct uart_port *uport)
 
 static inline struct uart_port *uart_port_check(struct uart_state *state)
 {
-#ifdef CONFIG_LOCKDEP
-	WARN_ON(!lockdep_is_held(&state->port.mutex));
-#endif
+	lockdep_assert_held(&state->port.mutex);
 	return state->uart_port;
 }
 
Signature · 1 line
2.8.2
Tested-by
#2 lore raw
Quoted 5 lines · Peter Hurley

Hi Tony,

Quoted 2 lines · Tony Lindgren

Hi Peter,

Quoted 7 lines
Quoted 4 lines

Looks like probably commit 4047b37122d1 ("serial: core: Prevent unsafe uart port access, part 1") in Linux next causes tons of warnings with at least omap-serial. It does not revert cleanly I have not tested with that reverted. Any ideas? Dmesg output of the errors below.

Thanks for the report.
Patch below should fix that.

Yes thanks that fixes it: