2011-02-01 07:31:24

by Thomas Weber

[permalink] [raw]
Subject: [PATCHv4] OMAP: Enable Magic SysRq on serial console ttyOx

Magic SysRq key is not working for OMAP on new serial
console ttyOx because SUPPORT_SYSRQ is not defined
for omap-serial.

This patch defines SUPPORT_SYSRQ in omap-serial and
enables handling of Magic SysRq character.

Further there is an issue of losing first break character.
Removing the reset of the lsr_break_flag fixes this issue.

Signed-off-by: Thomas Weber <[email protected]>
Acked-by: Govindraj.R <[email protected]>
Tested-by: Manjunath G Kondaiah <[email protected]>
Acked-by: Kevin Hilman <[email protected]>
---
v3->v4
Rebased to 2.6.38-rc2 after move of drivers/serial to drivers/tty/serial
Added Acked-by and Tested-by

drivers/tty/serial/omap-serial.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index 7f2f010..699b344 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -20,6 +20,10 @@
* this driver as required for the omap-platform.
*/

+#if defined(CONFIG_SERIAL_OMAP_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#define SUPPORT_SYSRQ
+#endif
+
#include <linux/module.h>
#include <linux/init.h>
#include <linux/console.h>
@@ -190,7 +194,6 @@ static inline void receive_chars(struct uart_omap_port *up, int *status)
if (up->port.line == up->port.cons->index) {
/* Recover the break flag from console xmit */
lsr |= up->lsr_break_flag;
- up->lsr_break_flag = 0;
}
#endif
if (lsr & UART_LSR_BI)
--
1.7.4.rc3


2011-02-01 22:24:11

by Greg KH

[permalink] [raw]
Subject: Re: [PATCHv4] OMAP: Enable Magic SysRq on serial console ttyOx

On Tue, Feb 01, 2011 at 08:31:30AM -0800, Kevin Hilman wrote:
> Thomas Weber <[email protected]> writes:
>
> > Magic SysRq key is not working for OMAP on new serial
> > console ttyOx because SUPPORT_SYSRQ is not defined
> > for omap-serial.
> >
> > This patch defines SUPPORT_SYSRQ in omap-serial and
> > enables handling of Magic SysRq character.
> >
> > Further there is an issue of losing first break character.
> > Removing the reset of the lsr_break_flag fixes this issue.
> >
> > Signed-off-by: Thomas Weber <[email protected]>
> > Acked-by: Govindraj.R <[email protected]>
> > Tested-by: Manjunath G Kondaiah <[email protected]>
> > Acked-by: Kevin Hilman <[email protected]>
>
> Greg,
>
> Will you be taking this? If you prefer, we can take it via OMAP tree
> with your ack.

I can take it if it's not a problem for you. Or if you want to, please
add:
Acked-by: Greg Kroah-Hartman <[email protected]>
to the patch.

Let me know which is easier for you.

thanks,

greg k-h

2011-02-01 23:10:45

by Kevin Hilman

[permalink] [raw]
Subject: Re: [PATCHv4] OMAP: Enable Magic SysRq on serial console ttyOx

Greg KH <[email protected]> writes:

> On Tue, Feb 01, 2011 at 08:31:30AM -0800, Kevin Hilman wrote:
>> Thomas Weber <[email protected]> writes:
>>
>> > Magic SysRq key is not working for OMAP on new serial
>> > console ttyOx because SUPPORT_SYSRQ is not defined
>> > for omap-serial.
>> >
>> > This patch defines SUPPORT_SYSRQ in omap-serial and
>> > enables handling of Magic SysRq character.
>> >
>> > Further there is an issue of losing first break character.
>> > Removing the reset of the lsr_break_flag fixes this issue.
>> >
>> > Signed-off-by: Thomas Weber <[email protected]>
>> > Acked-by: Govindraj.R <[email protected]>
>> > Tested-by: Manjunath G Kondaiah <[email protected]>
>> > Acked-by: Kevin Hilman <[email protected]>
>>
>> Greg,
>>
>> Will you be taking this? If you prefer, we can take it via OMAP tree
>> with your ack.
>
> I can take it if it's not a problem for you. Or if you want to, please
> add:
> Acked-by: Greg Kroah-Hartman <[email protected]>
> to the patch.
>
> Let me know which is easier for you.

Since there are no dependencies on arch/arm/*omap*, you can merge it.

Thanks,

Kevin

2011-02-02 00:24:26

by Greg KH

[permalink] [raw]
Subject: Re: [PATCHv4] OMAP: Enable Magic SysRq on serial console ttyOx

On Tue, Feb 01, 2011 at 03:10:40PM -0800, Kevin Hilman wrote:
> Greg KH <[email protected]> writes:
>
> > On Tue, Feb 01, 2011 at 08:31:30AM -0800, Kevin Hilman wrote:
> >> Thomas Weber <[email protected]> writes:
> >>
> >> > Magic SysRq key is not working for OMAP on new serial
> >> > console ttyOx because SUPPORT_SYSRQ is not defined
> >> > for omap-serial.
> >> >
> >> > This patch defines SUPPORT_SYSRQ in omap-serial and
> >> > enables handling of Magic SysRq character.
> >> >
> >> > Further there is an issue of losing first break character.
> >> > Removing the reset of the lsr_break_flag fixes this issue.
> >> >
> >> > Signed-off-by: Thomas Weber <[email protected]>
> >> > Acked-by: Govindraj.R <[email protected]>
> >> > Tested-by: Manjunath G Kondaiah <[email protected]>
> >> > Acked-by: Kevin Hilman <[email protected]>
> >>
> >> Greg,
> >>
> >> Will you be taking this? If you prefer, we can take it via OMAP tree
> >> with your ack.
> >
> > I can take it if it's not a problem for you. Or if you want to, please
> > add:
> > Acked-by: Greg Kroah-Hartman <[email protected]>
> > to the patch.
> >
> > Let me know which is easier for you.
>
> Since there are no dependencies on arch/arm/*omap*, you can merge it.

Ok, will do.

thanks,

greg k-h