|
@@ -670,9 +670,19 @@ serial_pxa_console_write(struct console *co, const char *s, unsigned int count)
|
|
|
{
|
|
|
struct uart_pxa_port *up = serial_pxa_ports[co->index];
|
|
|
unsigned int ier;
|
|
|
+ unsigned long flags;
|
|
|
+ int locked = 1;
|
|
|
|
|
|
clk_prepare_enable(up->clk);
|
|
|
|
|
|
+ local_irq_save(flags);
|
|
|
+ if (up->port.sysrq)
|
|
|
+ locked = 0;
|
|
|
+ else if (oops_in_progress)
|
|
|
+ locked = spin_trylock(&up->port.lock);
|
|
|
+ else
|
|
|
+ spin_lock(&up->port.lock);
|
|
|
+
|
|
|
/*
|
|
|
* First save the IER then disable the interrupts
|
|
|
*/
|
|
@@ -688,6 +698,10 @@ serial_pxa_console_write(struct console *co, const char *s, unsigned int count)
|
|
|
wait_for_xmitr(up);
|
|
|
serial_out(up, UART_IER, ier);
|
|
|
|
|
|
+ if (locked)
|
|
|
+ spin_unlock(&up->port.lock);
|
|
|
+ local_irq_restore(flags);
|
|
|
+
|
|
|
clk_disable_unprepare(up->clk);
|
|
|
}
|
|
|
|