提交 38f8eefc 编写于 作者: J Jason Wessel 提交者: Greg Kroah-Hartman

pmac_zilog,kdb: Fix console poll hook to return instead of loop

kdb <-> kgdb transitioning does not work properly with this UART
driver because the get character routine loops indefinitely as opposed
to returning NO_POLL_CHAR per the expectation of the KDB I/O driver
API.

The symptom is a kernel hang when trying to switch debug modes.

Cc: Alan Cox <alan@linux.intel.com>
Signed-off-by: NJason Wessel <jason.wessel@windriver.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 00592021
...@@ -1348,10 +1348,16 @@ static int pmz_verify_port(struct uart_port *port, struct serial_struct *ser) ...@@ -1348,10 +1348,16 @@ static int pmz_verify_port(struct uart_port *port, struct serial_struct *ser)
static int pmz_poll_get_char(struct uart_port *port) static int pmz_poll_get_char(struct uart_port *port)
{ {
struct uart_pmac_port *uap = (struct uart_pmac_port *)port; struct uart_pmac_port *uap = (struct uart_pmac_port *)port;
int tries = 2;
while ((read_zsreg(uap, R0) & Rx_CH_AV) == 0) while (tries) {
udelay(5); if ((read_zsreg(uap, R0) & Rx_CH_AV) != 0)
return read_zsdata(uap); return read_zsdata(uap);
if (tries--)
udelay(5);
}
return NO_POLL_CHAR;
} }
static void pmz_poll_put_char(struct uart_port *port, unsigned char c) static void pmz_poll_put_char(struct uart_port *port, unsigned char c)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册