History

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

Linus Torvalds committed 11 years ago

Commit b2f45ee2 parents cedd5f6 7fd6f641 file · +12 −3Browse files

Unified · Split

drivers/tty/serial/8250/8250_dw.c+12−3
@@ -119,7 +119,10 @@ static void dw8250_serial_out(struct uart_port *p, int offset, int value) · 118 unmodified lines
119 dw8250_force_idle(p);119 dw8250_force_idle(p);
120 writeb(value, p->membase + (UART_LCR << p->regshift));120 writeb(value, p->membase + (UART_LCR << p->regshift));
121 }121 }
122 dev_err(p->dev, "Couldn't set LCR to %d\n", value);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 */
123 }126 }
124}127}
125 128
@@ -163,7 +166,10 @@ static void dw8250_serial_outq(struct uart_port *p, int offset, int value) · 37 unmodified lines
163 __raw_writeq(value & 0xff,166 __raw_writeq(value & 0xff,
164 p->membase + (UART_LCR << p->regshift));167 p->membase + (UART_LCR << p->regshift));
165 }168 }
166 dev_err(p->dev, "Couldn't set LCR to %d\n", value);169 /*
170 * FIXME: this deadlocks if port->lock is already held
171 * dev_err(p->dev, "Couldn't set LCR to %d\n", value);
172 */
167 }173 }
168}174}
169#endif /* CONFIG_64BIT */175#endif /* CONFIG_64BIT */
@@ -187,7 +193,10 @@ static void dw8250_serial_out32(struct uart_port *p, int offset, int value) · 17 unmodified lines
187 dw8250_force_idle(p);193 dw8250_force_idle(p);
188 writel(value, p->membase + (UART_LCR << p->regshift));194 writel(value, p->membase + (UART_LCR << p->regshift));
189 }195 }
190 dev_err(p->dev, "Couldn't set LCR to %d\n", value);196 /*
197 * FIXME: this deadlocks if port->lock is already held
198 * dev_err(p->dev, "Couldn't set LCR to %d\n", value);
199 */
191 }200 }
192}201}
193 202