From patchwork Sat Jun 10 04:16:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 105938 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1542347vqr; Sat, 10 Jun 2023 06:27:29 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7Q/+0J9cn45jb8+mU+uI3zjFis8bfPvVS4lGpMIWdBQeOT7zEyWyNbfYuZtInaJURuEN5w X-Received: by 2002:a05:6a21:7886:b0:10f:1f0:9b43 with SMTP id bf6-20020a056a21788600b0010f01f09b43mr5607600pzc.6.1686403648984; Sat, 10 Jun 2023 06:27:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686403648; cv=none; d=google.com; s=arc-20160816; b=UWW7IiHqVNjg7qRECYA2TxY2gVHqsyf43BBa5OBw0xIr3eb3PNXDLttlKDlJj6VZ6F SUqVr7efbsj6B/S+iVxgW6I+dZjxcciFGzt0T4PeIOU8tinQbFoQgQpCKwypp8yPGYUN L6L0VXVeL5y2uHZcOQccdnzkkWkhpYjno3rJUNmJkaGzBn5pDBZwEXt2iizeyEmcOaul 9PZ2AkWnIr4mZGDCwQjNtm7JdDQvPS2isVOJwyLq2/tWdj5ES160TzhTtENjSbjXnuAM 2YZlcM25NTSRc1WfOpPKmfo2fefDqJYz2+Zh5Nddfq8v9m++BmW14+qWjuhulnfzOrtP h5dg== 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=shnue7VmcWNx13xlBtHyq75qkviNeNdvPydq+iML1b8=; b=GQN+bYW1cGBkLBQj99TYNSUaN3gzvKMjVFGUIFt7e0DTgLm/5O97ZUIo43ZKTgxhkr l+VEyX6XmmdohzsOgD36gF02kePd1BZmrFBudJz7sRCmd1D37tEjO1YzwfV6LEvhbht4 Y/g4Bv0V0fQ8tBMscFhf5BPIZB8VRd03u0TQD4ukpwr9fFPTqFD/YjI/LOS1jshl7G2e PhK8cr+zZaYR6e/pjugfjJmMzsP/nmu7fHzCEJwbfGqn+q9ANdgAhTgYoyS9UM48HaDH uOqwrZ1v62SJoAOnlEjzYACOx+QlYNNoqvBgLJQSCJLj31gR785Ubdcp074anyU2MP1L XAlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=Ra4L6oZw; 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 bs71-20020a63284a000000b00541e09de13bsi4034499pgb.10.2023.06.10.06.27.16; Sat, 10 Jun 2023 06:27:28 -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=Ra4L6oZw; 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 S234676AbjFJNJj (ORCPT + 99 others); Sat, 10 Jun 2023 09:09:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46000 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233066AbjFJNJg (ORCPT ); Sat, 10 Jun 2023 09:09:36 -0400 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E700210A; Sat, 10 Jun 2023 06:09:34 -0700 (PDT) Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-30fb4b3e62fso121954f8f.2; Sat, 10 Jun 2023 06:09:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686402573; x=1688994573; 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=shnue7VmcWNx13xlBtHyq75qkviNeNdvPydq+iML1b8=; b=Ra4L6oZw7gMKG1I2NB91tLtmzv4zLdZ8pthZn157esVelW4kXmzj1gzxlVTDxd4qSm /fSurAIZ3xs051dRqztECqv/unAfQFWF0NVlyyUKKE+MjxQohGjmyrwd0Q/ikRkvoJMu stUzvf6XoubiMHG94Gxc+3VU5WiREpR6JoL56DhB2hZIkoWk0zOl5kd7Q1GHOTTiqJ5B NzA5ISEXvvSdlfu36XIZnz1qtBwjyLbbkYVpeGwThUFOxXAMQ45WpFvdZWCySsZJmtSi up/aKJ+l8Yj34j5OwoTJPJsQlcBMnYmLfNRWv+XaY/OHVVJEjGeu/cC7qoRs11u30fFV qtew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686402573; x=1688994573; 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=shnue7VmcWNx13xlBtHyq75qkviNeNdvPydq+iML1b8=; b=gOT7oimKZYPv41fCV/c70GE5t+xYrD9h4eWNtD2VHNFWiYsFzHXhhSVjP/CP7Ge/2D KKKpsIGq1fetJ44FrcX6ZxWmYlhx13CXnLRTcZt2YTiPm39QW81oy6i+O3x9Mh1kQrIw FP/K9/ey1tmce/cAD5B2Lnz63MdqF63j29gcj1d4ACEPOyK4fbZqRROf7Y956FNbTu58 +JzRAqMHRPb+IjcooHl/sHgWBXp/G52bCTmVK+RotTEL1O4IH3JmU6eo2OO5HEy/JF89 DTTnaTeam/mnw+RDQ9dvaIx2qwq7VVPR7lMkj/KCEpGo5B958+6TTT73/OWIiw/Y2WO+ 7VWA== X-Gm-Message-State: AC+VfDzJnM948WmAxp1vMyx3MzD0psOMdoToh3HNrYkTwzjdoHpzKBes t6qcnQ4q8PZycNzZNJPx/z3RBFWU3rU= X-Received: by 2002:adf:e386:0:b0:30a:ea8b:4488 with SMTP id e6-20020adfe386000000b0030aea8b4488mr751542wrm.16.1686402572482; Sat, 10 Jun 2023 06:09:32 -0700 (PDT) Received: from localhost.localdomain (93-34-93-173.ip49.fastwebnet.it. [93.34.93.173]) by smtp.googlemail.com with ESMTPSA id x15-20020a5d650f000000b0030adfa48e1esm7075632wru.29.2023.06.10.06.09.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Jun 2023 06:09:31 -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 v2 1/2] leds: trigger: netdev: add additional specific link speed mode Date: Sat, 10 Jun 2023 06:16:15 +0200 Message-Id: <20230610041616.21141-2-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230610041616.21141-1-ansuelsmth@gmail.com> References: <20230610041616.21141-1-ansuelsmth@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.6 required=5.0 tests=BAYES_00,DATE_IN_PAST_06_12, 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?1768322392436376223?= X-GMAIL-MSGID: =?utf-8?q?1768322392436376223?= 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..7e73fb56266b 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 @@ -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 = 0; + 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 = 0; 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 10 04:16:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 105939 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1543614vqr; Sat, 10 Jun 2023 06:30:09 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4EgZoGmhPK7SqSpKTPc3Wy2CGtv6TU9boKBHyY6S+yomh/peNAftQB2LsznkM9FnNbVFZe X-Received: by 2002:a05:6a00:cca:b0:643:90ee:587 with SMTP id b10-20020a056a000cca00b0064390ee0587mr4827144pfv.18.1686403809202; Sat, 10 Jun 2023 06:30:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686403809; cv=none; d=google.com; s=arc-20160816; b=fVZMON9lC+e7O4yMMWrea233iVOXwGPk/N8l5Sie0gaJjs8febjuLXW8dbkliofULy o/VA8yKd9h6w1SS+uCTlsfdoQ16mJbW98PjATHcOFmlh5/Bw5SoAbYki1e6ZUSKyrs/9 LsSBEBo0UDZC8eY48VFbnKuwemobgYZ53mNDFCw9Om850Wsh077AMZKHSWPI4l4rog5C VvJYLVYXGBRZQjWxHPjBEYcVP0pZwY4/SPrX71BrOhjZC8sByH8sAIyQfEnmzYYHZzm/ jnvr6hdS8pZp8Cj/C+FX6lrQ5rzCDWXu/BmvURvSAPmVSrUjv7sxgRXLIJK2AtMbukMb +Wxw== 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=yx7+bM8+AiQU9Trbr3LuFZlhpmDP+KyzgvYOIF3mewk=; b=fgrRz4vGcmRFTub3YL3Y6+C/vMy2FCik8W05rf8g2Gm4eOTcdZASNQqgKcvhRR37/8 BWaoIRObqmf1MQbchvC57cj7CC7yAK7Nc0wYNNdiDXoJtsq7D9K1333F09xv2KIbD5nP J9D4yz+O5hMCxOwXJygd50HjAf0E9Dkloylj9AhlBLeWwSijayJXVZcGQ6nviMhkvs4U bbD5JeFQo0BFLcpX1O3zPWZjpUvI+Qt8P9KhzzvxhgqqyeQTjJRizZQUBK2PbshW8QIB skZvEiaaqguu+d2vjl+m8+dN90iNHV3QiAjGGCfYDHzifAKGTkm7jUOQzTobKIJiY131 L87g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=VUq8JjMy; 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 k15-20020aa7998f000000b006439b23e8b7si3988367pfh.9.2023.06.10.06.29.56; Sat, 10 Jun 2023 06:30:09 -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=VUq8JjMy; 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 S234749AbjFJNJn (ORCPT + 99 others); Sat, 10 Jun 2023 09:09:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46002 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234542AbjFJNJh (ORCPT ); Sat, 10 Jun 2023 09:09:37 -0400 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B5EC01FF3; Sat, 10 Jun 2023 06:09:35 -0700 (PDT) Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-3f7ebb2b82cso28077955e9.2; Sat, 10 Jun 2023 06:09:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686402574; x=1688994574; 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=yx7+bM8+AiQU9Trbr3LuFZlhpmDP+KyzgvYOIF3mewk=; b=VUq8JjMyzeYxv9BmTXrl+YFfyG4722n05JuIGcYtc7q9YDS9MKmRGLs8D2ku0ehOxe 7qFFaX3J+NYjX/dEyFqITqXoa5WNa2Y7CtdKsT40RFG71kR9/UWsXZvnuyqqNfV3YVht tq4Ly23lAHGae5eSlBKxOyGNVCPO5erhfybT9ghBxUOI+JR93lK1rYWRjfiWCthylugZ 9m46IVfIlxQug+MOFNvsA33X8lgUi+gpmYuEtmuRELTe8c589uvAJctIzmRJ5psB4Ao7 zPcYa9j7j4uFFnMqFTSLTOCg1cTIooAwfICJKRqWAh7NkG0V7twmFgvtOtrPemAFh3GW jm+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686402574; x=1688994574; 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=yx7+bM8+AiQU9Trbr3LuFZlhpmDP+KyzgvYOIF3mewk=; b=GX5G7oP5hIqBBfHyLNyu8hG4EohDy4s/3M96+EwlA3eG94K12cqQNSkhLqfC6AwQRC T33C5qxzK6JgCJbBIWOI24kT9c6u3Jq4pjqw3VRZlNaxaack3zRO2MAmfqM8zjQiZPBU BctpLsb8+xZRs4sBfGEzKCNC+vHevcTEpz9aVeczBk7pRUNND8sQ7/64rP9BpKoTeK06 fe3HqjG9JZswAEg0aOGbEd+B5YtMvzApzF5COypKFZR8nJGI+3PFJEZZgMAf62f+Uy0S ElS2XZDBFBnN8SOoDfJ2GhbOz/aP8kH2q3Num4x+e5wN3/rEDDe3BTAaRlEJh0bxzZVG VXbA== X-Gm-Message-State: AC+VfDwgWn13GRBuROt9n/2EokkaxAw67dvWADHSUiD7cwedpTwrdg6p cpslyfxK5aeKMkUxDpEXb21HqRIugZY= X-Received: by 2002:a05:6000:147:b0:30a:bf2b:e03b with SMTP id r7-20020a056000014700b0030abf2be03bmr1222145wrx.1.1686402573965; Sat, 10 Jun 2023 06:09:33 -0700 (PDT) Received: from localhost.localdomain (93-34-93-173.ip49.fastwebnet.it. [93.34.93.173]) by smtp.googlemail.com with ESMTPSA id x15-20020a5d650f000000b0030adfa48e1esm7075632wru.29.2023.06.10.06.09.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Jun 2023 06:09:33 -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 v2 2/2] leds: trigger: netdev: add additional specific link duplex mode Date: Sat, 10 Jun 2023 06:16:16 +0200 Message-Id: <20230610041616.21141-3-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230610041616.21141-1-ansuelsmth@gmail.com> References: <20230610041616.21141-1-ansuelsmth@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.6 required=5.0 tests=BAYES_00,DATE_IN_PAST_06_12, 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?1768322560391618235?= X-GMAIL-MSGID: =?utf-8?q?1768322560391618235?= 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 | 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 7e73fb56266b..88c4aef065e5 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); @@ -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 = 0; + trigger_data->duplex = 0; 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 = 0; + trigger_data->duplex = 0; 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,