Re: [PATCH 5.10] serial: imx: Introduce timeout when waiting on transmitter empty

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



[ Sasha's backport helper bot ]

Hi,

The upstream commit SHA1 provided is correct: e533e4c62e9993e62e947ae9bbec34e4c7ae81c2

WARNING: Author mismatch between patch and upstream commit:
Backport author: Denis Arefev<arefev@xxxxxxxxx>
Commit author: Esben Haabendal<esben@xxxxxxxxxx>


Status in newer kernel trees:
6.12.y | Present (exact SHA1)
6.6.y | Present (different SHA1: 982ae3376c4c)
6.1.y | Present (different SHA1: 7f9e70c68b7a)
5.15.y | Present (different SHA1: 7f2b9ab6d0b2)
5.10.y | Not found

Note: The patch differs from the upstream commit:
---
1:  e533e4c62e999 ! 1:  703b785835e66 serial: imx: Introduce timeout when waiting on transmitter empty
    @@ Metadata
      ## Commit message ##
         serial: imx: Introduce timeout when waiting on transmitter empty
     
    +    commit e533e4c62e9993e62e947ae9bbec34e4c7ae81c2 upstream.
    +
         By waiting at most 1 second for USR2_TXDC to be set, we avoid a potential
         deadlock.
     
    @@ Commit message
         Acked-by: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx>
         Link: https://lore.kernel.org/r/919647898c337a46604edcabaf13d42d80c0915d.1712837613.git.esben@xxxxxxxxxx
         Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
    +    [Denis: minor fix to resolve merge conflict.]
    +    Signed-off-by: Denis Arefev <arefev@xxxxxxxxx>
     
      ## drivers/tty/serial/imx.c ##
     @@
    - #include <linux/slab.h>
      #include <linux/of.h>
    + #include <linux/of_device.h>
      #include <linux/io.h>
     +#include <linux/iopoll.h>
      #include <linux/dma-mapping.h>
      
      #include <asm/irq.h>
     @@ drivers/tty/serial/imx.c: imx_uart_console_write(struct console *co, const char *s, unsigned int count)
    + {
      	struct imx_port *sport = imx_uart_ports[co->index];
      	struct imx_port_ucrs old_ucr;
    - 	unsigned long flags;
     -	unsigned int ucr1;
    +-	unsigned long flags = 0;
    ++	unsigned long flags;
     +	unsigned int ucr1, usr2;
      	int locked = 1;
      
---

Results of testing on various branches:

| Branch                    | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-5.10.y       |  Success    |  Success   |




[Index of Archives]     [Linux Kernel]     [Kernel Development Newbies]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Hiking]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux