Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D5E12C61DA4 for ; Mon, 6 Mar 2023 09:41:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229613AbjCFJln (ORCPT ); Mon, 6 Mar 2023 04:41:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53348 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230100AbjCFJlf (ORCPT ); Mon, 6 Mar 2023 04:41:35 -0500 Received: from mxout70.expurgate.net (mxout70.expurgate.net [194.37.255.70]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF742233E9; Mon, 6 Mar 2023 01:41:28 -0800 (PST) Received: from [127.0.0.1] (helo=localhost) by relay.expurgate.net with smtp (Exim 4.92) (envelope-from ) id 1pZ7LQ-000Y0o-8v; Mon, 06 Mar 2023 10:41:24 +0100 Received: from [195.243.126.94] (helo=securemail.tdt.de) by relay.expurgate.net with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pZ7LP-000Qj2-Gw; Mon, 06 Mar 2023 10:41:23 +0100 Received: from securemail.tdt.de (localhost [127.0.0.1]) by securemail.tdt.de (Postfix) with ESMTP id 1CCB3240040; Mon, 6 Mar 2023 10:41:23 +0100 (CET) Received: from mail.dev.tdt.de (unknown [10.2.4.42]) by securemail.tdt.de (Postfix) with ESMTP id 83431240049; Mon, 6 Mar 2023 10:41:22 +0100 (CET) Received: from localhost.localdomain (unknown [10.2.3.40]) by mail.dev.tdt.de (Postfix) with ESMTPSA id 2503520E0D; Mon, 6 Mar 2023 10:41:22 +0100 (CET) From: Florian Eckert To: u.kleine-koenig@pengutronix.de, gregkh@linuxfoundation.org, jirislaby@kernel.org, pavel@ucw.cz, lee@kernel.org Cc: linux-kernel@vger.kernel.org, linux-leds@vger.kernel.org, Eckert.Florian@googlemail.com Subject: [PATCH v8 2/3] trigger: ledtrig-tty: add additional modes Date: Mon, 6 Mar 2023 10:41:12 +0100 Message-ID: <20230306094113.273988-3-fe@dev.tdt.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230306094113.273988-1-fe@dev.tdt.de> References: <20230306094113.273988-1-fe@dev.tdt.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-purgate-type: clean X-purgate-ID: 151534::1678095684-10E724CC-620D8BE6/0/0 X-purgate: clean Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add additional modes to trigger the selected LED. The following modes are supported: Tx/Rx: Flash LED on data transmission (default) CTS: DCE Ready to accept data from the DTE. DSR: DCE is ready to receive and send data. CAR: DCE is receiving a carrier from a remote DTE. RNG: DCE has detected an incoming ring signal. The mode can be changed for example with the following command: echo "CTS" > /sys/class/leds//mode This would turn on the LED, when the DTE(modem) signals the DCE that it is ready to accept data. Signed-off-by: Florian Eckert --- .../ABI/testing/sysfs-class-led-trigger-tty | 18 +++ drivers/leds/trigger/ledtrig-tty.c | 143 ++++++++++++++++-- 2 files changed, 146 insertions(+), 15 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-class-led-trigger-tty b/Docu= mentation/ABI/testing/sysfs-class-led-trigger-tty index 2bf6b24e781b..2e4e4c009a21 100644 --- a/Documentation/ABI/testing/sysfs-class-led-trigger-tty +++ b/Documentation/ABI/testing/sysfs-class-led-trigger-tty @@ -4,3 +4,21 @@ KernelVersion: 5.10 Contact: linux-leds@vger.kernel.org Description: Specifies the tty device name of the triggering tty + +What: /sys/class/leds//mode +Date: January 2023 +KernelVersion: 6.3 +Description: + Specifies the mode to trigger the LED. + The following operating modes are supported: + + =3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D + Tx/Rx Flash LED on data transmission (default) + CTS DCE Ready to accept data from the DTE + DSR DCE is ready to receive and send data + CAR DCE is receiving a carrier from a remote DTE + RNG DCE has detected an incoming ring signal + =3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D + + In CTS/DSR/CAR/RNG modes, the LED is enabled when the + tty line is high. \ No newline at end of file diff --git a/drivers/leds/trigger/ledtrig-tty.c b/drivers/leds/trigger/le= dtrig-tty.c index f62db7e520b5..d3407830fa69 100644 --- a/drivers/leds/trigger/ledtrig-tty.c +++ b/drivers/leds/trigger/ledtrig-tty.c @@ -7,6 +7,15 @@ #include #include =20 +enum tty_led_mode { + TTY_LED_RXTX, + TTY_LED_CTS, + TTY_LED_DSR, + TTY_LED_CAR, + TTY_LED_RNG, + _TTY_LED_LAST =3D TTY_LED_RNG +}; + struct ledtrig_tty_data { struct led_classdev *led_cdev; struct delayed_work dwork; @@ -14,6 +23,15 @@ struct ledtrig_tty_data { const char *ttyname; struct tty_struct *tty; int rx, tx; + enum tty_led_mode mode; +}; + +static const char * const mode[] =3D { + [TTY_LED_RXTX] =3D "Tx/Rx", /* Transmit and Receive data */ + [TTY_LED_CTS] =3D "CTS", /* CTS clear to send */ + [TTY_LED_DSR] =3D "DSR", /* DSR data set ready */ + [TTY_LED_CAR] =3D "CAR", /* CAR data carrier detect (DCD) */ + [TTY_LED_RNG] =3D "RNG", /* RNG ring indicator */ }; =20 static void ledtrig_tty_restart(struct ledtrig_tty_data *trigger_data) @@ -21,6 +39,70 @@ static void ledtrig_tty_restart(struct ledtrig_tty_dat= a *trigger_data) schedule_delayed_work(&trigger_data->dwork, 0); } =20 +static ssize_t ledtrig_tty_mode_show(char *buf, enum tty_led_mode tty_mo= de) +{ + int len =3D 0; + int i; + + for (i =3D 0; i <=3D _TTY_LED_LAST; i++) { + bool hit =3D tty_mode =3D=3D i; + bool last =3D i =3D=3D _TTY_LED_LAST; + + len +=3D sysfs_emit_at(buf, len, "%s%s%s%s", + hit ? "[" : "", + mode[i], + hit ? "]" : "", + last ? "" : " "); + } + + len +=3D sysfs_emit_at(buf, len, "\n"); + + return len; +} + +static ssize_t tty_led_mode_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct ledtrig_tty_data *trigger_data =3D led_trigger_get_drvdata(dev); + enum tty_led_mode tty_mode; + + mutex_lock(&trigger_data->mutex); + tty_mode =3D trigger_data->mode; + mutex_unlock(&trigger_data->mutex); + + return ledtrig_tty_mode_show(buf, tty_mode); +} + +static ssize_t tty_led_mode_store(struct device *dev, + struct device_attribute *attr, const char *buf, + size_t size) +{ + struct ledtrig_tty_data *trigger_data =3D led_trigger_get_drvdata(dev); + ssize_t ret =3D size; + int i; + enum tty_led_mode tty_mode =3D _TTY_LED_LAST; + + /* Check for new line in string */ + if (size > 0 && buf[size - 1] =3D=3D '\n') + size -=3D 1; + + for (i =3D 0; i <=3D _TTY_LED_LAST; i++) + if (strncmp(buf, mode[i], size) =3D=3D 0) { + tty_mode =3D i; + break; + } + + if (i > _TTY_LED_LAST) + return -EINVAL; + + mutex_lock(&trigger_data->mutex); + trigger_data->mode =3D tty_mode; + mutex_unlock(&trigger_data->mutex); + + return ret; +} +static DEVICE_ATTR_RW(tty_led_mode); + static ssize_t ttyname_show(struct device *dev, struct device_attribute *attr, char *buf) { @@ -76,6 +158,17 @@ static ssize_t ttyname_store(struct device *dev, } static DEVICE_ATTR_RW(ttyname); =20 +static void ledtrig_tty_flags(struct ledtrig_tty_data *trigger_data, uns= igned int flag) +{ + unsigned int status; + + status =3D tty_get_mget(trigger_data->tty); + if (status & flag) + led_set_brightness_sync(trigger_data->led_cdev, LED_ON); + else + led_set_brightness_sync(trigger_data->led_cdev, LED_OFF); +} + static void ledtrig_tty_work(struct work_struct *work) { struct ledtrig_tty_data *trigger_data =3D @@ -113,21 +206,37 @@ static void ledtrig_tty_work(struct work_struct *wo= rk) trigger_data->tty =3D tty; } =20 - ret =3D tty_get_icount(trigger_data->tty, &icount); - if (ret) { - dev_info(trigger_data->tty->dev, "Failed to get icount, stopped pollin= g\n"); - mutex_unlock(&trigger_data->mutex); - return; - } - - if (icount.rx !=3D trigger_data->rx || - icount.tx !=3D trigger_data->tx) { - led_set_brightness_sync(trigger_data->led_cdev, LED_ON); - - trigger_data->rx =3D icount.rx; - trigger_data->tx =3D icount.tx; - } else { - led_set_brightness_sync(trigger_data->led_cdev, LED_OFF); + switch (trigger_data->mode) { + case TTY_LED_CTS: + ledtrig_tty_flags(trigger_data, TIOCM_CTS); + break; + case TTY_LED_DSR: + ledtrig_tty_flags(trigger_data, TIOCM_DSR); + break; + case TTY_LED_CAR: + ledtrig_tty_flags(trigger_data, TIOCM_CAR); + break; + case TTY_LED_RNG: + ledtrig_tty_flags(trigger_data, TIOCM_RNG); + break; + case TTY_LED_RXTX: + default: + ret =3D tty_get_icount(trigger_data->tty, &icount); + if (ret) { + dev_info(trigger_data->tty->dev, "Failed to get icount, stopped polli= ng\n"); + mutex_unlock(&trigger_data->mutex); + return; + } + + if (icount.rx !=3D trigger_data->rx || icount.tx !=3D trigger_data->tx= ) { + led_set_brightness_sync(trigger_data->led_cdev, LED_ON); + + trigger_data->rx =3D icount.rx; + trigger_data->tx =3D icount.tx; + } else { + led_set_brightness_sync(trigger_data->led_cdev, LED_OFF); + } + break; } =20 out: @@ -137,6 +246,7 @@ static void ledtrig_tty_work(struct work_struct *work= ) =20 static struct attribute *ledtrig_tty_attrs[] =3D { &dev_attr_ttyname.attr, + &dev_attr_tty_led_mode.attr, NULL }; ATTRIBUTE_GROUPS(ledtrig_tty); @@ -149,6 +259,9 @@ static int ledtrig_tty_activate(struct led_classdev *= led_cdev) if (!trigger_data) return -ENOMEM; =20 + /* Set default mode */ + trigger_data->mode =3D TTY_LED_RXTX; + led_set_trigger_data(led_cdev, trigger_data); =20 INIT_DELAYED_WORK(&trigger_data->dwork, ledtrig_tty_work); --=20 2.30.2