* [PATCH v4 0/2] leds: ledtrig-tty: add tty_led_mode xtension @ 2023-02-20 15:20 Florian Eckert 2023-02-20 15:20 ` [PATCH v4 1/2] tty: new helper function tty_get_mget Florian Eckert 2023-02-20 15:20 ` [PATCH v4 2/2] trigger: ledtrig-tty: add additional modes Florian Eckert 0 siblings, 2 replies; 5+ messages in thread From: Florian Eckert @ 2023-02-20 15:20 UTC (permalink / raw) To: u.kleine-koenig, gregkh, jirislaby, pavel, lee Cc: linux-kernel, linux-leds, Eckert.Florian Hello, here commes v4 of this series to add additional tty_led_modes. v4: Changes compared to the v3 patchset with 20230220093739.320478-1-fe@dev.tdt.de are. Addressed review comments by Jiri Slaby are: ledtrig-tty.c: - Do not use __TTY_LED_MAX pattern us instead __TTY_LED_LAST = TTY_LED_RNG - Move declartion and assignment into one singel line - Use __TTY_LED_LAST pattern, to simplify tty_mode_show and tty_mode_store handling v3: Changes compared to the v2 patchset with 20230217094403.1574468-1-fe@dev.tdt.de are. Addressed review comments by Greg K-H are: tty.h: - Fix first comment line and remark -%ENOTTY for the new function 'tty_get_mget' to make a proper kernel doc. - Add the return value -%ENOTTY again, I thought it was no longer needed. v2: Changes compared to the initial patchset with 20230213140638.620206-1-fe@dev.tdt.de are. Addressed review comments by Jiri Slaby are: tty.h: - Fix compilation error because of wrong rebaseing - Remove empty lines - Use new 'tty_get_mget' in 'tty_tiocmget' ledtrig-tty.c: - Update commit description - Use enum for tty_led_mod in struct ledtrig_tty_date - Rename sysfs file from 'mode' to 'tty_led_mode' - Change tty_led_mode show function to use loop instead of switch/case - Change tty_led_mode store function to use loop instead of switch/case - Check return value of function tty_get_mget Florian Eckert (2): tty: new helper function tty_get_mget trigger: ledtrig-tty: add additional modes .../ABI/testing/sysfs-class-led-trigger-tty | 16 ++ drivers/leds/trigger/ledtrig-tty.c | 146 ++++++++++++++++-- drivers/tty/tty_io.c | 28 +++- include/linux/tty.h | 1 + 4 files changed, 170 insertions(+), 21 deletions(-) -- 2.30.2 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v4 1/2] tty: new helper function tty_get_mget 2023-02-20 15:20 [PATCH v4 0/2] leds: ledtrig-tty: add tty_led_mode xtension Florian Eckert @ 2023-02-20 15:20 ` Florian Eckert 2023-02-20 15:20 ` [PATCH v4 2/2] trigger: ledtrig-tty: add additional modes Florian Eckert 1 sibling, 0 replies; 5+ messages in thread From: Florian Eckert @ 2023-02-20 15:20 UTC (permalink / raw) To: u.kleine-koenig, gregkh, jirislaby, pavel, lee Cc: linux-kernel, linux-leds, Eckert.Florian For a given struct tty_struct, this provides the appropriate tty line state flags needed to add more modes to the ledtrig-tty trigger. The new function is then used to get via tty_tiocmget() the different tty line states. Signed-off-by: Florian Eckert <fe@dev.tdt.de> --- drivers/tty/tty_io.c | 28 ++++++++++++++++++++++------ include/linux/tty.h | 1 + 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index 3149114bf130..a068b03a0828 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c @@ -2493,6 +2493,24 @@ static int send_break(struct tty_struct *tty, unsigned int duration) return retval; } +/** + * tty_get_mget - get modem status + * @tty: tty device + * + * Obtain the modem status bits from the tty driver if the feature + * is supported. Return -%ENOTTY if it is not available. + */ +int tty_get_mget(struct tty_struct *tty) +{ + int retval = -ENOTTY; + + if (tty->ops->tiocmget) + retval = tty->ops->tiocmget(tty); + + return retval; +} +EXPORT_SYMBOL_GPL(tty_get_mget); + /** * tty_tiocmget - get modem status * @tty: tty device @@ -2505,14 +2523,12 @@ static int send_break(struct tty_struct *tty, unsigned int duration) */ static int tty_tiocmget(struct tty_struct *tty, int __user *p) { - int retval = -ENOTTY; + int retval; - if (tty->ops->tiocmget) { - retval = tty->ops->tiocmget(tty); + retval = tty_get_mget(tty); + if (retval >= 0) + retval = put_user(retval, p); - if (retval >= 0) - retval = put_user(retval, p); - } return retval; } diff --git a/include/linux/tty.h b/include/linux/tty.h index 730c3301d710..825186c0fec1 100644 --- a/include/linux/tty.h +++ b/include/linux/tty.h @@ -421,6 +421,7 @@ int tty_unthrottle_safe(struct tty_struct *tty); int tty_do_resize(struct tty_struct *tty, struct winsize *ws); int tty_get_icount(struct tty_struct *tty, struct serial_icounter_struct *icount); +int tty_get_mget(struct tty_struct *tty); int is_current_pgrp_orphaned(void); void tty_hangup(struct tty_struct *tty); void tty_vhangup(struct tty_struct *tty); -- 2.30.2 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v4 2/2] trigger: ledtrig-tty: add additional modes 2023-02-20 15:20 [PATCH v4 0/2] leds: ledtrig-tty: add tty_led_mode xtension Florian Eckert 2023-02-20 15:20 ` [PATCH v4 1/2] tty: new helper function tty_get_mget Florian Eckert @ 2023-02-20 15:20 ` Florian Eckert 2023-02-20 18:22 ` kernel test robot 2023-02-20 22:27 ` kernel test robot 1 sibling, 2 replies; 5+ messages in thread From: Florian Eckert @ 2023-02-20 15:20 UTC (permalink / raw) To: u.kleine-koenig, gregkh, jirislaby, pavel, lee Cc: linux-kernel, linux-leds, Eckert.Florian 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/<led>/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 <fe@dev.tdt.de> --- .../ABI/testing/sysfs-class-led-trigger-tty | 16 ++ drivers/leds/trigger/ledtrig-tty.c | 144 ++++++++++++++++-- 2 files changed, 145 insertions(+), 15 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-class-led-trigger-tty b/Documentation/ABI/testing/sysfs-class-led-trigger-tty index 2bf6b24e781b..31d62a5ae095 100644 --- a/Documentation/ABI/testing/sysfs-class-led-trigger-tty +++ b/Documentation/ABI/testing/sysfs-class-led-trigger-tty @@ -4,3 +4,19 @@ KernelVersion: 5.10 Contact: linux-leds@vger.kernel.org Description: Specifies the tty device name of the triggering tty + +What: /sys/class/leds/<led>/mode +Date: January 2023 +KernelVersion: 6.3 +Description: + Specifies the operating to trigger the LED. + The following operating modes are supported: + Tx/Rx: Flash LED on data transmission (default) + CTS: DCE Ready to accept data from the DTE. + LED on if line is high. + DSR: DCE is ready to receive and send data. + LED on if line is high. + CAR: DCE is receiving a carrier from a remote DTE. + LED on if line is high. + RNG: DCE has detected an incoming ring signal. + LED on if line is high. diff --git a/drivers/leds/trigger/ledtrig-tty.c b/drivers/leds/trigger/ledtrig-tty.c index f62db7e520b5..8b2eed7e67e5 100644 --- a/drivers/leds/trigger/ledtrig-tty.c +++ b/drivers/leds/trigger/ledtrig-tty.c @@ -7,6 +7,14 @@ #include <linux/tty.h> #include <uapi/linux/serial.h> +enum tty_led_mode { + TTY_LED_CNT, + TTY_LED_CTS, + TTY_LED_DSR, + TTY_LED_CAR, + TTY_LED_LAST = TTY_LED_RNG +}; + struct ledtrig_tty_data { struct led_classdev *led_cdev; struct delayed_work dwork; @@ -14,6 +22,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[] = { + [TTY_LED_CNT] = "Tx/Rx", // Trasmit Data / Receive Data + [TTY_LED_CTS] = "CTS", // CTS Clear To Send + [TTY_LED_DSR] = "DSR", // DSR Data Set Ready + [TTY_LED_CAR] = "CAR", // CAR Data Carrier Detect (DCD) + [TTY_LED_RNG] = "RNG", // RNG Ring Indicator (RI) }; static void ledtrig_tty_restart(struct ledtrig_tty_data *trigger_data) @@ -21,6 +38,70 @@ static void ledtrig_tty_restart(struct ledtrig_tty_data *trigger_data) schedule_delayed_work(&trigger_data->dwork, 0); } +static ssize_t ledtrig_tty_mode_show(char *buf, enum tty_led_mode tty_mode) +{ + int len = 0; + int i; + + for (i = 0; i <= TTY_LED_LAST; i++) { + bool hit = tty_mode == i; + bool last = i == __TTY_LED_LAST; + + len += sysfs_emit_at(buf, len, "%s%s%s", + hit ? "[" : "", + mode[i], + hit ? "]" : "", + last ? "" : " "); + } + + len += 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 = led_trigger_get_drvdata(dev); + enum tty_led_mode tty_mode; + + mutex_lock(&trigger_data->mutex); + tty_mode = 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 = led_trigger_get_drvdata(dev); + ssize_t ret = size; + enum tty_led_mode tty_mode = __TTY_LED_MAX; + int i; + + /* Check for new line in string*/ + if (size > 0 && buf[size - 1] == '\n') + size -= 1; + + for (i = 0; i <= __TTY_LED_LAST; i++) + if (strncmp(buf, mode[i], size) == 0) + tty_mode = i; + break; + } + + if (tty_mode > __TTY_LED_LAST) + return -EINVAL; + + mutex_lock(&trigger_data->mutex); + trigger_data->mode = 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 +157,18 @@ static ssize_t ttyname_store(struct device *dev, } static DEVICE_ATTR_RW(ttyname); +static void ledtrig_tty_flags(struct ledtrig_tty_data *trigger_data, + unsigned int flag) +{ + unsigned int status; + + status = 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 = @@ -113,21 +206,38 @@ static void ledtrig_tty_work(struct work_struct *work) trigger_data->tty = tty; } - ret = tty_get_icount(trigger_data->tty, &icount); - if (ret) { - dev_info(trigger_data->tty->dev, "Failed to get icount, stopped polling\n"); - mutex_unlock(&trigger_data->mutex); - return; - } - - if (icount.rx != trigger_data->rx || - icount.tx != trigger_data->tx) { - led_set_brightness_sync(trigger_data->led_cdev, LED_ON); - - trigger_data->rx = icount.rx; - trigger_data->tx = 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_CNT: + default: + ret = tty_get_icount(trigger_data->tty, &icount); + if (ret) { + dev_info(trigger_data->tty->dev, "Failed to get icount, stopped polling\n"); + mutex_unlock(&trigger_data->mutex); + return; + } + + if (icount.rx != trigger_data->rx || + icount.tx != trigger_data->tx) { + led_set_brightness_sync(trigger_data->led_cdev, LED_ON); + + trigger_data->rx = icount.rx; + trigger_data->tx = icount.tx; + } else { + led_set_brightness_sync(trigger_data->led_cdev, LED_OFF); + } + break; } out: @@ -137,6 +247,7 @@ static void ledtrig_tty_work(struct work_struct *work) static struct attribute *ledtrig_tty_attrs[] = { &dev_attr_ttyname.attr, + &dev_attr_tty_led_mode.attr, NULL }; ATTRIBUTE_GROUPS(ledtrig_tty); @@ -149,6 +260,9 @@ static int ledtrig_tty_activate(struct led_classdev *led_cdev) if (!trigger_data) return -ENOMEM; + /* set default mode */ + trigger_data->mode = TTY_LED_CNT; + led_set_trigger_data(led_cdev, trigger_data); INIT_DELAYED_WORK(&trigger_data->dwork, ledtrig_tty_work); -- 2.30.2 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v4 2/2] trigger: ledtrig-tty: add additional modes 2023-02-20 15:20 ` [PATCH v4 2/2] trigger: ledtrig-tty: add additional modes Florian Eckert @ 2023-02-20 18:22 ` kernel test robot 2023-02-20 22:27 ` kernel test robot 1 sibling, 0 replies; 5+ messages in thread From: kernel test robot @ 2023-02-20 18:22 UTC (permalink / raw) To: Florian Eckert, u.kleine-koenig, gregkh, jirislaby, pavel, lee Cc: oe-kbuild-all, linux-kernel, linux-leds, Eckert.Florian Hi Florian, Thank you for the patch! Perhaps something to improve: [auto build test WARNING on tty/tty-testing] [also build test WARNING on tty/tty-next tty/tty-linus pavel-leds/for-next staging/staging-testing staging/staging-next staging/staging-linus linus/master v6.2 next-20230220] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/Florian-Eckert/tty-new-helper-function-tty_get_mget/20230220-232129 base: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty-testing patch link: https://lore.kernel.org/r/20230220152038.3877596-3-fe%40dev.tdt.de patch subject: [PATCH v4 2/2] trigger: ledtrig-tty: add additional modes config: ia64-allyesconfig (https://download.01.org/0day-ci/archive/20230221/202302210235.GfyfYlvF-lkp@intel.com/config) compiler: ia64-linux-gcc (GCC) 12.1.0 reproduce (this is a W=1 build): wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # https://github.com/intel-lab-lkp/linux/commit/8da3a8a2edcad2e4b36fce551cac1961a5cd90a6 git remote add linux-review https://github.com/intel-lab-lkp/linux git fetch --no-tags linux-review Florian-Eckert/tty-new-helper-function-tty_get_mget/20230220-232129 git checkout 8da3a8a2edcad2e4b36fce551cac1961a5cd90a6 # save the config file mkdir build_dir && cp config build_dir/.config COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=ia64 olddefconfig COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=ia64 SHELL=/bin/bash drivers/leds/ If you fix the issue, kindly add following tag where applicable | Reported-by: kernel test robot <lkp@intel.com> | Link: https://lore.kernel.org/oe-kbuild-all/202302210235.GfyfYlvF-lkp@intel.com/ All warnings (new ones prefixed by >>): drivers/leds/trigger/ledtrig-tty.c:15:24: error: 'TTY_LED_RNG' undeclared here (not in a function); did you mean 'TTY_LED_CNT'? 15 | TTY_LED_LAST = TTY_LED_RNG | ^~~~~~~~~~~ | TTY_LED_CNT drivers/leds/trigger/ledtrig-tty.c:33:10: error: array index in initializer not of integer type 33 | [TTY_LED_RNG] = "RNG", // RNG Ring Indicator (RI) | ^~~~~~~~~~~ drivers/leds/trigger/ledtrig-tty.c:33:10: note: (near initialization for 'mode') drivers/leds/trigger/ledtrig-tty.c: In function 'ledtrig_tty_mode_show': drivers/leds/trigger/ledtrig-tty.c:48:34: error: '__TTY_LED_LAST' undeclared (first use in this function); did you mean 'TTY_LED_LAST'? 48 | bool last = i == __TTY_LED_LAST; | ^~~~~~~~~~~~~~ | TTY_LED_LAST drivers/leds/trigger/ledtrig-tty.c:48:34: note: each undeclared identifier is reported only once for each function it appears in >> drivers/leds/trigger/ledtrig-tty.c:50:48: warning: too many arguments for format [-Wformat-extra-args] 50 | len += sysfs_emit_at(buf, len, "%s%s%s", | ^~~~~~~~ drivers/leds/trigger/ledtrig-tty.c: In function 'tty_led_mode_store': drivers/leds/trigger/ledtrig-tty.c:81:38: error: '__TTY_LED_MAX' undeclared (first use in this function); did you mean 'TTY_LED_CAR'? 81 | enum tty_led_mode tty_mode = __TTY_LED_MAX; | ^~~~~~~~~~~~~ | TTY_LED_CAR drivers/leds/trigger/ledtrig-tty.c:88:26: error: '__TTY_LED_LAST' undeclared (first use in this function); did you mean 'TTY_LED_LAST'? 88 | for (i = 0; i <= __TTY_LED_LAST; i++) | ^~~~~~~~~~~~~~ | TTY_LED_LAST >> drivers/leds/trigger/ledtrig-tty.c:89:17: warning: this 'if' clause does not guard... [-Wmisleading-indentation] 89 | if (strncmp(buf, mode[i], size) == 0) | ^~ drivers/leds/trigger/ledtrig-tty.c:91:25: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'if' 91 | break; | ^~~~~ drivers/leds/trigger/ledtrig-tty.c:91:25: error: break statement not within loop or switch >> drivers/leds/trigger/ledtrig-tty.c:81:27: warning: variable 'tty_mode' set but not used [-Wunused-but-set-variable] 81 | enum tty_led_mode tty_mode = __TTY_LED_MAX; | ^~~~~~~~ drivers/leds/trigger/ledtrig-tty.c:80:17: warning: unused variable 'ret' [-Wunused-variable] 80 | ssize_t ret = size; | ^~~ drivers/leds/trigger/ledtrig-tty.c:79:34: warning: unused variable 'trigger_data' [-Wunused-variable] 79 | struct ledtrig_tty_data *trigger_data = led_trigger_get_drvdata(dev); | ^~~~~~~~~~~~ drivers/leds/trigger/ledtrig-tty.c:92:17: error: no return statement in function returning non-void [-Werror=return-type] 92 | } | ^ drivers/leds/trigger/ledtrig-tty.c: At top level: drivers/leds/trigger/ledtrig-tty.c:94:9: error: expected identifier or '(' before 'if' 94 | if (tty_mode > __TTY_LED_LAST) | ^~ drivers/leds/trigger/ledtrig-tty.c:97:20: error: expected declaration specifiers or '...' before '&' token 97 | mutex_lock(&trigger_data->mutex); | ^ drivers/leds/trigger/ledtrig-tty.c:98:21: error: expected '=', ',', ';', 'asm' or '__attribute__' before '->' token 98 | trigger_data->mode = tty_mode; | ^~ drivers/leds/trigger/ledtrig-tty.c:99:22: error: expected declaration specifiers or '...' before '&' token 99 | mutex_unlock(&trigger_data->mutex); | ^ drivers/leds/trigger/ledtrig-tty.c:101:9: error: expected identifier or '(' before 'return' 101 | return ret; | ^~~~~~ drivers/leds/trigger/ledtrig-tty.c:102:1: error: expected identifier or '(' before '}' token 102 | } | ^ cc1: some warnings being treated as errors vim +50 drivers/leds/trigger/ledtrig-tty.c 40 41 static ssize_t ledtrig_tty_mode_show(char *buf, enum tty_led_mode tty_mode) 42 { 43 int len = 0; 44 int i; 45 46 for (i = 0; i <= TTY_LED_LAST; i++) { 47 bool hit = tty_mode == i; 48 bool last = i == __TTY_LED_LAST; 49 > 50 len += sysfs_emit_at(buf, len, "%s%s%s", 51 hit ? "[" : "", 52 mode[i], 53 hit ? "]" : "", 54 last ? "" : " "); 55 } 56 57 len += sysfs_emit_at(buf, len, "\n"); 58 59 return len; 60 } 61 62 static ssize_t tty_led_mode_show(struct device *dev, 63 struct device_attribute *attr, char *buf) 64 { 65 struct ledtrig_tty_data *trigger_data = led_trigger_get_drvdata(dev); 66 enum tty_led_mode tty_mode; 67 68 mutex_lock(&trigger_data->mutex); 69 tty_mode = trigger_data->mode; 70 mutex_unlock(&trigger_data->mutex); 71 72 return ledtrig_tty_mode_show(buf, tty_mode); 73 } 74 75 static ssize_t tty_led_mode_store(struct device *dev, 76 struct device_attribute *attr, const char *buf, 77 size_t size) 78 { 79 struct ledtrig_tty_data *trigger_data = led_trigger_get_drvdata(dev); 80 ssize_t ret = size; > 81 enum tty_led_mode tty_mode = __TTY_LED_MAX; 82 int i; 83 84 /* Check for new line in string*/ 85 if (size > 0 && buf[size - 1] == '\n') 86 size -= 1; 87 88 for (i = 0; i <= __TTY_LED_LAST; i++) > 89 if (strncmp(buf, mode[i], size) == 0) 90 tty_mode = i; 91 break; 92 } 93 94 if (tty_mode > __TTY_LED_LAST) 95 return -EINVAL; 96 97 mutex_lock(&trigger_data->mutex); 98 trigger_data->mode = tty_mode; 99 mutex_unlock(&trigger_data->mutex); 100 101 return ret; 102 } 103 static DEVICE_ATTR_RW(tty_led_mode); 104 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v4 2/2] trigger: ledtrig-tty: add additional modes 2023-02-20 15:20 ` [PATCH v4 2/2] trigger: ledtrig-tty: add additional modes Florian Eckert 2023-02-20 18:22 ` kernel test robot @ 2023-02-20 22:27 ` kernel test robot 1 sibling, 0 replies; 5+ messages in thread From: kernel test robot @ 2023-02-20 22:27 UTC (permalink / raw) To: Florian Eckert, u.kleine-koenig, gregkh, jirislaby, pavel, lee Cc: oe-kbuild-all, linux-kernel, linux-leds, Eckert.Florian Hi Florian, Thank you for the patch! Perhaps something to improve: [auto build test WARNING on tty/tty-testing] [also build test WARNING on tty/tty-next tty/tty-linus pavel-leds/for-next staging/staging-testing staging/staging-next staging/staging-linus linus/master v6.2] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/Florian-Eckert/tty-new-helper-function-tty_get_mget/20230220-232129 base: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty-testing patch link: https://lore.kernel.org/r/20230220152038.3877596-3-fe%40dev.tdt.de patch subject: [PATCH v4 2/2] trigger: ledtrig-tty: add additional modes config: x86_64-allyesconfig (https://download.01.org/0day-ci/archive/20230221/202302210614.4oTMenu2-lkp@intel.com/config) compiler: gcc-11 (Debian 11.3.0-8) 11.3.0 reproduce (this is a W=1 build): # https://github.com/intel-lab-lkp/linux/commit/8da3a8a2edcad2e4b36fce551cac1961a5cd90a6 git remote add linux-review https://github.com/intel-lab-lkp/linux git fetch --no-tags linux-review Florian-Eckert/tty-new-helper-function-tty_get_mget/20230220-232129 git checkout 8da3a8a2edcad2e4b36fce551cac1961a5cd90a6 # save the config file mkdir build_dir && cp config build_dir/.config make W=1 O=build_dir ARCH=x86_64 olddefconfig make W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash drivers/leds/ If you fix the issue, kindly add following tag where applicable | Reported-by: kernel test robot <lkp@intel.com> | Link: https://lore.kernel.org/oe-kbuild-all/202302210614.4oTMenu2-lkp@intel.com/ All warnings (new ones prefixed by >>): drivers/leds/trigger/ledtrig-tty.c:15:24: error: 'TTY_LED_RNG' undeclared here (not in a function); did you mean 'TTY_LED_CNT'? 15 | TTY_LED_LAST = TTY_LED_RNG | ^~~~~~~~~~~ | TTY_LED_CNT drivers/leds/trigger/ledtrig-tty.c:33:10: error: array index in initializer not of integer type 33 | [TTY_LED_RNG] = "RNG", // RNG Ring Indicator (RI) | ^~~~~~~~~~~ drivers/leds/trigger/ledtrig-tty.c:33:10: note: (near initialization for 'mode') drivers/leds/trigger/ledtrig-tty.c: In function 'ledtrig_tty_mode_show': drivers/leds/trigger/ledtrig-tty.c:48:34: error: '__TTY_LED_LAST' undeclared (first use in this function); did you mean 'TTY_LED_LAST'? 48 | bool last = i == __TTY_LED_LAST; | ^~~~~~~~~~~~~~ | TTY_LED_LAST drivers/leds/trigger/ledtrig-tty.c:48:34: note: each undeclared identifier is reported only once for each function it appears in drivers/leds/trigger/ledtrig-tty.c:50:48: warning: too many arguments for format [-Wformat-extra-args] 50 | len += sysfs_emit_at(buf, len, "%s%s%s", | ^~~~~~~~ drivers/leds/trigger/ledtrig-tty.c: In function 'tty_led_mode_store': drivers/leds/trigger/ledtrig-tty.c:81:38: error: '__TTY_LED_MAX' undeclared (first use in this function); did you mean 'TTY_LED_CAR'? 81 | enum tty_led_mode tty_mode = __TTY_LED_MAX; | ^~~~~~~~~~~~~ | TTY_LED_CAR drivers/leds/trigger/ledtrig-tty.c:88:26: error: '__TTY_LED_LAST' undeclared (first use in this function); did you mean 'TTY_LED_LAST'? 88 | for (i = 0; i <= __TTY_LED_LAST; i++) | ^~~~~~~~~~~~~~ | TTY_LED_LAST drivers/leds/trigger/ledtrig-tty.c:89:17: warning: this 'if' clause does not guard... [-Wmisleading-indentation] 89 | if (strncmp(buf, mode[i], size) == 0) | ^~ drivers/leds/trigger/ledtrig-tty.c:91:25: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'if' 91 | break; | ^~~~~ drivers/leds/trigger/ledtrig-tty.c:91:25: error: break statement not within loop or switch drivers/leds/trigger/ledtrig-tty.c:81:27: warning: variable 'tty_mode' set but not used [-Wunused-but-set-variable] 81 | enum tty_led_mode tty_mode = __TTY_LED_MAX; | ^~~~~~~~ >> drivers/leds/trigger/ledtrig-tty.c:80:17: warning: unused variable 'ret' [-Wunused-variable] 80 | ssize_t ret = size; | ^~~ >> drivers/leds/trigger/ledtrig-tty.c:79:34: warning: unused variable 'trigger_data' [-Wunused-variable] 79 | struct ledtrig_tty_data *trigger_data = led_trigger_get_drvdata(dev); | ^~~~~~~~~~~~ drivers/leds/trigger/ledtrig-tty.c:92:17: error: no return statement in function returning non-void [-Werror=return-type] 92 | } | ^ drivers/leds/trigger/ledtrig-tty.c: At top level: drivers/leds/trigger/ledtrig-tty.c:94:9: error: expected identifier or '(' before 'if' 94 | if (tty_mode > __TTY_LED_LAST) | ^~ In file included from include/linux/rhashtable-types.h:14, from include/linux/ipc.h:7, from include/uapi/linux/sem.h:5, from include/linux/sem.h:5, from include/linux/sched.h:15, from include/linux/delay.h:23, from drivers/leds/trigger/ledtrig-tty.c:3: drivers/leds/trigger/ledtrig-tty.c:97:20: error: expected declaration specifiers or '...' before '&' token 97 | mutex_lock(&trigger_data->mutex); | ^ include/linux/mutex.h:187:44: note: in definition of macro 'mutex_lock' 187 | #define mutex_lock(lock) mutex_lock_nested(lock, 0) | ^~~~ include/linux/mutex.h:187:50: error: expected declaration specifiers or '...' before numeric constant 187 | #define mutex_lock(lock) mutex_lock_nested(lock, 0) | ^ drivers/leds/trigger/ledtrig-tty.c:97:9: note: in expansion of macro 'mutex_lock' 97 | mutex_lock(&trigger_data->mutex); | ^~~~~~~~~~ drivers/leds/trigger/ledtrig-tty.c:98:21: error: expected '=', ',', ';', 'asm' or '__attribute__' before '->' token 98 | trigger_data->mode = tty_mode; | ^~ drivers/leds/trigger/ledtrig-tty.c:99:22: error: expected declaration specifiers or '...' before '&' token 99 | mutex_unlock(&trigger_data->mutex); | ^ drivers/leds/trigger/ledtrig-tty.c:101:9: error: expected identifier or '(' before 'return' 101 | return ret; | ^~~~~~ drivers/leds/trigger/ledtrig-tty.c:102:1: error: expected identifier or '(' before '}' token 102 | } | ^ cc1: some warnings being treated as errors vim +/ret +80 drivers/leds/trigger/ledtrig-tty.c 74 75 static ssize_t tty_led_mode_store(struct device *dev, 76 struct device_attribute *attr, const char *buf, 77 size_t size) 78 { > 79 struct ledtrig_tty_data *trigger_data = led_trigger_get_drvdata(dev); > 80 ssize_t ret = size; 81 enum tty_led_mode tty_mode = __TTY_LED_MAX; 82 int i; 83 84 /* Check for new line in string*/ 85 if (size > 0 && buf[size - 1] == '\n') 86 size -= 1; 87 88 for (i = 0; i <= __TTY_LED_LAST; i++) 89 if (strncmp(buf, mode[i], size) == 0) 90 tty_mode = i; > 91 break; 92 } 93 94 if (tty_mode > __TTY_LED_LAST) 95 return -EINVAL; 96 97 mutex_lock(&trigger_data->mutex); 98 trigger_data->mode = tty_mode; 99 mutex_unlock(&trigger_data->mutex); 100 101 return ret; 102 } 103 static DEVICE_ATTR_RW(tty_led_mode); 104 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-02-20 22:28 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2023-02-20 15:20 [PATCH v4 0/2] leds: ledtrig-tty: add tty_led_mode xtension Florian Eckert 2023-02-20 15:20 ` [PATCH v4 1/2] tty: new helper function tty_get_mget Florian Eckert 2023-02-20 15:20 ` [PATCH v4 2/2] trigger: ledtrig-tty: add additional modes Florian Eckert 2023-02-20 18:22 ` kernel test robot 2023-02-20 22:27 ` kernel test robot
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox