From patchwork Mon Jan 22 17:56:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Hecht X-Patchwork-Id: 10178975 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EDBBF60353 for ; Mon, 22 Jan 2018 17:56:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DEB9528397 for ; Mon, 22 Jan 2018 17:56:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D36CE283BB; Mon, 22 Jan 2018 17:56:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3462828397 for ; Mon, 22 Jan 2018 17:56:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751110AbeAVR4l (ORCPT ); Mon, 22 Jan 2018 12:56:41 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:34417 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751092AbeAVR4j (ORCPT ); Mon, 22 Jan 2018 12:56:39 -0500 Received: by mail-wm0-f68.google.com with SMTP id j21so10019899wmh.1; Mon, 22 Jan 2018 09:56:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=FHdGFrLfWqMQppdiGWvqq1nKUuCN0SqJNyDmt+DtR6E=; b=Q9WrlG7leQ6ChSbu8Zp+JupGgu/c8ZOvo2pG++pFwcy9Y59ZdMw6kmX0bENQ9HtVK+ gVXNHuyjCXmPP98dN2w5uT4AHJKkO5QopQPRvZNp5JrCZL1gdnz1Bi/wfOgEJeec5IL1 J0daV62jO7K8B7htPg7huzGUugklnEsGtuaQo/tjiFWqqD/Zb2cau595Qso2DqcU1jzj +FFw5rVy6IqUbpd8E7zdKAOMVO4qoikZhJ6ALq0f6615ra1FBTKwauIKYHC2WcuswY9f id28tjZMMB18x27pLUmtc/+ngDFyxZAMV2fgR1B/or+8N4ZvoW7Mf4vgjshw9QG43e/A YTAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=FHdGFrLfWqMQppdiGWvqq1nKUuCN0SqJNyDmt+DtR6E=; b=lnoCMxwvKL9AHBaM0yKAAP5ZTDBxbojN1aiacN6vbwXqz6eOM74LKKs4A+dsMFeWLn ANBXsWp6/nQz0evuEbBSx+ScakpjKAGMZH6Ex6SyWpOOQsgvUwJcWXz8dSQTaCiQTDM5 vbx860m561JVMq0YQVXgH/RCZisdHky2cpWf+Yj4NDCsd8JqP24DZJKGHrFuTj/9paGU LUJIUkGOdv/uMt/VqRqBnqJaNjkL42gq/Co33tgph4dzoZ0H6pAI+iEVjxNRCjvS6cQx NSJ5bgLxnuJyFVw4w2f8CmgHiNKqrEWUHfCdYd9KzeyiF0Nbcofd6pX5/AqC0BGv9uKq Fyiw== X-Gm-Message-State: AKwxytc3kluMRZvrKmOUcl6hDTGOsPW3IWanNoSwgQPlAg+SQXccu9tI mbuMdHopE0umATUCR4Q/rw== X-Google-Smtp-Source: AH8x2247oTS50Vv3gresVsVWpZN1Fe0MBG0E+mwTcuL6hOYfXadzdchBlDZrzEHAnEEMuB2aCSkjDA== X-Received: by 10.28.113.82 with SMTP id m79mr4516463wmc.138.1516643797940; Mon, 22 Jan 2018 09:56:37 -0800 (PST) Received: from groucho.site (ipbcc3b860.dynamic.kabel-deutschland.de. [188.195.184.96]) by smtp.gmail.com with ESMTPSA id m6sm7698115wmd.37.2018.01.22.09.56.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 22 Jan 2018 09:56:37 -0800 (PST) From: Ulrich Hecht To: marcel@holtmann.org Cc: linux-renesas-soc@vger.kernel.org, linux-serial@vger.kernel.org, johan@kernel.org, sre@kernel.org, linux-bluetooth@vger.kernel.org, robh@kernel.org, martin.blumenstingl@googlemail.com, gregkh@linuxfoundation.org, magnus.damm@gmail.com, laurent.pinchart@ideasonboard.com, wsa@the-dreams.de, geert@linux-m68k.org, Ulrich Hecht Subject: [PATCH v2] serdev: add method to set parity Date: Mon, 22 Jan 2018 18:56:32 +0100 Message-Id: <1516643792-22840-1-git-send-email-ulrich.hecht+renesas@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Adds serdev_device_set_parity() and an implementation for ttyport. The interface uses an enum with the values SERIAL_PARITY_NONE, SERIAL_PARITY_EVEN and SERIAL_PARITY_ODD. Signed-off-by: Ulrich Hecht Reviewed-by: Sebastian Reichel Reviewed-by: Johan Hovold Acked-by: Greg Kroah-Hartman --- Hi! This revision addresses Johan's comments (see below for details) and adds Sebastian's Reviewed-by tag. Thank you for your reviews! CU Uli Changes since v1: - added Reviewed-by tag - expanded commit message - shuffled stuff around to keep line-setting bits together - clear CMSPAR - (hopefully) detect errors correctly by checking tty->termios after call to tty_set_termios(). drivers/tty/serdev/core.c | 12 ++++++++++++ drivers/tty/serdev/serdev-ttyport.c | 24 ++++++++++++++++++++++++ include/linux/serdev.h | 10 ++++++++++ 3 files changed, 46 insertions(+) diff --git a/drivers/tty/serdev/core.c b/drivers/tty/serdev/core.c index 5dc88f6..ceee0ca 100644 --- a/drivers/tty/serdev/core.c +++ b/drivers/tty/serdev/core.c @@ -257,6 +257,18 @@ void serdev_device_set_flow_control(struct serdev_device *serdev, bool enable) } EXPORT_SYMBOL_GPL(serdev_device_set_flow_control); +int serdev_device_set_parity(struct serdev_device *serdev, + enum serdev_parity parity) +{ + struct serdev_controller *ctrl = serdev->ctrl; + + if (!ctrl || !ctrl->ops->set_parity) + return -ENOTSUPP; + + return ctrl->ops->set_parity(ctrl, parity); +} +EXPORT_SYMBOL_GPL(serdev_device_set_parity); + void serdev_device_wait_until_sent(struct serdev_device *serdev, long timeout) { struct serdev_controller *ctrl = serdev->ctrl; diff --git a/drivers/tty/serdev/serdev-ttyport.c b/drivers/tty/serdev/serdev-ttyport.c index a5abb05..fa16729 100644 --- a/drivers/tty/serdev/serdev-ttyport.c +++ b/drivers/tty/serdev/serdev-ttyport.c @@ -194,6 +194,29 @@ static void ttyport_set_flow_control(struct serdev_controller *ctrl, bool enable tty_set_termios(tty, &ktermios); } +static int ttyport_set_parity(struct serdev_controller *ctrl, + enum serdev_parity parity) +{ + struct serport *serport = serdev_controller_get_drvdata(ctrl); + struct tty_struct *tty = serport->tty; + struct ktermios ktermios = tty->termios; + + ktermios.c_cflag &= ~(PARENB | PARODD | CMSPAR); + if (parity != SERDEV_PARITY_NONE) { + ktermios.c_cflag |= PARENB; + if (parity == SERDEV_PARITY_ODD) + ktermios.c_cflag |= PARODD; + } + + tty_set_termios(tty, &ktermios); + + if ((tty->termios.c_cflag & (PARENB | PARODD | CMSPAR)) != + (ktermios.c_cflag & (PARENB | PARODD | CMSPAR))) + return -EINVAL; + + return 0; +} + static void ttyport_wait_until_sent(struct serdev_controller *ctrl, long timeout) { struct serport *serport = serdev_controller_get_drvdata(ctrl); @@ -231,6 +254,7 @@ static const struct serdev_controller_ops ctrl_ops = { .open = ttyport_open, .close = ttyport_close, .set_flow_control = ttyport_set_flow_control, + .set_parity = ttyport_set_parity, .set_baudrate = ttyport_set_baudrate, .wait_until_sent = ttyport_wait_until_sent, .get_tiocm = ttyport_get_tiocm, diff --git a/include/linux/serdev.h b/include/linux/serdev.h index 48d8ce2..f153b2c 100644 --- a/include/linux/serdev.h +++ b/include/linux/serdev.h @@ -78,6 +78,12 @@ static inline struct serdev_device_driver *to_serdev_device_driver(struct device return container_of(d, struct serdev_device_driver, driver); } +enum serdev_parity { + SERDEV_PARITY_NONE, + SERDEV_PARITY_EVEN, + SERDEV_PARITY_ODD, +}; + /* * serdev controller structures */ @@ -88,6 +94,7 @@ struct serdev_controller_ops { int (*open)(struct serdev_controller *); void (*close)(struct serdev_controller *); void (*set_flow_control)(struct serdev_controller *, bool); + int (*set_parity)(struct serdev_controller *, enum serdev_parity); unsigned int (*set_baudrate)(struct serdev_controller *, unsigned int); void (*wait_until_sent)(struct serdev_controller *, long); int (*get_tiocm)(struct serdev_controller *); @@ -301,6 +308,9 @@ static inline int serdev_device_set_rts(struct serdev_device *serdev, bool enabl return serdev_device_set_tiocm(serdev, 0, TIOCM_RTS); } +int serdev_device_set_parity(struct serdev_device *serdev, + enum serdev_parity parity); + /* * serdev hooks into TTY core */