From: "Uwe Kleine-König" <uwe@kleine-koenig.org>
To: Jacek Anaszewski <jacek.anaszewski@gmail.com>,
Pavel Machek <pavel@ucw.cz>, Dan Murphy <dmurphy@ti.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jiri Slaby <jslaby@suse.com>
Cc: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
linux-leds@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel@pengutronix.de, linux-serial@vger.kernel.org
Subject: [PATCH v6 3/4] tty: new helper function tty_get_icount()
Date: Thu, 13 Feb 2020 10:15:59 +0100
Message-ID: <20200213091600.554-4-uwe@kleine-koenig.org> (raw)
In-Reply-To: <20200213091600.554-1-uwe@kleine-koenig.org>
From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
For a given struct tty_struct this yields the corresponding statistics
about sent and received characters (and some more) which is needed to
implement an LED trigger for tty devices.
The new function is then used to simplify tty_tiocgicount().
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
drivers/tty/tty_io.c | 29 +++++++++++++++++++++++++----
include/linux/tty.h | 2 ++
2 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index b718666ce73c..3e74e6cec1a6 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -2492,15 +2492,36 @@ static int tty_tiocmset(struct tty_struct *tty, unsigned int cmd,
return tty->ops->tiocmset(tty, set, clear);
}
+/**
+ * tty_get_icount - get tty statistics
+ * @tty: tty device
+ * @icount: output parameter
+ *
+ * Gets a copy of the tty's icount statistics.
+ *
+ * Locking: none (up to the driver)
+ */
+int tty_get_icount(struct tty_struct *tty,
+ struct serial_icounter_struct *icount)
+{
+ memset(icount, 0, sizeof(*icount));
+
+ if (tty->ops->get_icount)
+ return tty->ops->get_icount(tty, icount);
+ else
+ return -EINVAL;
+}
+EXPORT_SYMBOL_GPL(tty_get_icount);
+
static int tty_tiocgicount(struct tty_struct *tty, void __user *arg)
{
- int retval = -EINVAL;
struct serial_icounter_struct icount;
- memset(&icount, 0, sizeof(icount));
- if (tty->ops->get_icount)
- retval = tty->ops->get_icount(tty, &icount);
+ int retval;
+
+ retval = tty_get_icount(tty, &icount);
if (retval != 0)
return retval;
+
if (copy_to_user(arg, &icount, sizeof(icount)))
return -EFAULT;
return 0;
diff --git a/include/linux/tty.h b/include/linux/tty.h
index d0bcf3226fb2..40ea5c409619 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -495,6 +495,8 @@ extern void tty_unthrottle(struct tty_struct *tty);
extern int tty_throttle_safe(struct tty_struct *tty);
extern int tty_unthrottle_safe(struct tty_struct *tty);
extern int tty_do_resize(struct tty_struct *tty, struct winsize *ws);
+extern int tty_get_icount(struct tty_struct *tty,
+ struct serial_icounter_struct *icount);
extern int is_current_pgrp_orphaned(void);
extern void tty_hangup(struct tty_struct *tty);
extern void tty_vhangup(struct tty_struct *tty);
--
2.24.0
next prev parent reply index
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-13 9:15 [PATCH v6 0/4] leds: trigger: implement a tty trigger Uwe Kleine-König
2020-02-13 9:15 ` [PATCH v6 1/4] lib: new helper kstrtodev_t() Uwe Kleine-König
2020-02-19 19:50 ` Andy Shevchenko
2020-02-20 7:49 ` Uwe Kleine-König
2020-02-20 10:22 ` Andy Shevchenko
2020-02-20 10:57 ` Uwe Kleine-König
2020-02-20 11:46 ` Andy Shevchenko
2020-02-20 11:57 ` Andy Shevchenko
2020-02-20 14:01 ` Uwe Kleine-König
2020-02-21 8:42 ` Andy Shevchenko
2020-02-21 10:53 ` Uwe Kleine-König
2020-04-25 7:07 ` Pavel Machek
2020-02-13 9:15 ` [PATCH v6 2/4] tty: rename tty_kopen() and add new function tty_kopen_shared() Uwe Kleine-König
2020-02-19 13:21 ` Johan Hovold
2020-02-19 16:37 ` Uwe Kleine-König
2020-02-19 17:17 ` Johan Hovold
2020-02-20 11:04 ` Uwe Kleine-König
2020-02-25 8:55 ` Johan Hovold
2020-02-25 9:05 ` Uwe Kleine-König
2020-02-13 9:15 ` Uwe Kleine-König [this message]
2020-02-13 9:16 ` [PATCH v6 4/4] leds: trigger: implement a tty trigger Uwe Kleine-König
2020-02-19 10:52 ` Johan Hovold
2020-02-19 11:03 ` Uwe Kleine-König
2020-02-19 11:19 ` Johan Hovold
2020-02-19 12:48 ` Johan Hovold
2020-02-19 10:40 ` [PATCH v6 0/4] " Greg Kroah-Hartman
2020-02-26 14:02 ` Pavel Machek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200213091600.554-4-uwe@kleine-koenig.org \
--to=uwe@kleine-koenig.org \
--cc=dmurphy@ti.com \
--cc=gregkh@linuxfoundation.org \
--cc=jacek.anaszewski@gmail.com \
--cc=jslaby@suse.com \
--cc=kernel@pengutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=pavel@ucw.cz \
--cc=u.kleine-koenig@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Linux-LEDs Archive on lore.kernel.org
Archives are clonable:
git clone --mirror https://lore.kernel.org/linux-leds/0 linux-leds/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 linux-leds linux-leds/ https://lore.kernel.org/linux-leds \
linux-leds@vger.kernel.org
public-inbox-index linux-leds
Example config snippet for mirrors
Newsgroup available over NNTP:
nntp://nntp.lore.kernel.org/org.kernel.vger.linux-leds
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git