linux-kernel - Re: [PATCH v1 1/1] serial: 8250_dma: Convert to use uart_xmit

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Thu, 22 Sep 2022 16:33:45 +0200
From:   Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To:     Ilpo Järvinen <ilpo.jarvinen@...ux.intel.com>
Cc:     Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
        linux-serial <linux-serial@...r.kernel.org>,
        LKML <linux-kernel@...r.kernel.org>,
        Jiri Slaby <jirislaby@...nel.org>
Subject: Re: [PATCH v1 1/1] serial: 8250_dma: Convert to use
 uart_xmit_advance()

On Thu, Sep 22, 2022 at 05:24:55PM +0300, Ilpo Järvinen wrote:
> On Thu, 22 Sep 2022, Greg Kroah-Hartman wrote:
> 
> > On Fri, Sep 09, 2022 at 12:11:02PM +0300, Andy Shevchenko wrote:
> > > uart_xmit_advance() provides a common way on how to advance
> > > the Tx queue. Use it for the sake of unification and robustness.
> > > 
> > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
> > > ---
> > >  drivers/tty/serial/8250/8250_dma.c | 4 +---
> > >  1 file changed, 1 insertion(+), 3 deletions(-)
> > > 
> > > diff --git a/drivers/tty/serial/8250/8250_dma.c b/drivers/tty/serial/8250/8250_dma.c
> > > index d99020fd3427..b85c82616e8c 100644
> > > --- a/drivers/tty/serial/8250/8250_dma.c
> > > +++ b/drivers/tty/serial/8250/8250_dma.c
> > > @@ -26,9 +26,7 @@ static void __dma_tx_complete(void *param)
> > >  
> > >  	dma->tx_running = 0;
> > >  
> > > -	xmit->tail += dma->tx_size;
> > > -	xmit->tail &= UART_XMIT_SIZE - 1;
> > > -	p->port.icount.tx += dma->tx_size;
> > > +	uart_xmit_advance(&p->port, dma->tx_size);
> > >  
> > >  	if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
> > >  		uart_write_wakeup(&p->port);
> > > -- 
> > > 2.35.1
> > > 
> > 
> > Breaks the build :(
> 
> I'd guess it's because uart_xmit_advance() is current only in tty-linus, 
> not in tty-next.

Probably, can someone resend this when 6.1-rc1 is out?

thanks,

greg k-h