From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 708B5C31E45 for ; Thu, 13 Jun 2019 17:07:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4F51520449 for ; Thu, 13 Jun 2019 17:07:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393532AbfFMRHq (ORCPT ); Thu, 13 Jun 2019 13:07:46 -0400 Received: from mga14.intel.com ([192.55.52.115]:2176 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393381AbfFMRHo (ORCPT ); Thu, 13 Jun 2019 13:07:44 -0400 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Jun 2019 10:07:43 -0700 X-ExtLoop1: 1 Received: from smile.fi.intel.com (HELO smile) ([10.237.68.145]) by fmsmga004.fm.intel.com with ESMTP; 13 Jun 2019 10:07:41 -0700 Received: from andy by smile with local (Exim 4.92) (envelope-from ) id 1hbTCP-0006Jw-0S; Thu, 13 Jun 2019 20:07:41 +0300 Date: Thu, 13 Jun 2019 20:07:41 +0300 From: Andy Shevchenko To: Stefan Roese Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, Mika Westerberg , Yegor Yefremov , Greg Kroah-Hartman , Giulio Benetti Subject: Re: [PATCH 2/3 v6] serial: 8250: Add MSR/MCR TIOCM conversion wrapper functions Message-ID: <20190613170741.GD9224@smile.fi.intel.com> References: <20190613154542.32438-1-sr@denx.de> <20190613154542.32438-2-sr@denx.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190613154542.32438-2-sr@denx.de> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jun 13, 2019 at 05:45:41PM +0200, Stefan Roese wrote: > This patch adds wrapper functions to convert MSR <-> TIOCM and also > MCR <-> TIOCM. These functions are used now in serial8250_do_set_mctrl() > and serial8250_do_get_mctrl(). > Yes, and we may use them in the other drivers later on. Thanks! Reviewed-by: Andy Shevchenko > Signed-off-by: Stefan Roese > Suggested-by: Andy Shevchenko > Cc: Mika Westerberg > Cc: Andy Shevchenko > Cc: Yegor Yefremov > Cc: Greg Kroah-Hartman > Cc: Giulio Benetti > --- > v6: > - New patch > > drivers/tty/serial/8250/8250.h | 54 +++++++++++++++++++++++++++++ > drivers/tty/serial/8250/8250_port.c | 25 ++----------- > 2 files changed, 57 insertions(+), 22 deletions(-) > > diff --git a/drivers/tty/serial/8250/8250.h b/drivers/tty/serial/8250/8250.h > index ebfb0bd5bef5..793da2e510e0 100644 > --- a/drivers/tty/serial/8250/8250.h > +++ b/drivers/tty/serial/8250/8250.h > @@ -139,6 +139,60 @@ void serial8250_rpm_put_tx(struct uart_8250_port *p); > int serial8250_em485_init(struct uart_8250_port *p); > void serial8250_em485_destroy(struct uart_8250_port *p); > > +/* MCR <-> TIOCM conversion */ > +static inline int serial8250_TIOCM_to_MCR(int tiocm) > +{ > + int mcr = 0; > + > + if (tiocm & TIOCM_RTS) > + mcr |= UART_MCR_RTS; > + if (tiocm & TIOCM_DTR) > + mcr |= UART_MCR_DTR; > + if (tiocm & TIOCM_OUT1) > + mcr |= UART_MCR_OUT1; > + if (tiocm & TIOCM_OUT2) > + mcr |= UART_MCR_OUT2; > + if (tiocm & TIOCM_LOOP) > + mcr |= UART_MCR_LOOP; > + > + return mcr; > +} > + > +static inline int serial8250_MCR_to_TIOCM(int mcr) > +{ > + int tiocm = 0; > + > + if (mcr & UART_MCR_RTS) > + tiocm |= TIOCM_RTS; > + if (mcr & UART_MCR_DTR) > + tiocm |= TIOCM_DTR; > + if (mcr & UART_MCR_OUT1) > + tiocm |= TIOCM_OUT1; > + if (mcr & UART_MCR_OUT2) > + tiocm |= TIOCM_OUT2; > + if (mcr & UART_MCR_LOOP) > + tiocm |= TIOCM_LOOP; > + > + return tiocm; > +} > + > +/* MSR <-> TIOCM conversion */ > +static inline int serial8250_MSR_to_TIOCM(int msr) > +{ > + int tiocm = 0; > + > + if (msr & UART_MSR_DCD) > + tiocm |= TIOCM_CAR; > + if (msr & UART_MSR_RI) > + tiocm |= TIOCM_RNG; > + if (msr & UART_MSR_DSR) > + tiocm |= TIOCM_DSR; > + if (msr & UART_MSR_CTS) > + tiocm |= TIOCM_CTS; > + > + return tiocm; > +} > + > static inline void serial8250_out_MCR(struct uart_8250_port *up, int value) > { > serial_out(up, UART_MCR, value); > diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c > index 2304a84eee3b..47f0a8d01a57 100644 > --- a/drivers/tty/serial/8250/8250_port.c > +++ b/drivers/tty/serial/8250/8250_port.c > @@ -1944,22 +1944,12 @@ unsigned int serial8250_do_get_mctrl(struct uart_port *port) > { > struct uart_8250_port *up = up_to_u8250p(port); > unsigned int status; > - unsigned int ret; > > serial8250_rpm_get(up); > status = serial8250_modem_status(up); > serial8250_rpm_put(up); > > - ret = 0; > - if (status & UART_MSR_DCD) > - ret |= TIOCM_CAR; > - if (status & UART_MSR_RI) > - ret |= TIOCM_RNG; > - if (status & UART_MSR_DSR) > - ret |= TIOCM_DSR; > - if (status & UART_MSR_CTS) > - ret |= TIOCM_CTS; > - return ret; > + return serial8250_MSR_to_TIOCM(status); > } > EXPORT_SYMBOL_GPL(serial8250_do_get_mctrl); > > @@ -1973,18 +1963,9 @@ static unsigned int serial8250_get_mctrl(struct uart_port *port) > void serial8250_do_set_mctrl(struct uart_port *port, unsigned int mctrl) > { > struct uart_8250_port *up = up_to_u8250p(port); > - unsigned char mcr = 0; > + unsigned char mcr; > > - if (mctrl & TIOCM_RTS) > - mcr |= UART_MCR_RTS; > - if (mctrl & TIOCM_DTR) > - mcr |= UART_MCR_DTR; > - if (mctrl & TIOCM_OUT1) > - mcr |= UART_MCR_OUT1; > - if (mctrl & TIOCM_OUT2) > - mcr |= UART_MCR_OUT2; > - if (mctrl & TIOCM_LOOP) > - mcr |= UART_MCR_LOOP; > + mcr = serial8250_TIOCM_to_MCR(mctrl); > > mcr = (mcr & up->mcr_mask) | up->mcr_force | up->mcr; > > -- > 2.22.0 > -- With Best Regards, Andy Shevchenko