From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kefeng Wang Subject: Re: [PATCH v2] serial: 8250_dw: fix wrong logic in dw8250_check_lcr() Date: Tue, 5 Apr 2016 10:53:14 +0800 Message-ID: <5703289A.5090505@huawei.com> References: <1459824546-9942-1-git-send-email-wangkefeng.wang@huawei.com> Mime-Version: 1.0 Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1459824546-9942-1-git-send-email-wangkefeng.wang@huawei.com> Sender: linux-kernel-owner@vger.kernel.org To: Noam Camus , Greg Kroah-Hartman Cc: Andy Shevchenko , Heikki Krogerus , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, guohanjun@huawei.com, xuwei5@hisilicon.com List-Id: linux-serial@vger.kernel.org Please ignore, sorry for typos, and will resend. On 2016/4/5 10:49, Kefeng Wang wrote: > Commit cdcea058e510("serial: 8250_dw: Avoid serial_outx code duplicate > with new dw8250_check_lcr()") introduce a wrong logic when write val to > LCR reg. When CONFIG_64BIT enabled, __raw_writeq is used unconditionally. > > The __raw_readq/__raw_writeq is introduced by commit bca2092d7897("serial: > 8250_dw: Use 64-bit access for OCTEON") for OCTEON, so for !PORT_OCTEON, > we better to use coincident write func. > > Fixes: cdcea058e510("serial: 8250_dw: Avoid serial_outx code duplicate with new dw8250_check_lcr()") > Signe:-off-by: Kefeng Wang > --- > drivers/tty/serial/8250/8250_dw.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c > index a3fb95d..003ce60 100644 > --- a/drivers/tty/serial/8250/8250_dw.c > +++ b/drivers/tty/serial/8250/8250_dw.c > @@ -103,16 +103,14 @@ static void dw8250_check_lcr(struct uart_port *p, int value) > > dw8250_force_idle(p); > > -#ifdef CONFIG_64BIT > - __raw_writeq(value & 0xff, offset); > -#else > - if (p->iotype == UPIO_MEM32) > + if (IS_ENABLED(CONFIG_64BIT) && p->type == PORT_OCTEON) > + __raw_writeq(value & 0xff, offset); > + else if (p->iotype == UPIO_MEM32) > writel(value, offset); > else if (p->iotype == UPIO_MEM32BE) > iowrite32be(value, offset); > else > writeb(value, offset); > -#endif > } > /* > * FIXME: this deadlocks if port->lock is already held > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754780AbcDEDAR (ORCPT ); Mon, 4 Apr 2016 23:00:17 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:57462 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752204AbcDEDAO (ORCPT ); Mon, 4 Apr 2016 23:00:14 -0400 Subject: Re: [PATCH v2] serial: 8250_dw: fix wrong logic in dw8250_check_lcr() To: Noam Camus , Greg Kroah-Hartman References: <1459824546-9942-1-git-send-email-wangkefeng.wang@huawei.com> CC: Andy Shevchenko , Heikki Krogerus , , , , From: Kefeng Wang Message-ID: <5703289A.5090505@huawei.com> Date: Tue, 5 Apr 2016 10:53:14 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 In-Reply-To: <1459824546-9942-1-git-send-email-wangkefeng.wang@huawei.com> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.177.19.180] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020203.570328AA.00FF,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 34c723df5e1c5bdb1297d4532425866d Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Please ignore, sorry for typos, and will resend. On 2016/4/5 10:49, Kefeng Wang wrote: > Commit cdcea058e510("serial: 8250_dw: Avoid serial_outx code duplicate > with new dw8250_check_lcr()") introduce a wrong logic when write val to > LCR reg. When CONFIG_64BIT enabled, __raw_writeq is used unconditionally. > > The __raw_readq/__raw_writeq is introduced by commit bca2092d7897("serial: > 8250_dw: Use 64-bit access for OCTEON") for OCTEON, so for !PORT_OCTEON, > we better to use coincident write func. > > Fixes: cdcea058e510("serial: 8250_dw: Avoid serial_outx code duplicate with new dw8250_check_lcr()") > Signe:-off-by: Kefeng Wang > --- > drivers/tty/serial/8250/8250_dw.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c > index a3fb95d..003ce60 100644 > --- a/drivers/tty/serial/8250/8250_dw.c > +++ b/drivers/tty/serial/8250/8250_dw.c > @@ -103,16 +103,14 @@ static void dw8250_check_lcr(struct uart_port *p, int value) > > dw8250_force_idle(p); > > -#ifdef CONFIG_64BIT > - __raw_writeq(value & 0xff, offset); > -#else > - if (p->iotype == UPIO_MEM32) > + if (IS_ENABLED(CONFIG_64BIT) && p->type == PORT_OCTEON) > + __raw_writeq(value & 0xff, offset); > + else if (p->iotype == UPIO_MEM32) > writel(value, offset); > else if (p->iotype == UPIO_MEM32BE) > iowrite32be(value, offset); > else > writeb(value, offset); > -#endif > } > /* > * FIXME: this deadlocks if port->lock is already held >