Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge tag 'tty-4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty/serial driver fix from Greg KH:
"Here's a single 8250 serial driver that fixes a reported deadlock with
the serial console and the tty driver.
It's been in linux-next for a while now"
* tag 'tty-4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
serial: 8250_dw: Fix deadlock in LCR workaround
+12
-3
drivers/tty/serial/8250/8250_dw.c
+12
-3
drivers/tty/serial/8250/8250_dw.c
···
119
dw8250_force_idle(p);
120
writeb(value, p->membase + (UART_LCR << p->regshift));
121
}
122
-
dev_err(p->dev, "Couldn't set LCR to %d\n", value);
123
}
124
}
125
···
166
__raw_writeq(value & 0xff,
167
p->membase + (UART_LCR << p->regshift));
168
}
169
-
dev_err(p->dev, "Couldn't set LCR to %d\n", value);
170
}
171
}
172
#endif /* CONFIG_64BIT */
···
193
dw8250_force_idle(p);
194
writel(value, p->membase + (UART_LCR << p->regshift));
195
}
196
-
dev_err(p->dev, "Couldn't set LCR to %d\n", value);
197
}
198
}
199
···
119
dw8250_force_idle(p);
120
writeb(value, p->membase + (UART_LCR << p->regshift));
121
}
122
+
/*
123
+
* FIXME: this deadlocks if port->lock is already held
124
+
* dev_err(p->dev, "Couldn't set LCR to %d\n", value);
125
+
*/
126
}
127
}
128
···
163
__raw_writeq(value & 0xff,
164
p->membase + (UART_LCR << p->regshift));
165
}
166
+
/*
167
+
* FIXME: this deadlocks if port->lock is already held
168
+
* dev_err(p->dev, "Couldn't set LCR to %d\n", value);
169
+
*/
170
}
171
}
172
#endif /* CONFIG_64BIT */
···
187
dw8250_force_idle(p);
188
writel(value, p->membase + (UART_LCR << p->regshift));
189
}
190
+
/*
191
+
* FIXME: this deadlocks if port->lock is already held
192
+
* dev_err(p->dev, "Couldn't set LCR to %d\n", value);
193
+
*/
194
}
195
}
196