From: Raviteja Narayanam <[email protected]>
[ Upstream commit 42e11948ddf68b9f799cad8c0ddeab0a39da33e8 ]
On some platforms, the log is corrupted while console is being
registered. It is observed that when set_termios is called, there
are still some bytes in the FIFO to be transmitted.
So, wait for tx_empty inside cdns_uart_console_setup before calling
set_termios.
Signed-off-by: Raviteja Narayanam <[email protected]>
Reviewed-by: Shubhrajyoti Datta <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Signed-off-by: Sasha Levin <[email protected]>
---
drivers/tty/serial/xilinx_uartps.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
index eb61a07fcbbc3..07ea71a611678 100644
--- a/drivers/tty/serial/xilinx_uartps.c
+++ b/drivers/tty/serial/xilinx_uartps.c
@@ -1268,6 +1268,7 @@ static int cdns_uart_console_setup(struct console *co, char *options)
int bits = 8;
int parity = 'n';
int flow = 'n';
+ unsigned long time_out;
if (co->index < 0 || co->index >= CDNS_UART_NR_PORTS)
return -EINVAL;
@@ -1281,6 +1282,13 @@ static int cdns_uart_console_setup(struct console *co, char *options)
if (options)
uart_parse_options(options, &baud, &parity, &bits, &flow);
+ /* Wait for tx_empty before setting up the console */
+ time_out = jiffies + usecs_to_jiffies(TX_TIMEOUT);
+
+ while (time_before(jiffies, time_out) &&
+ cdns_uart_tx_empty(port) != TIOCSER_TEMT)
+ cpu_relax();
+
return uart_set_options(port, co, baud, parity, bits, flow);
}
--
2.25.1
On Fri, 18 Sep 2020 at 07:55, Sasha Levin <[email protected]> wrote:
>
> From: Raviteja Narayanam <[email protected]>
>
> [ Upstream commit 42e11948ddf68b9f799cad8c0ddeab0a39da33e8 ]
>
> On some platforms, the log is corrupted while console is being
> registered. It is observed that when set_termios is called, there
> are still some bytes in the FIFO to be transmitted.
>
> So, wait for tx_empty inside cdns_uart_console_setup before calling
> set_termios.
>
> Signed-off-by: Raviteja Narayanam <[email protected]>
> Reviewed-by: Shubhrajyoti Datta <[email protected]>
> Link: https://lore.kernel.org/r/[email protected]
> Signed-off-by: Greg Kroah-Hartman <[email protected]>
> Signed-off-by: Sasha Levin <[email protected]>
stable rc 4.9 arm64 build broken.
drivers/tty/serial/xilinx_uartps.c: In function 'cdns_uart_console_setup':
drivers/tty/serial/xilinx_uartps.c:1286:40: error: 'TX_TIMEOUT'
undeclared (first use in this function); did you mean 'ETIMEDOUT'?
time_out = jiffies + usecs_to_jiffies(TX_TIMEOUT);
^~~~~~~~~~
ETIMEDOUT
drivers/tty/serial/xilinx_uartps.c:1286:40: note: each undeclared
identifier is reported only once for each function it appears in
CC drivers/usb/core/port.o
scripts/Makefile.build:304: recipe for target
'drivers/tty/serial/xilinx_uartps.o' failed
make[5]: *** [drivers/tty/serial/xilinx_uartps.o] Error 1
Reported-by: Naresh Kamboju <[email protected]>
full test log link,
https://ci.linaro.org/view/lkft/job/openembedded-lkft-linux-stable-rc-4.9/DISTRO=lkft,MACHINE=hikey,label=docker-lkft/996/consoleText
> ---
> drivers/tty/serial/xilinx_uartps.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
> index eb61a07fcbbc3..07ea71a611678 100644
> --- a/drivers/tty/serial/xilinx_uartps.c
> +++ b/drivers/tty/serial/xilinx_uartps.c
> @@ -1268,6 +1268,7 @@ static int cdns_uart_console_setup(struct console *co, char *options)
> int bits = 8;
> int parity = 'n';
> int flow = 'n';
> + unsigned long time_out;
>
> if (co->index < 0 || co->index >= CDNS_UART_NR_PORTS)
> return -EINVAL;
> @@ -1281,6 +1282,13 @@ static int cdns_uart_console_setup(struct console *co, char *options)
> if (options)
> uart_parse_options(options, &baud, &parity, &bits, &flow);
>
> + /* Wait for tx_empty before setting up the console */
> + time_out = jiffies + usecs_to_jiffies(TX_TIMEOUT);
> +
> + while (time_before(jiffies, time_out) &&
> + cdns_uart_tx_empty(port) != TIOCSER_TEMT)
> + cpu_relax();
> +
> return uart_set_options(port, co, baud, parity, bits, flow);
> }
>
> --
> 2.25.1
>
--
Linaro LKFT
https://lkft.linaro.org
On Tue, 29 Sep 2020 at 01:41, Naresh Kamboju <[email protected]> wrote:
>
> On Fri, 18 Sep 2020 at 07:55, Sasha Levin <[email protected]> wrote:
> >
> > From: Raviteja Narayanam <[email protected]>
> >
> > [ Upstream commit 42e11948ddf68b9f799cad8c0ddeab0a39da33e8 ]
> >
> > On some platforms, the log is corrupted while console is being
> > registered. It is observed that when set_termios is called, there
> > are still some bytes in the FIFO to be transmitted.
> >
> > So, wait for tx_empty inside cdns_uart_console_setup before calling
> > set_termios.
> >
> > Signed-off-by: Raviteja Narayanam <[email protected]>
> > Reviewed-by: Shubhrajyoti Datta <[email protected]>
> > Link: https://lore.kernel.org/r/[email protected]
> > Signed-off-by: Greg Kroah-Hartman <[email protected]>
> > Signed-off-by: Sasha Levin <[email protected]>
>
> stable rc 4.9 arm64 build broken.
and stable rc 4.9 arm build broken.
>
> drivers/tty/serial/xilinx_uartps.c: In function 'cdns_uart_console_setup':
> drivers/tty/serial/xilinx_uartps.c:1286:40: error: 'TX_TIMEOUT'
> undeclared (first use in this function); did you mean 'ETIMEDOUT'?
> time_out = jiffies + usecs_to_jiffies(TX_TIMEOUT);
> ^~~~~~~~~~
> ETIMEDOUT
> drivers/tty/serial/xilinx_uartps.c:1286:40: note: each undeclared
> identifier is reported only once for each function it appears in
> CC drivers/usb/core/port.o
> scripts/Makefile.build:304: recipe for target
> 'drivers/tty/serial/xilinx_uartps.o' failed
> make[5]: *** [drivers/tty/serial/xilinx_uartps.o] Error 1
>
> Reported-by: Naresh Kamboju <[email protected]>
>
> full test log link,
> https://ci.linaro.org/view/lkft/job/openembedded-lkft-linux-stable-rc-4.9/DISTRO=lkft,MACHINE=hikey,label=docker-lkft/996/consoleText
>
>
> > ---
> > drivers/tty/serial/xilinx_uartps.c | 8 ++++++++
> > 1 file changed, 8 insertions(+)
> >
> > diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
> > index eb61a07fcbbc3..07ea71a611678 100644
> > --- a/drivers/tty/serial/xilinx_uartps.c
> > +++ b/drivers/tty/serial/xilinx_uartps.c
> > @@ -1268,6 +1268,7 @@ static int cdns_uart_console_setup(struct console *co, char *options)
> > int bits = 8;
> > int parity = 'n';
> > int flow = 'n';
> > + unsigned long time_out;
> >
> > if (co->index < 0 || co->index >= CDNS_UART_NR_PORTS)
> > return -EINVAL;
> > @@ -1281,6 +1282,13 @@ static int cdns_uart_console_setup(struct console *co, char *options)
> > if (options)
> > uart_parse_options(options, &baud, &parity, &bits, &flow);
> >
> > + /* Wait for tx_empty before setting up the console */
> > + time_out = jiffies + usecs_to_jiffies(TX_TIMEOUT);
> > +
> > + while (time_before(jiffies, time_out) &&
> > + cdns_uart_tx_empty(port) != TIOCSER_TEMT)
> > + cpu_relax();
> > +
> > return uart_set_options(port, co, baud, parity, bits, flow);
> > }
> >
> > --
> > 2.25.1
> >
>
>
> --
> Linaro LKFT
> https://lkft.linaro.org
On Tue, Sep 29, 2020 at 01:43:22AM +0530, Naresh Kamboju wrote:
> On Tue, 29 Sep 2020 at 01:41, Naresh Kamboju <[email protected]> wrote:
> >
> > On Fri, 18 Sep 2020 at 07:55, Sasha Levin <[email protected]> wrote:
> > >
> > > From: Raviteja Narayanam <[email protected]>
> > >
> > > [ Upstream commit 42e11948ddf68b9f799cad8c0ddeab0a39da33e8 ]
> > >
> > > On some platforms, the log is corrupted while console is being
> > > registered. It is observed that when set_termios is called, there
> > > are still some bytes in the FIFO to be transmitted.
> > >
> > > So, wait for tx_empty inside cdns_uart_console_setup before calling
> > > set_termios.
> > >
> > > Signed-off-by: Raviteja Narayanam <[email protected]>
> > > Reviewed-by: Shubhrajyoti Datta <[email protected]>
> > > Link: https://lore.kernel.org/r/[email protected]
> > > Signed-off-by: Greg Kroah-Hartman <[email protected]>
> > > Signed-off-by: Sasha Levin <[email protected]>
> >
> > stable rc 4.9 arm64 build broken.
>
> and stable rc 4.9 arm build broken.
Thanks, I've queued up the dependant patch, somehow Sasha's builders
must have missed this :)
greg k-h
On Tue, Sep 29, 2020 at 08:59:02AM +0200, Greg Kroah-Hartman wrote:
>On Tue, Sep 29, 2020 at 01:43:22AM +0530, Naresh Kamboju wrote:
>> On Tue, 29 Sep 2020 at 01:41, Naresh Kamboju <[email protected]> wrote:
>> >
>> > On Fri, 18 Sep 2020 at 07:55, Sasha Levin <[email protected]> wrote:
>> > >
>> > > From: Raviteja Narayanam <[email protected]>
>> > >
>> > > [ Upstream commit 42e11948ddf68b9f799cad8c0ddeab0a39da33e8 ]
>> > >
>> > > On some platforms, the log is corrupted while console is being
>> > > registered. It is observed that when set_termios is called, there
>> > > are still some bytes in the FIFO to be transmitted.
>> > >
>> > > So, wait for tx_empty inside cdns_uart_console_setup before calling
>> > > set_termios.
>> > >
>> > > Signed-off-by: Raviteja Narayanam <[email protected]>
>> > > Reviewed-by: Shubhrajyoti Datta <[email protected]>
>> > > Link: https://lore.kernel.org/r/[email protected]
>> > > Signed-off-by: Greg Kroah-Hartman <[email protected]>
>> > > Signed-off-by: Sasha Levin <[email protected]>
>> >
>> > stable rc 4.9 arm64 build broken.
>>
>> and stable rc 4.9 arm build broken.
>
>Thanks, I've queued up the dependant patch, somehow Sasha's builders
>must have missed this :)
Because it doesn't fail here with an allmodconfig :(
sasha@sasha-builder:~/data/linux$ git checkout queue-4.9
HEAD is now at 77d58b1b4d54 kprobes: Fix to check probe enabled before disarm_kprobe_ftrace()
sasha@sasha-builder:~/data/linux$ make ARCH=arm64 CROSS_COMPILE="/home/sasha/x-tools/aarch64-unknown-linux-android/bin/aarch64-unknown-linux-android-" allmodconfig
scripts/kconfig/conf --allmodconfig Kconfig
#
# configuration written to .config
#
sasha@sasha-builder:~/data/linux$ make ARCH=arm64 CROSS_COMPILE="/home/sasha/x-tools/aarch64-unknown-linux-gnu/bin/aarch64-unknown-linux-gnu-" drivers/tty/serial/xilinx_uartps.o
CHK include/config/kernel.release
CHK include/generated/uapi/linux/version.h
CHK include/generated/utsrelease.h
CHK include/generated/bounds.h
CHK include/generated/timeconst.h
CHK include/generated/asm-offsets.h
CALL scripts/checksyscalls.sh
CHK scripts/mod/devicetable-offsets.h
CC [M] drivers/tty/serial/xilinx_uartps.o
--
Thanks,
Sasha