From patchwork Sat Jun 17 11:53:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 109656 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2608952vqr; Sun, 18 Jun 2023 12:25:23 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ70g1tchC466fI1fuGLAaVpD+VOsVj7sZ6+/OSgRhTqCbbXW4c627xILMfs4E+M2xrLOmid X-Received: by 2002:a05:6808:2a66:b0:39e:cf28:fd70 with SMTP id fu6-20020a0568082a6600b0039ecf28fd70mr3158211oib.16.1687116323358; Sun, 18 Jun 2023 12:25:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687116323; cv=none; d=google.com; s=arc-20160816; b=KHk7hgOxZf+4hq+MmSsr4bVSoFctkumY4OeLjaZkNhHQlYEzT/Fz2Jl9sLfSRKoDl5 TctIqSBrQ8zPx1WuwHCahMCkW/RqkA/p/viViUHyarRHY2ujNkmrAtDOAjLiX3NSJnWI lJY2IcG4rQAZrWUJESDOlqpl1h0ZTfSpsrVBoyvaJYIo2FmM1HKes70qP3wk+YXwcIlm bMkK0uLIcopC1oKhCu1vHkJI/d7bzK+KBO+K9XTP6s0zoAIncsc0qVNX9JosvhiA5678 Fz+LY0oo9X0kjkqoU1H3SDeeOkQfB6XRxyp67pnnc5q7YLS4URv+ctkgGjX4TqJyNWoL 217Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=guP6wSLsxzWpfvfaaFfXjzJkT5z7hOXmt03lBFrApjw=; b=E3IlwcBIUm1cMNnED1+TXhzJC20/ScZ2eD7CixwVZtzY5g8UdTNn+61q2tLkUyjWdj l+/NLNv9b4/wzxS9hEss2+J5G/1axZtF7Gqvm89bcaBH4560D+x57RxjXwz0U5W0kNmy gDbYD6D/vfUSwrWyHcEoArUL+ZVALxR3hQlGb0bN+jh91uTyY+BxeAnanZIIse3NxVJJ MpGbJWpZ0pLWb37a2z6vkbeG5kpOXKHCSRIc4YH1+usb75SUR35rFiAd6q8/WYELpLoc KlRSDP1YF8YDfIloeQzUQyONkrysEGzVlg8bbDURPBD+ezWjE7F2C8+6x2iHGeRmvITj skCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=Fq8GtGPZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w16-20020a63af10000000b0050bd71e8618si4871290pge.848.2023.06.18.12.25.11; Sun, 18 Jun 2023 12:25:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=Fq8GtGPZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229577AbjFRTYK (ORCPT + 99 others); Sun, 18 Jun 2023 15:24:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39760 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229487AbjFRTYH (ORCPT ); Sun, 18 Jun 2023 15:24:07 -0400 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 31998E44; Sun, 18 Jun 2023 12:24:06 -0700 (PDT) Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-311099fac92so3125689f8f.0; Sun, 18 Jun 2023 12:24:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687116244; x=1689708244; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=guP6wSLsxzWpfvfaaFfXjzJkT5z7hOXmt03lBFrApjw=; b=Fq8GtGPZKF3ZYJfTaXrx+3L+WsIehDT+wcMtSQFAyh2JT7gXt0J/UOZg3EU/bVH5LM VA/hSNo53/OYkxv1QaDiHqUA8st6F3B68kMWPZaL00eguVoGzMtsp1nCW2ZLM6fUjBfh B7QN/5Mm3hD8cjzr3basqbNj+ejxplm5WxdKjB+ANqD4UEpMhpK2i8bNAUBTFj7XnTJn KwsL6ot9WYVsEFU/KuuJxH1G7zkZ/Af52RARhaEpQ1IlbJH8XCvR6h6kRuGvMGyogmPa fWoA7DbNwAAOv/rcZBF68XrKlAAZf5xkQywEWsZlhabQ0xP343N8rrygBA1K5MT9htA5 HsnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687116244; x=1689708244; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=guP6wSLsxzWpfvfaaFfXjzJkT5z7hOXmt03lBFrApjw=; b=Js1Thxq4X69TiJrUzJheeTIpBjmB6sIFIHHDTMmnCM5sBIDWRUHX6AkTTKilVpyOI0 vmtodV7x/54A8OXf7+5AlYHXJPZn6N6PHFt7F++mFgq4MoIataCPjRMAw8/K8HAdNSq6 lScgzntRUuvMabTrHD3vxI2lm8LsfR67yK47GHJYRz81OeHWZMPMTlO6C/eWb+Yd1ma0 OceG/bXkbte30zTyUuxdUtqEmw3faulnNCvLoRayX+ka/fxohLtIQ8iWgL/7Wrnm6Q58 I3WCHV/EYiyv640tqe4e37rtCQENvX2cLgK3ZwYGynZCQ3KrEbjJX/MbkjGUiaUZZDwS gYFQ== X-Gm-Message-State: AC+VfDyZDvHGG+CDu4k1AJCC5PMPzbbxsFRzg+4gKe3xUN95Volt9ocr xgydv1ZciRCcLOUXzUfQBJY= X-Received: by 2002:adf:f203:0:b0:2f9:4fe9:74bb with SMTP id p3-20020adff203000000b002f94fe974bbmr6787496wro.40.1687116244321; Sun, 18 Jun 2023 12:24:04 -0700 (PDT) Received: from localhost.localdomain (93-34-93-173.ip49.fastwebnet.it. [93.34.93.173]) by smtp.googlemail.com with ESMTPSA id h12-20020adffd4c000000b0031130b9b173sm4065871wrs.34.2023.06.18.12.24.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Jun 2023 12:24:04 -0700 (PDT) From: Christian Marangi To: Pavel Machek , Lee Jones , Christian Marangi , Andrew Lunn , "David S. Miller" , Yang Li , linux-leds@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [net-next PATCH v4 1/3] leds: trigger: netdev: add additional specific link speed mode Date: Sat, 17 Jun 2023 13:53:53 +0200 Message-Id: <20230617115355.22868-2-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230617115355.22868-1-ansuelsmth@gmail.com> References: <20230617115355.22868-1-ansuelsmth@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=BAYES_00,DATE_IN_PAST_24_48, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769069685313801141?= X-GMAIL-MSGID: =?utf-8?q?1769069685313801141?= Add additional modes for specific link speed. Use ethtool APIs to get the current link speed and enable the LED accordingly. Under netdev event handler the rtnl lock is already held and is not needed to be set to access ethtool APIs. This is especially useful for PHY and Switch that supports LEDs hw control for specific link speed. (example scenario a PHY that have 2 LED connected one green and one orange where the green is turned on with 1000mbps speed and orange is turned on with 10mpbs speed) On mode set from sysfs we check if we have enabled split link speed mode and reject enabling generic link mode to prevent wrong and redundant configuration. Rework logic on the set baseline state to support these new modes to select if we need to turn on or off the LED. Add additional modes: - link_10: Turn on LED when link speed is 10mbps - link_100: Turn on LED when link speed is 100mbps - link_1000: Turn on LED when link speed is 1000mbps Signed-off-by: Christian Marangi Reviewed-by: Andrew Lunn --- drivers/leds/trigger/ledtrig-netdev.c | 80 +++++++++++++++++++++++---- include/linux/leds.h | 3 + 2 files changed, 73 insertions(+), 10 deletions(-) diff --git a/drivers/leds/trigger/ledtrig-netdev.c b/drivers/leds/trigger/ledtrig-netdev.c index c9b040bacbb0..8e6132f069af 100644 --- a/drivers/leds/trigger/ledtrig-netdev.c +++ b/drivers/leds/trigger/ledtrig-netdev.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -21,6 +22,7 @@ #include #include #include +#include #include #include "../leds.h" @@ -52,6 +54,8 @@ struct led_netdev_data { unsigned int last_activity; unsigned long mode; + int link_speed; + bool carrier_link_up; bool hw_control; }; @@ -77,7 +81,24 @@ static void set_baseline_state(struct led_netdev_data *trigger_data) if (!trigger_data->carrier_link_up) { led_set_brightness(led_cdev, LED_OFF); } else { + bool blink_on = false; + if (test_bit(TRIGGER_NETDEV_LINK, &trigger_data->mode)) + blink_on = true; + + if (test_bit(TRIGGER_NETDEV_LINK_10, &trigger_data->mode) && + trigger_data->link_speed == SPEED_10) + blink_on = true; + + if (test_bit(TRIGGER_NETDEV_LINK_100, &trigger_data->mode) && + trigger_data->link_speed == SPEED_100) + blink_on = true; + + if (test_bit(TRIGGER_NETDEV_LINK_1000, &trigger_data->mode) && + trigger_data->link_speed == SPEED_1000) + blink_on = true; + + if (blink_on) led_set_brightness(led_cdev, led_cdev->blink_brightness); else @@ -161,6 +182,18 @@ static bool can_hw_control(struct led_netdev_data *trigger_data) return true; } +static void get_device_state(struct led_netdev_data *trigger_data) +{ + struct ethtool_link_ksettings cmd; + + trigger_data->carrier_link_up = netif_carrier_ok(trigger_data->net_dev); + if (!trigger_data->carrier_link_up) + return; + + if (!__ethtool_get_link_ksettings(trigger_data->net_dev, &cmd)) + trigger_data->link_speed = cmd.base.speed; +} + static ssize_t device_name_show(struct device *dev, struct device_attribute *attr, char *buf) { @@ -196,8 +229,12 @@ static int set_device_name(struct led_netdev_data *trigger_data, dev_get_by_name(&init_net, trigger_data->device_name); trigger_data->carrier_link_up = false; - if (trigger_data->net_dev != NULL) - trigger_data->carrier_link_up = netif_carrier_ok(trigger_data->net_dev); + trigger_data->link_speed = SPEED_UNKNOWN; + if (trigger_data->net_dev != NULL) { + rtnl_lock(); + get_device_state(trigger_data); + rtnl_unlock(); + } trigger_data->last_activity = 0; @@ -234,6 +271,9 @@ static ssize_t netdev_led_attr_show(struct device *dev, char *buf, switch (attr) { case TRIGGER_NETDEV_LINK: + case TRIGGER_NETDEV_LINK_10: + case TRIGGER_NETDEV_LINK_100: + case TRIGGER_NETDEV_LINK_1000: case TRIGGER_NETDEV_TX: case TRIGGER_NETDEV_RX: bit = attr; @@ -249,7 +289,7 @@ static ssize_t netdev_led_attr_store(struct device *dev, const char *buf, size_t size, enum led_trigger_netdev_modes attr) { struct led_netdev_data *trigger_data = led_trigger_get_drvdata(dev); - unsigned long state; + unsigned long state, mode = trigger_data->mode; int ret; int bit; @@ -259,6 +299,9 @@ static ssize_t netdev_led_attr_store(struct device *dev, const char *buf, switch (attr) { case TRIGGER_NETDEV_LINK: + case TRIGGER_NETDEV_LINK_10: + case TRIGGER_NETDEV_LINK_100: + case TRIGGER_NETDEV_LINK_1000: case TRIGGER_NETDEV_TX: case TRIGGER_NETDEV_RX: bit = attr; @@ -267,13 +310,20 @@ static ssize_t netdev_led_attr_store(struct device *dev, const char *buf, return -EINVAL; } - cancel_delayed_work_sync(&trigger_data->work); - if (state) - set_bit(bit, &trigger_data->mode); + set_bit(bit, &mode); else - clear_bit(bit, &trigger_data->mode); + clear_bit(bit, &mode); + + if (test_bit(TRIGGER_NETDEV_LINK, &mode) && + (test_bit(TRIGGER_NETDEV_LINK_10, &mode) || + test_bit(TRIGGER_NETDEV_LINK_100, &mode) || + test_bit(TRIGGER_NETDEV_LINK_1000, &mode))) + return -EINVAL; + + cancel_delayed_work_sync(&trigger_data->work); + trigger_data->mode = mode; trigger_data->hw_control = can_hw_control(trigger_data); set_baseline_state(trigger_data); @@ -295,6 +345,9 @@ static ssize_t netdev_led_attr_store(struct device *dev, const char *buf, static DEVICE_ATTR_RW(trigger_name) DEFINE_NETDEV_TRIGGER(link, TRIGGER_NETDEV_LINK); +DEFINE_NETDEV_TRIGGER(link_10, TRIGGER_NETDEV_LINK_10); +DEFINE_NETDEV_TRIGGER(link_100, TRIGGER_NETDEV_LINK_100); +DEFINE_NETDEV_TRIGGER(link_1000, TRIGGER_NETDEV_LINK_1000); DEFINE_NETDEV_TRIGGER(tx, TRIGGER_NETDEV_TX); DEFINE_NETDEV_TRIGGER(rx, TRIGGER_NETDEV_RX); @@ -338,6 +391,9 @@ static DEVICE_ATTR_RW(interval); static struct attribute *netdev_trig_attrs[] = { &dev_attr_device_name.attr, &dev_attr_link.attr, + &dev_attr_link_10.attr, + &dev_attr_link_100.attr, + &dev_attr_link_1000.attr, &dev_attr_rx.attr, &dev_attr_tx.attr, &dev_attr_interval.attr, @@ -368,9 +424,10 @@ static int netdev_trig_notify(struct notifier_block *nb, mutex_lock(&trigger_data->lock); trigger_data->carrier_link_up = false; + trigger_data->link_speed = SPEED_UNKNOWN; switch (evt) { case NETDEV_CHANGENAME: - trigger_data->carrier_link_up = netif_carrier_ok(dev); + get_device_state(trigger_data); fallthrough; case NETDEV_REGISTER: dev_put(trigger_data->net_dev); @@ -383,7 +440,7 @@ static int netdev_trig_notify(struct notifier_block *nb, break; case NETDEV_UP: case NETDEV_CHANGE: - trigger_data->carrier_link_up = netif_carrier_ok(dev); + get_device_state(trigger_data); break; } @@ -426,7 +483,10 @@ static void netdev_trig_work(struct work_struct *work) if (trigger_data->last_activity != new_activity) { led_stop_software_blink(trigger_data->led_cdev); - invert = test_bit(TRIGGER_NETDEV_LINK, &trigger_data->mode); + invert = test_bit(TRIGGER_NETDEV_LINK, &trigger_data->mode) || + test_bit(TRIGGER_NETDEV_LINK_10, &trigger_data->mode) || + test_bit(TRIGGER_NETDEV_LINK_100, &trigger_data->mode) || + test_bit(TRIGGER_NETDEV_LINK_1000, &trigger_data->mode); interval = jiffies_to_msecs( atomic_read(&trigger_data->interval)); /* base state is ON (link present) */ diff --git a/include/linux/leds.h b/include/linux/leds.h index 4b3d8bda1fff..39f15b1e772c 100644 --- a/include/linux/leds.h +++ b/include/linux/leds.h @@ -582,6 +582,9 @@ static inline void *led_get_trigger_data(struct led_classdev *led_cdev) /* Trigger specific enum */ enum led_trigger_netdev_modes { TRIGGER_NETDEV_LINK = 0, + TRIGGER_NETDEV_LINK_10, + TRIGGER_NETDEV_LINK_100, + TRIGGER_NETDEV_LINK_1000, TRIGGER_NETDEV_TX, TRIGGER_NETDEV_RX, From patchwork Sat Jun 17 11:53:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 109657 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2618845vqr; Sun, 18 Jun 2023 13:00:30 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6AdYBSLfJrWS6X/V4BkZHjNKLsokFMy11OMzxy+lyX8NYXoKXoh5cCzR4BZnxe/F+WXRJw X-Received: by 2002:aca:b01:0:b0:39e:cefb:62f7 with SMTP id 1-20020aca0b01000000b0039ecefb62f7mr3672952oil.17.1687118429697; Sun, 18 Jun 2023 13:00:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687118429; cv=none; d=google.com; s=arc-20160816; b=IyPqxBDNDkrKFvlAGT9A3C3MpoLu2nqev1CJ4H4sZj3bUhimNeI7knqOF3nO8cUOdI lNCpOeXqZfsDyHYXIMK172CdSWipRq9nB4jN9rAxcdRYTjPK3OSpU33kkmVn9oDdOppn Wpbp1a1sXm3rSsetb59dN+bPx17dkLmv8+2CEhVh/neMZfm0LEZb5TuEPGvUrw8PiD4s gyQPycn0neDogoaxvoQPNC+P7hEEx5tf4uIkZm+r1ccLiBggT6FRPkw1HSJMsAJ1BYSf W3+GsqOTAZFzyfI6rjCDsgikMyiWij4r5ZnBvFUwkVctpVyrKEyfXGwHrrMmluz96GAM xb8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=ZEXma0Sl180nUlDy6+RTrJLABcn2sDvoD62d8qplRAU=; b=Qyt+fzWbEyUEaf2UNCZWpa94JVLIHnxs4TOWCuAzyZbWdEv19m5w4TVo+8jNwZSL08 H4orZoPuo64bkF4CJ2mmWtr2be4qbqDU5mhHi9QLX4vbunRoTN0D/Pb5WkgZIZNcRLGx nUfDe1r2cMeLpNZ35N3RNdlh93CbauY5N/LgoxHhl237r3OTeRBt5DN6wmnHrRMWuckB Bl6tc4XkEiXvGjwDhNzBUXAeWh/MUnB+yYCw0/UwsZEUltFvcp1r3GJPApQUgpgujVlw W49z6mpd7lhOxSt9DR22fe12NfmDaC4u4O7KjXB+bJ2UbCWNpENVP+OkKdcDVwVe/RT/ WxcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=XZ5hLMCA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bv10-20020a632e0a000000b0054f93b605cdsi14242132pgb.37.2023.06.18.13.00.05; Sun, 18 Jun 2023 13:00:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=XZ5hLMCA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229584AbjFRTYN (ORCPT + 99 others); Sun, 18 Jun 2023 15:24:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39768 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229566AbjFRTYI (ORCPT ); Sun, 18 Jun 2023 15:24:08 -0400 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40C7CFC; Sun, 18 Jun 2023 12:24:07 -0700 (PDT) Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-31109cd8d8cso2331275f8f.2; Sun, 18 Jun 2023 12:24:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687116246; x=1689708246; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ZEXma0Sl180nUlDy6+RTrJLABcn2sDvoD62d8qplRAU=; b=XZ5hLMCAYHBMPQznv/Xp3G1BsWCfm/1kAYr+CoOHq+aL8GxSNszlAFqoiYRvMwGdh7 ghHX9KKRGiqPfW5TsyhD20wNdmbBdXeoha6TvD4GhGBYi8NjzY2BxmkUxlqfz/yazRET +S6Mu401gFqYe7DC1ZF+NKHDsAQjVHClGl7XZQYczV+MuO7L5dBwYa86X7TgFrCYW3Um xeVZabIRlZ6Zx28YC5pCttJXSjIjegLOhCS27NVU3KSNRsn4kuVhWlRxiAL4kr+m0WXh eNOOvq6ltDaQbOSFW2MqhQ5eo1TruyawPP6DowVgQnTBB4ixcCGEDiNlFyNAXua1NMgB qJMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687116246; x=1689708246; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZEXma0Sl180nUlDy6+RTrJLABcn2sDvoD62d8qplRAU=; b=bzp/DwxQtcIGRjjvF89f9+ausL15mGt0xfizJZeiLg+Hbg50aSgbuFAkPBvMlvcHB8 9epcZSEwx4dWIpZXwRcJXnSS0bid52NdeY40t4XayMJQLWagkEZ97kIXL1Pvnrqek5Kh J3L6+wrU7geMP2i1tcxeP+PxVw4509+qjcsUpnhoyatD1m3fyWOl8ACuy3UZSYQ9aJvW dTZcKcEOY0n7xVxjNSElDN+Y6jjYsh7vxI4pwZ7POUdWGKuj68A93b7vuwN7i3JcaM67 /b2Yzvph1QAwB/NVtUNGWiDsLLH8oMOxpKkOhBjaAndYKQTzRKcXWlyxyTDaRgWNsI7b 2IuA== X-Gm-Message-State: AC+VfDyTBnuJ0V5+P+L7+wcJrBYcW6hqrdqcI6pgXO70J/WaLm5nDBk8 Qh9lDBdhoCO54OGZPv1ei5N++DIn6X0= X-Received: by 2002:adf:f9c4:0:b0:30a:e70d:9e73 with SMTP id w4-20020adff9c4000000b0030ae70d9e73mr6262358wrr.33.1687116245399; Sun, 18 Jun 2023 12:24:05 -0700 (PDT) Received: from localhost.localdomain (93-34-93-173.ip49.fastwebnet.it. [93.34.93.173]) by smtp.googlemail.com with ESMTPSA id h12-20020adffd4c000000b0031130b9b173sm4065871wrs.34.2023.06.18.12.24.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Jun 2023 12:24:04 -0700 (PDT) From: Christian Marangi To: Pavel Machek , Lee Jones , Christian Marangi , Andrew Lunn , "David S. Miller" , Yang Li , linux-leds@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [net-next PATCH v4 2/3] leds: trigger: netdev: add additional specific link duplex mode Date: Sat, 17 Jun 2023 13:53:54 +0200 Message-Id: <20230617115355.22868-3-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230617115355.22868-1-ansuelsmth@gmail.com> References: <20230617115355.22868-1-ansuelsmth@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=BAYES_00,DATE_IN_PAST_24_48, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769071894500471818?= X-GMAIL-MSGID: =?utf-8?q?1769071894500471818?= Add additional modes for specific link duplex. Use ethtool APIs to get the current link duplex and enable the LED accordingly. Under netdev event handler the rtnl lock is already held and is not needed to be set to access ethtool APIs. This is especially useful for PHY and Switch that supports LEDs hw control for specific link duplex. Add additional modes: - half_duplex: Turn on LED when link is half duplex - full_duplex: Turn on LED when link is full duplex Signed-off-by: Christian Marangi Reviewed-by: Andrew Lunn --- drivers/leds/trigger/ledtrig-netdev.c | 27 +++++++++++++++++++++++++-- include/linux/leds.h | 2 ++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/drivers/leds/trigger/ledtrig-netdev.c b/drivers/leds/trigger/ledtrig-netdev.c index 8e6132f069af..90b682d49998 100644 --- a/drivers/leds/trigger/ledtrig-netdev.c +++ b/drivers/leds/trigger/ledtrig-netdev.c @@ -55,6 +55,7 @@ struct led_netdev_data { unsigned long mode; int link_speed; + u8 duplex; bool carrier_link_up; bool hw_control; @@ -98,6 +99,14 @@ static void set_baseline_state(struct led_netdev_data *trigger_data) trigger_data->link_speed == SPEED_1000) blink_on = true; + if (test_bit(TRIGGER_NETDEV_HALF_DUPLEX, &trigger_data->mode) && + trigger_data->duplex == DUPLEX_HALF) + blink_on = true; + + if (test_bit(TRIGGER_NETDEV_FULL_DUPLEX, &trigger_data->mode) && + trigger_data->duplex == DUPLEX_FULL) + blink_on = true; + if (blink_on) led_set_brightness(led_cdev, led_cdev->blink_brightness); @@ -190,8 +199,10 @@ static void get_device_state(struct led_netdev_data *trigger_data) if (!trigger_data->carrier_link_up) return; - if (!__ethtool_get_link_ksettings(trigger_data->net_dev, &cmd)) + if (!__ethtool_get_link_ksettings(trigger_data->net_dev, &cmd)) { trigger_data->link_speed = cmd.base.speed; + trigger_data->duplex = cmd.base.duplex; + } } static ssize_t device_name_show(struct device *dev, @@ -230,6 +241,7 @@ static int set_device_name(struct led_netdev_data *trigger_data, trigger_data->carrier_link_up = false; trigger_data->link_speed = SPEED_UNKNOWN; + trigger_data->duplex = DUPLEX_UNKNOWN; if (trigger_data->net_dev != NULL) { rtnl_lock(); get_device_state(trigger_data); @@ -274,6 +286,8 @@ static ssize_t netdev_led_attr_show(struct device *dev, char *buf, case TRIGGER_NETDEV_LINK_10: case TRIGGER_NETDEV_LINK_100: case TRIGGER_NETDEV_LINK_1000: + case TRIGGER_NETDEV_HALF_DUPLEX: + case TRIGGER_NETDEV_FULL_DUPLEX: case TRIGGER_NETDEV_TX: case TRIGGER_NETDEV_RX: bit = attr; @@ -302,6 +316,8 @@ static ssize_t netdev_led_attr_store(struct device *dev, const char *buf, case TRIGGER_NETDEV_LINK_10: case TRIGGER_NETDEV_LINK_100: case TRIGGER_NETDEV_LINK_1000: + case TRIGGER_NETDEV_HALF_DUPLEX: + case TRIGGER_NETDEV_FULL_DUPLEX: case TRIGGER_NETDEV_TX: case TRIGGER_NETDEV_RX: bit = attr; @@ -348,6 +364,8 @@ DEFINE_NETDEV_TRIGGER(link, TRIGGER_NETDEV_LINK); DEFINE_NETDEV_TRIGGER(link_10, TRIGGER_NETDEV_LINK_10); DEFINE_NETDEV_TRIGGER(link_100, TRIGGER_NETDEV_LINK_100); DEFINE_NETDEV_TRIGGER(link_1000, TRIGGER_NETDEV_LINK_1000); +DEFINE_NETDEV_TRIGGER(half_duplex, TRIGGER_NETDEV_HALF_DUPLEX); +DEFINE_NETDEV_TRIGGER(full_duplex, TRIGGER_NETDEV_FULL_DUPLEX); DEFINE_NETDEV_TRIGGER(tx, TRIGGER_NETDEV_TX); DEFINE_NETDEV_TRIGGER(rx, TRIGGER_NETDEV_RX); @@ -394,6 +412,8 @@ static struct attribute *netdev_trig_attrs[] = { &dev_attr_link_10.attr, &dev_attr_link_100.attr, &dev_attr_link_1000.attr, + &dev_attr_full_duplex.attr, + &dev_attr_half_duplex.attr, &dev_attr_rx.attr, &dev_attr_tx.attr, &dev_attr_interval.attr, @@ -425,6 +445,7 @@ static int netdev_trig_notify(struct notifier_block *nb, trigger_data->carrier_link_up = false; trigger_data->link_speed = SPEED_UNKNOWN; + trigger_data->duplex = DUPLEX_UNKNOWN; switch (evt) { case NETDEV_CHANGENAME: get_device_state(trigger_data); @@ -486,7 +507,9 @@ static void netdev_trig_work(struct work_struct *work) invert = test_bit(TRIGGER_NETDEV_LINK, &trigger_data->mode) || test_bit(TRIGGER_NETDEV_LINK_10, &trigger_data->mode) || test_bit(TRIGGER_NETDEV_LINK_100, &trigger_data->mode) || - test_bit(TRIGGER_NETDEV_LINK_1000, &trigger_data->mode); + test_bit(TRIGGER_NETDEV_LINK_1000, &trigger_data->mode) || + test_bit(TRIGGER_NETDEV_HALF_DUPLEX, &trigger_data->mode) || + test_bit(TRIGGER_NETDEV_FULL_DUPLEX, &trigger_data->mode); interval = jiffies_to_msecs( atomic_read(&trigger_data->interval)); /* base state is ON (link present) */ diff --git a/include/linux/leds.h b/include/linux/leds.h index 39f15b1e772c..7d428100b42b 100644 --- a/include/linux/leds.h +++ b/include/linux/leds.h @@ -585,6 +585,8 @@ enum led_trigger_netdev_modes { TRIGGER_NETDEV_LINK_10, TRIGGER_NETDEV_LINK_100, TRIGGER_NETDEV_LINK_1000, + TRIGGER_NETDEV_HALF_DUPLEX, + TRIGGER_NETDEV_FULL_DUPLEX, TRIGGER_NETDEV_TX, TRIGGER_NETDEV_RX, From patchwork Sat Jun 17 11:53:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 109659 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2619071vqr; Sun, 18 Jun 2023 13:00:58 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7o5evAqgPMywLN9XXMOIynVH9IZQMV9DTWOwOZj1eak1FzcSS7F9B3kxFzOFH55KOeKCQg X-Received: by 2002:a05:6870:3895:b0:192:5cba:4c10 with SMTP id y21-20020a056870389500b001925cba4c10mr5826677oan.40.1687118458568; Sun, 18 Jun 2023 13:00:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687118458; cv=none; d=google.com; s=arc-20160816; b=sOggvPILTmlOEDFk0R0oDYytxgD+6s6dPilT7csgum2zTFdkd8gxk2iH2RZlQUI0Vp MnA2HVdAdRPd05nVO/7TPt3HvZzG6HpKSpSb0pTiTXX6qx+gTSCAPcgidtdsbR0Ul14O VYpjBkexpfIrIiaY8CX8I8u7eUtOejHTaz1tyMfof2aqJuMDoOOMlp+bDpWPTmQ7DVmD O1kZjwNmuUWsIom9M/0KW+G+Rpr1haQYk0CftstzIGVWA+G6RCRGcFo4VqS49HVTtlqn zkzEJnLPhP8bXctz/M7AfwhxrY20RnQ4RXFpuqlK388pjSWvQqTRj4MMrcy5kXRDw92B tMiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=XnGtLq47RSbCF72VtOzJ7Ool5zSf+yqusBBJ8SQYN/s=; b=UjZzzyEhLFp5ADwVNumeTub5VTaXmVl8ZnD5wf1J4U9uZ5Z8raECJQvSAPPDsX8T6t ytXyidCq6VOaf0tpWMQixzSO4qU2+Of+ajiJbS9Cp738pWaMoWT0o4QP2yrgsFycYUK2 hh0LYFBW7CMCvr3Rs+R4uqieh90pZDEf1UuKQCM5yQT1JqQffh8GPPJ6Etu+Xi7GJxAF 36uID0SjH7/asE1MXklHGuW4ZsbHgnVyCkBY+YiXes3KKtTAe1Ft3dH48vYWee7IsaTE LsiGE48Wk/ijeSm/1SQd6QeOoT0JTVX260FU0oI752KYKLUraCYh5N/VuzONRDWQIeX1 /GGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=ELkiWwvp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bv10-20020a632e0a000000b0054f93b605cdsi14242132pgb.37.2023.06.18.13.00.44; Sun, 18 Jun 2023 13:00:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=ELkiWwvp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229623AbjFRTYQ (ORCPT + 99 others); Sun, 18 Jun 2023 15:24:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39776 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229472AbjFRTYJ (ORCPT ); Sun, 18 Jun 2023 15:24:09 -0400 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5F3E5E44; Sun, 18 Jun 2023 12:24:08 -0700 (PDT) Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-31121494630so3064714f8f.3; Sun, 18 Jun 2023 12:24:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687116247; x=1689708247; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=XnGtLq47RSbCF72VtOzJ7Ool5zSf+yqusBBJ8SQYN/s=; b=ELkiWwvpH1jFwl2apnbhr0fwC1OCRGr3IjlkQTnIJLS8DM+RHXIrr0AwAzY++7zVve TzTYdbVquMiAWxZODc/Kq4W19AcjH8xURSQPuBDaUQ8LQrGjvl3zNdd9XzGzeJM+FKeS OJhqoUPydDjD1ADSPl99rumO4knlyv2FJuu//NTfdKlL6aYTDq0QirEE8CzxjX52XPWe mIdt09gcgzvv7AlLQMi6Tc9DHolDcePOa5L9IjQZRtqveggD7QDrp9b2SPRUkkN459Qa X1lVc2Z0ZbMtJuzX14USS8E2amLsZgpo5qEcBFiomFGF1eCBfBQgeiVye/ZyjIidSi+w 1RVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687116247; x=1689708247; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XnGtLq47RSbCF72VtOzJ7Ool5zSf+yqusBBJ8SQYN/s=; b=dYabA/V1W+JueuJAz2kkWMBhfsNDKEYFgdGBJfb4TwD/q2+gk7pS1QmA+qazPm6qZ7 IlOTMWRq+BWbwCh4AoLATuW6a+7bzYgH3PqSuqExMpSLNYcyHijMRp9a60Vn+TtKNiR1 YIIlhJjCpV9sV8zlxEslB0to1qf6yK4t3IokZdHS4zx/mWG8XuH2BG9eBrPkNW+CkfDQ 2A6Ew9mWqJ+80a0uGBXZwaLJUAZ6bUTvYmTJVBtFgWzb2efJvC6cs92DGhDpvGmjE5Sw Rsctk5fp4GxUYGC9Kq8OcV53LA2kP5rCa04CuLtoBn/MbO0+uo0YPAI7hLNYwxjl2mNr 7DiA== X-Gm-Message-State: AC+VfDw26sx+59OlhDh3PiX0nxWPQbXAkaSi/PPfbeKiuwKCqJ8W7nK4 UptCZXIbzUe1pa19TVF1TsM= X-Received: by 2002:a5d:4c49:0:b0:307:9702:dfc8 with SMTP id n9-20020a5d4c49000000b003079702dfc8mr6642797wrt.48.1687116246447; Sun, 18 Jun 2023 12:24:06 -0700 (PDT) Received: from localhost.localdomain (93-34-93-173.ip49.fastwebnet.it. [93.34.93.173]) by smtp.googlemail.com with ESMTPSA id h12-20020adffd4c000000b0031130b9b173sm4065871wrs.34.2023.06.18.12.24.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Jun 2023 12:24:05 -0700 (PDT) From: Christian Marangi To: Pavel Machek , Lee Jones , Christian Marangi , Andrew Lunn , "David S. Miller" , Yang Li , linux-leds@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [net-next PATCH v4 3/3] leds: trigger: netdev: expose hw_control status via sysfs Date: Sat, 17 Jun 2023 13:53:55 +0200 Message-Id: <20230617115355.22868-4-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230617115355.22868-1-ansuelsmth@gmail.com> References: <20230617115355.22868-1-ansuelsmth@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=BAYES_00,DATE_IN_PAST_24_48, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769071924874482708?= X-GMAIL-MSGID: =?utf-8?q?1769071924874482708?= Expose hw_control status via sysfs for the netdev trigger to give userspace better understanding of the current state of the trigger and the LED. Signed-off-by: Christian Marangi Reviewed-by: Andrew Lunn --- drivers/leds/trigger/ledtrig-netdev.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/leds/trigger/ledtrig-netdev.c b/drivers/leds/trigger/ledtrig-netdev.c index 90b682d49998..a550a1895642 100644 --- a/drivers/leds/trigger/ledtrig-netdev.c +++ b/drivers/leds/trigger/ledtrig-netdev.c @@ -406,6 +406,16 @@ static ssize_t interval_store(struct device *dev, static DEVICE_ATTR_RW(interval); +static ssize_t hw_control_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct led_netdev_data *trigger_data = led_trigger_get_drvdata(dev); + + return sprintf(buf, "%d\n", trigger_data->hw_control); +} + +static DEVICE_ATTR_RO(hw_control); + static struct attribute *netdev_trig_attrs[] = { &dev_attr_device_name.attr, &dev_attr_link.attr, @@ -417,6 +427,7 @@ static struct attribute *netdev_trig_attrs[] = { &dev_attr_rx.attr, &dev_attr_tx.attr, &dev_attr_interval.attr, + &dev_attr_hw_control.attr, NULL }; ATTRIBUTE_GROUPS(netdev_trig);