From patchwork Fri Jun 9 13:51:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 691286 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 0B665C83003 for ; Fri, 9 Jun 2023 13:51:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240143AbjFINvT (ORCPT ); Fri, 9 Jun 2023 09:51:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57944 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229969AbjFINvQ (ORCPT ); Fri, 9 Jun 2023 09:51:16 -0400 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0DBF230FE; Fri, 9 Jun 2023 06:51:13 -0700 (PDT) Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-3f6e68cc738so13841885e9.1; Fri, 09 Jun 2023 06:51:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686318671; x=1688910671; 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=m4tE0ixG9sqs6aNXbUxazOE/cyIRGnmIyM4kgiUq+vs=; b=V3V9NaCpgdRHYcBEP6XgaaySravagZXfbIGhIoRGAkBBpdLvUhqEOA10SzMCpiLJrN 5QgI3PhkpfLXHrIaohHCegvLuwScRoiW6ubPjvBC7li9BYiE34/t2WpeidDkJ+JLMDws aAI8rkIFXPxZmHXsKhlyDD0G7DiBJP2dSLYZKx18VQSOJy00+icS9DKvy/DeCz0TpRMR AqUEDJdLT5rj6V9JQU+RoBBCxV0/RDj7YSjwAbvT5iASkoW59ZNnXg6jaP2InH8p82Mh sMNaU6DPe93TpEnWZK/exM8baS7tzRvVQ0mYU6cXujVqeRgxo0PZ1rpZ94dSrNkYlCaj rCnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686318671; x=1688910671; 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=m4tE0ixG9sqs6aNXbUxazOE/cyIRGnmIyM4kgiUq+vs=; b=EsRushqTB9849idsPUb1GDbv7hkGPFHsASNlXZx9Pj2eV514qh1ac6kp54qBCKyJiz hxSnCZf2JAp1WknDBc3AINCeUINblafM/S7Cd8Byj33pOzIcwyQgrTbnV1k7H3IHD4sT /8uI8ZkbcCk0qR/7ZhsZTffAP21RKGSE0f5Qtxo+LsqY4Ls4gXBdgU+UB/NON88DFyng io5VuPLGXbyZ9PgFZqIXbM3t0xRoHbXBopJ8OqqHU9a/XU/6QpkpSIfrJdt6+LhYRrQs DaOl5T8HohPZom14r7UXQ41IjqLzbmpyC27YGpqwx/97/IXxNgCTLltxOLbr80CvpLFL 5Xsg== X-Gm-Message-State: AC+VfDyqFwFWJnQkRIl9PD+vvn1sFEqkOMROk8FZiYaJowh2OInXjB9S kfhKRAVS9KcRj0Hs/LBPPrw= X-Google-Smtp-Source: ACHHUZ5Prxwipg2bSnx3v+jjMbOAVYsYP6X25Ot1B0lU/9NOLLHBKpwMNMJZs50tHmsyU277HV7hRg== X-Received: by 2002:a05:600c:ac6:b0:3f6:ffe:9ef1 with SMTP id c6-20020a05600c0ac600b003f60ffe9ef1mr938272wmr.36.1686318670935; Fri, 09 Jun 2023 06:51:10 -0700 (PDT) Received: from localhost.localdomain (93-34-93-173.ip49.fastwebnet.it. [93.34.93.173]) by smtp.googlemail.com with ESMTPSA id l15-20020adff48f000000b003078cd719ffsm4533962wro.95.2023.06.09.06.51.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jun 2023 06:51:10 -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 Subject: [PATCH 1/3] leds: trigger: netdev: add additional specific link speed mode Date: Fri, 9 Jun 2023 15:51:01 +0200 Message-Id: <20230609135103.14221-2-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230609135103.14221-1-ansuelsmth@gmail.com> References: <20230609135103.14221-1-ansuelsmth@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-leds@vger.kernel.org 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 --- drivers/leds/trigger/ledtrig-netdev.c | 84 ++++++++++++++++++++++++--- include/linux/leds.h | 3 + 2 files changed, 80 insertions(+), 7 deletions(-) diff --git a/drivers/leds/trigger/ledtrig-netdev.c b/drivers/leds/trigger/ledtrig-netdev.c index c9b040bacbb0..f20d5168710a 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; + u32 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 @@ -196,9 +217,21 @@ 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->link_speed = 0; + if (trigger_data->net_dev != NULL) { + struct ethtool_link_ksettings cmd; + trigger_data->carrier_link_up = netif_carrier_ok(trigger_data->net_dev); + if (trigger_data->carrier_link_up) { + rtnl_lock(); + __ethtool_get_link_ksettings(trigger_data->net_dev, &cmd); + rtnl_unlock(); + + trigger_data->link_speed = cmd.base.speed; + } + } + trigger_data->last_activity = 0; set_baseline_state(trigger_data); @@ -234,6 +267,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 +285,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 +295,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 +306,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 +341,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 +387,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, @@ -352,6 +404,7 @@ static int netdev_trig_notify(struct notifier_block *nb, netdev_notifier_info_to_dev((struct netdev_notifier_info *)dv); struct led_netdev_data *trigger_data = container_of(nb, struct led_netdev_data, notifier); + struct ethtool_link_ksettings cmd; if (evt != NETDEV_UP && evt != NETDEV_DOWN && evt != NETDEV_CHANGE && evt != NETDEV_REGISTER && evt != NETDEV_UNREGISTER @@ -368,9 +421,17 @@ static int netdev_trig_notify(struct notifier_block *nb, mutex_lock(&trigger_data->lock); trigger_data->carrier_link_up = false; + trigger_data->link_speed = 0; switch (evt) { case NETDEV_CHANGENAME: trigger_data->carrier_link_up = netif_carrier_ok(dev); + + if (trigger_data->carrier_link_up) { + __ethtool_get_link_ksettings(trigger_data->net_dev, &cmd); + + trigger_data->link_speed = cmd.base.speed; + } + fallthrough; case NETDEV_REGISTER: dev_put(trigger_data->net_dev); @@ -384,6 +445,12 @@ static int netdev_trig_notify(struct notifier_block *nb, case NETDEV_UP: case NETDEV_CHANGE: trigger_data->carrier_link_up = netif_carrier_ok(dev); + + if (trigger_data->carrier_link_up) { + __ethtool_get_link_ksettings(trigger_data->net_dev, &cmd); + + trigger_data->link_speed = cmd.base.speed; + } break; } @@ -426,7 +493,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 Fri Jun 9 13:51:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 691049 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 4B102C7EE2E for ; Fri, 9 Jun 2023 13:51:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231326AbjFINvS (ORCPT ); Fri, 9 Jun 2023 09:51:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57946 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239812AbjFINvQ (ORCPT ); Fri, 9 Jun 2023 09:51:16 -0400 Received: from mail-lf1-x133.google.com (mail-lf1-x133.google.com [IPv6:2a00:1450:4864:20::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B76318D; Fri, 9 Jun 2023 06:51:14 -0700 (PDT) Received: by mail-lf1-x133.google.com with SMTP id 2adb3069b0e04-4f60a27c4a2so2201486e87.2; Fri, 09 Jun 2023 06:51:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686318672; x=1688910672; 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=NYq8sLZvkKIRyh10Exy08xI3yetDl/UeLuaCQ7b94Wk=; b=aunkLK03le309fkrjQAgSe2FayEUzMUvrrsFxVMP6JWPs8On1DjlSZnQ9k+519WJbG +49T3yrIY4OrSKwH24BXaKanNwlyBFpbVJwS/pZNB5o9m4C9BZkWNkYqtT6kZTkKDhD5 CcPOVmoJ3cv1twb83/VSCkuIYZpoe67lb5yO7p5XzfoiEzZS3MvHzL9Sk2MOwmFVVcLc WnW7wFheWjl9Wx6cNeeEgrfWrLUBTuf8iw66idIQbLIBL4cOnDF8qVLbpu2SOtuNhvjx 0x01NoyubaDhiR86H+Nw4fHMAwrCkpDIf0xaj2++M1q5lmCYBBT3RvYug5Cw58T2tP+V liIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686318672; x=1688910672; 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=NYq8sLZvkKIRyh10Exy08xI3yetDl/UeLuaCQ7b94Wk=; b=MEFYHHnpcBFL63bhksD/35xt/2HEBN5YUlt8eanluWPkuxvZx/eeF506MYDUgPPdeO o2TTvYbFgnEc6VcFjQ4Hi6CaJoAszlXB9Gqf037k7lZhPTHbI/C13ixejY/TH8LbuulK VMQkRkMSzOAeI3mWaywpGPnXNWBSwgWk/JskAp0FSJOA7nDbB5+7yFxAZ6MPT2QP1yES m+wK0xV2ankbLM05jdWSvCLgaK0JwGhOEx4BgDbsRTLm9GKZ8/WV41gjOeG5faGnTVpb 3RuLYaSj0dnQNTd7+oUdS44lQ7y/TUCkooyZWEkLOhLXruTbA5sMAv4L2oUk0lPYqX0M 9NNA== X-Gm-Message-State: AC+VfDxtUXRWl3kTkd/fEdbhRB6qj6I0UNc5KXPNgAdUCNv+Bk7blbss 0+iH1X79dkrQ+2waznU1hQY= X-Google-Smtp-Source: ACHHUZ6lf1FuckB7RHwYWbLXPQX/YZWBtPcQpxD+c0qXi5U7hD+gwtJhQ7Mc0oFtVMRiLLGU8fGEhw== X-Received: by 2002:ac2:5bd1:0:b0:4f4:b47d:5c07 with SMTP id u17-20020ac25bd1000000b004f4b47d5c07mr902477lfn.46.1686318671881; Fri, 09 Jun 2023 06:51:11 -0700 (PDT) Received: from localhost.localdomain (93-34-93-173.ip49.fastwebnet.it. [93.34.93.173]) by smtp.googlemail.com with ESMTPSA id l15-20020adff48f000000b003078cd719ffsm4533962wro.95.2023.06.09.06.51.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jun 2023 06:51:11 -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 Subject: [PATCH 2/3] leds: trigger: netdev: add additional specific link duplex mode Date: Fri, 9 Jun 2023 15:51:02 +0200 Message-Id: <20230609135103.14221-3-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230609135103.14221-1-ansuelsmth@gmail.com> References: <20230609135103.14221-1-ansuelsmth@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-leds@vger.kernel.org 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 --- drivers/leds/trigger/ledtrig-netdev.c | 26 +++++++++++++++++++++++++- include/linux/leds.h | 2 ++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/drivers/leds/trigger/ledtrig-netdev.c b/drivers/leds/trigger/ledtrig-netdev.c index f20d5168710a..3c1571b620e4 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; u32 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); @@ -218,6 +227,7 @@ static int set_device_name(struct led_netdev_data *trigger_data, trigger_data->carrier_link_up = false; trigger_data->link_speed = 0; + trigger_data->duplex = 0; if (trigger_data->net_dev != NULL) { struct ethtool_link_ksettings cmd; @@ -229,6 +239,7 @@ static int set_device_name(struct led_netdev_data *trigger_data, rtnl_unlock(); trigger_data->link_speed = cmd.base.speed; + trigger_data->duplex = cmd.base.duplex; } } @@ -270,6 +281,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; @@ -298,6 +311,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; @@ -344,6 +359,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); @@ -390,6 +407,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, @@ -422,6 +441,7 @@ static int netdev_trig_notify(struct notifier_block *nb, trigger_data->carrier_link_up = false; trigger_data->link_speed = 0; + trigger_data->duplex = 0; switch (evt) { case NETDEV_CHANGENAME: trigger_data->carrier_link_up = netif_carrier_ok(dev); @@ -430,6 +450,7 @@ static int netdev_trig_notify(struct notifier_block *nb, __ethtool_get_link_ksettings(trigger_data->net_dev, &cmd); trigger_data->link_speed = cmd.base.speed; + trigger_data->duplex = cmd.base.duplex; } fallthrough; @@ -450,6 +471,7 @@ static int netdev_trig_notify(struct notifier_block *nb, __ethtool_get_link_ksettings(trigger_data->net_dev, &cmd); trigger_data->link_speed = cmd.base.speed; + trigger_data->duplex = cmd.base.duplex; } break; } @@ -496,7 +518,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 Fri Jun 9 13:51:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 691287 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 56736C7EE43 for ; Fri, 9 Jun 2023 13:51:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239822AbjFINvR (ORCPT ); Fri, 9 Jun 2023 09:51:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57948 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239804AbjFINvQ (ORCPT ); Fri, 9 Jun 2023 09:51:16 -0400 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A5B6F3580; Fri, 9 Jun 2023 06:51:14 -0700 (PDT) Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-3f7353993cbso14091215e9.0; Fri, 09 Jun 2023 06:51:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686318673; x=1688910673; 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=Kprq6jjAZv3c6K51awIK2c2WIWDwE0VUEJPfJtDg3Ao=; b=kBmvvrTBMigUd6EVBWiTB4GST2mTmnUhG5VPYvwTZenw41yi1Voci0g5O2AUWby61c SbYuDBzqmVU9a8F/bqMHUomkV/a6zWeWJw0kQp5Zt7f3EEJa5Tif0ymrsRagnBxK0hqj mZtOlJnwjtQtEhgrBPtW+TjiY6/uGnVEotDkqm61f332N2uunUwcGZb1vxa4dZzwBqEH XsWPs15gkG8l31I4a3DJGECOIZo+k2cu+VaEzaZmy2D10p3W8VwobgKCn7FwIj45kdPj dTY0+Sm0+kNiQnlKnPf4skFmyLj2RPB/IUIf7laAWaUAEUsSQOfEae8CRKRY8iJng7xR dmuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686318673; x=1688910673; 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=Kprq6jjAZv3c6K51awIK2c2WIWDwE0VUEJPfJtDg3Ao=; b=VNjw1p18OoR53RRgHbq/c1m2+jWnMI/ViYCPs5zyP1z2tEyBndrbtz7z22W7g3bZaH GMa2m5mqBedWNqYuQc73ZEELzhEKASKhojTnYQ8sCIdSXEyVolvcbu5ds8locMs+JnGW 9UrA16Nt5+r2o5cJ711zyuQV6NkgpZDus9gx3Kaoop6QHoxpDRuEHAkXNiYxoceTc92a N9EsLsHz2k7AXqFH5YEqvKpGS/YG+o+wQ9HFv847nqZ6SpqDymx3S/zT7q94ko2NoHx8 FeHRjmDrGzz3vpgx1f3eJRHhxlX/rhrbFHCIdxvVonrUId8poMNAGsZkHXn4Lhol874m FDKw== X-Gm-Message-State: AC+VfDw4QD9ImwSVIHN/HDsSLTq46Fi67bMr8kc0Bl9QQ3CMOMG58npE yaUwBytQQZK1hNy7qTCm580= X-Google-Smtp-Source: ACHHUZ5RCbq7iBbZMnIoDkOahaI8xduAKEXD6FqhMzCoJyBG7j7LRB0BujP0ClvbIz6nBWQY5hnGsg== X-Received: by 2002:a1c:4b14:0:b0:3f7:ec38:7b02 with SMTP id y20-20020a1c4b14000000b003f7ec387b02mr3898298wma.3.1686318673071; Fri, 09 Jun 2023 06:51:13 -0700 (PDT) Received: from localhost.localdomain (93-34-93-173.ip49.fastwebnet.it. [93.34.93.173]) by smtp.googlemail.com with ESMTPSA id l15-20020adff48f000000b003078cd719ffsm4533962wro.95.2023.06.09.06.51.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jun 2023 06:51:12 -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 Subject: [PATCH 3/3] leds: trigger: netdev: add additional mode for unified tx/rx traffic Date: Fri, 9 Jun 2023 15:51:03 +0200 Message-Id: <20230609135103.14221-4-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230609135103.14221-1-ansuelsmth@gmail.com> References: <20230609135103.14221-1-ansuelsmth@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-leds@vger.kernel.org Add additional mode for unified tx/rx traffic. LED will blink on both tx or rx traffic. This is especially useful for PHY and Switch that supports LEDs hw control that doesn't support split tx/rx traffic but supports blinking on any kind of traffic in the link. On mode set from sysfs we check if we have enabled split tx/rx mode and reject enabling activity mode to prevent wrong and redundant configuration. Add additional modes: - activity: Blink LED on both tx or rx traffic Signed-off-by: Christian Marangi --- drivers/leds/trigger/ledtrig-netdev.c | 21 +++++++++++++++++---- include/linux/leds.h | 1 + 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/drivers/leds/trigger/ledtrig-netdev.c b/drivers/leds/trigger/ledtrig-netdev.c index 3c1571b620e4..709371b2115f 100644 --- a/drivers/leds/trigger/ledtrig-netdev.c +++ b/drivers/leds/trigger/ledtrig-netdev.c @@ -117,7 +117,8 @@ static void set_baseline_state(struct led_netdev_data *trigger_data) * checking stats */ if (test_bit(TRIGGER_NETDEV_TX, &trigger_data->mode) || - test_bit(TRIGGER_NETDEV_RX, &trigger_data->mode)) + test_bit(TRIGGER_NETDEV_RX, &trigger_data->mode) || + test_bit(TRIGGER_NETDEV_ACTIVITY, &trigger_data->mode)) schedule_delayed_work(&trigger_data->work, 0); } } @@ -285,6 +286,7 @@ static ssize_t netdev_led_attr_show(struct device *dev, char *buf, case TRIGGER_NETDEV_FULL_DUPLEX: case TRIGGER_NETDEV_TX: case TRIGGER_NETDEV_RX: + case TRIGGER_NETDEV_ACTIVITY: bit = attr; break; default: @@ -315,6 +317,7 @@ static ssize_t netdev_led_attr_store(struct device *dev, const char *buf, case TRIGGER_NETDEV_FULL_DUPLEX: case TRIGGER_NETDEV_TX: case TRIGGER_NETDEV_RX: + case TRIGGER_NETDEV_ACTIVITY: bit = attr; break; default: @@ -332,6 +335,11 @@ static ssize_t netdev_led_attr_store(struct device *dev, const char *buf, test_bit(TRIGGER_NETDEV_LINK_1000, &mode))) return -EINVAL; + if (test_bit(TRIGGER_NETDEV_ACTIVITY, &mode) && + (test_bit(TRIGGER_NETDEV_TX, &mode) || + test_bit(TRIGGER_NETDEV_RX, &mode))) + return -EINVAL; + cancel_delayed_work_sync(&trigger_data->work); trigger_data->mode = mode; @@ -363,6 +371,7 @@ 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); +DEFINE_NETDEV_TRIGGER(activity, TRIGGER_NETDEV_ACTIVITY); static ssize_t interval_show(struct device *dev, struct device_attribute *attr, char *buf) @@ -411,6 +420,7 @@ static struct attribute *netdev_trig_attrs[] = { &dev_attr_half_duplex.attr, &dev_attr_rx.attr, &dev_attr_tx.attr, + &dev_attr_activity.attr, &dev_attr_interval.attr, NULL }; @@ -502,14 +512,17 @@ static void netdev_trig_work(struct work_struct *work) /* If we are not looking for RX/TX then return */ if (!test_bit(TRIGGER_NETDEV_TX, &trigger_data->mode) && - !test_bit(TRIGGER_NETDEV_RX, &trigger_data->mode)) + !test_bit(TRIGGER_NETDEV_RX, &trigger_data->mode) && + !test_bit(TRIGGER_NETDEV_ACTIVITY, &trigger_data->mode)) return; dev_stats = dev_get_stats(trigger_data->net_dev, &temp); new_activity = - (test_bit(TRIGGER_NETDEV_TX, &trigger_data->mode) ? + (test_bit(TRIGGER_NETDEV_TX, &trigger_data->mode) || + test_bit(TRIGGER_NETDEV_ACTIVITY, &trigger_data->mode) ? dev_stats->tx_packets : 0) + - (test_bit(TRIGGER_NETDEV_RX, &trigger_data->mode) ? + (test_bit(TRIGGER_NETDEV_RX, &trigger_data->mode) || + test_bit(TRIGGER_NETDEV_ACTIVITY, &trigger_data->mode) ? dev_stats->rx_packets : 0); if (trigger_data->last_activity != new_activity) { diff --git a/include/linux/leds.h b/include/linux/leds.h index 7d428100b42b..f11fa5e1e833 100644 --- a/include/linux/leds.h +++ b/include/linux/leds.h @@ -589,6 +589,7 @@ enum led_trigger_netdev_modes { TRIGGER_NETDEV_FULL_DUPLEX, TRIGGER_NETDEV_TX, TRIGGER_NETDEV_RX, + TRIGGER_NETDEV_ACTIVITY, /* Keep last */ __TRIGGER_NETDEV_MAX,