From patchwork Mon Jun 19 20:46:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 110160 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3252716vqr; Mon, 19 Jun 2023 14:13:53 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5j5He4dQG3rgGmO8hoFWYVPgemkbDkwlBNvjQJHs5PXJ3pfi9P1U/T26rc62qmW5HU48dP X-Received: by 2002:a05:6a00:1817:b0:668:63ee:7716 with SMTP id y23-20020a056a00181700b0066863ee7716mr11451358pfa.11.1687209233239; Mon, 19 Jun 2023 14:13:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687209233; cv=none; d=google.com; s=arc-20160816; b=P4CzqcXghhSIe/7yfOBZ2lagzGF/iSFafpVwWfStGIjNu3ytdq8EV0KDKLbOcrmgLx gjiXF+uSg4utrORA6sHotTu+/z8aagcXlqtMrnglH2EWoQVmrxw6f7V2+rHMC/qmdtRg 6ZoVYip4nH1GDNcw2RHblUbyNEQh8XbZS403DRtJyuXoRqBVskEOhPOERWVaU5UASaeh Wn37WRGIM72GECy5PSGHJzApEfIGNOA/KQeFyNX2p4oPGW4BG40gcmLt8VuY/xyzUqdf Kahp3Ucxrh3tLsnjYWDmQ8hbK5/KyMe4MW2HU0AMzH8SU7/3a+YbbBGmbde+I3kn6M0P OSRA== 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=foKn8FR57FXFqo7WnGlNy+X/gBMzOJuCXX0Xraj/wKo=; b=msYV247ZBs4qCEPs6/HsTahHsaVY4U26eXny2Q0+seBuqlPjbwXIn9u8m7UnyTUw2d Ikdiw3Kywp5vlyQqFWXdUqbBSwtRQC3/ERWJgGruoYbM3wP0hJkOpRwAXZfSDXgNqi7Y 7N1ALa82EeNsAgCHhVCJLc3V//WxYI+wo8eDxFv9GXkzRqEcwRx25C/h4/XfNfkQZ04N I2zm8sjXEC+Rd9goOqZRP9qAZCNobPpGIsKp0+GYF7nIBWUcBvMpbV1+QWh0saVzGY0x M0QXI3WNH+GF8FqltM4YykuM908aobNU7YOf7zIulUoshgguzWphdpY0In4FDmNFRdcG xUvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=AYVDMsfV; 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 g23-20020aa796b7000000b0064d3cf07fdcsi253766pfk.88.2023.06.19.14.13.41; Mon, 19 Jun 2023 14:13:53 -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=AYVDMsfV; 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 S229803AbjFSUr1 (ORCPT + 99 others); Mon, 19 Jun 2023 16:47:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229567AbjFSUrY (ORCPT ); Mon, 19 Jun 2023 16:47:24 -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 D0A8AE68; Mon, 19 Jun 2023 13:47:21 -0700 (PDT) Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-31109cd8d8cso3650578f8f.2; Mon, 19 Jun 2023 13:47:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687207640; x=1689799640; 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=foKn8FR57FXFqo7WnGlNy+X/gBMzOJuCXX0Xraj/wKo=; b=AYVDMsfVJPmV8XJqVgTFiL1lgWeIdpYvG9PffvRbgOR8tsRN+T1XUMJ+R6w8v4/Hhl biFuFpWPKn6JOFIgJc6xFJ9mFNBYsWqntSbQVrvmuEWZLzZ/wrvwOhjMAGI2wKdXfTxp DH4ulmHK/06SR+yTf6IxesoqWcEZ8VAqUn6PXoKJEActb9RMxD3bEbBhCH6yE008mHoi t0w+q/a52qx4YlMFsqnUnmidj2gXRUNqwbMdMjtp6dVopGN/fql7IEFAC2hIlWbVZVlJ 48wM7zS+0jAiAfp7JlyF7yGzGV0GO0W0Kee5J+DqY1Ya2jJk6Ypx0mQzvkVhshpwv1DU 61lQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687207640; x=1689799640; 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=foKn8FR57FXFqo7WnGlNy+X/gBMzOJuCXX0Xraj/wKo=; b=GikF70KpYZrvhXirbti+70NWrvYVCAiu6iy7HVaMQqTsF7lqR/NZWu+05Xo101IT6k phhshXocepj8r5iWVhFbxdD0LnW/TIOnvus6fTPp9RCi8ufrU8mlDdQPBYKsawf9iDhQ CQAx6oBW9KQyDyFlVkCaM92ula9JVU73tSQVd6+4nvNUWhPse4/UysGDagFu+PKNXgax 2MXE7r6aZGZqsJsSlw7VCty04pGTaBlWhqt26onSH4C4wnZTALwZ46pWgfK8fm9NGtu0 VSNwzrT2uz+jZMN5cdyrFeXxPZMQMtcgV4Z4vG5w7WmlBrf4gfaOiJudgXh3Qa6HgXkb H4QA== X-Gm-Message-State: AC+VfDzMTzB69FPM3dJwOgO5j/ufKzmD6RNs6rbscpTiE9SlY1fQobZR UW4Uvm481qfWPgE3W2MZXfA= X-Received: by 2002:adf:cf05:0:b0:30a:bdfd:5c3c with SMTP id o5-20020adfcf05000000b0030abdfd5c3cmr8624149wrj.17.1687207639998; Mon, 19 Jun 2023 13:47:19 -0700 (PDT) Received: from localhost.localdomain (93-34-93-173.ip49.fastwebnet.it. [93.34.93.173]) by smtp.googlemail.com with ESMTPSA id k10-20020adff5ca000000b0030ae87bd3e3sm434043wrp.18.2023.06.19.13.47.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jun 2023 13:47:19 -0700 (PDT) From: Christian Marangi To: Pavel Machek , Lee Jones , Andrew Lunn , Christian Marangi , "David S. Miller" , Dan Carpenter , linux-leds@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [net-next PATCH v5 1/3] leds: trigger: netdev: add additional specific link speed mode Date: Mon, 19 Jun 2023 22:46:58 +0200 Message-Id: <20230619204700.6665-2-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230619204700.6665-1-ansuelsmth@gmail.com> References: <20230619204700.6665-1-ansuelsmth@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,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=ham 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?1769167108930835466?= X-GMAIL-MSGID: =?utf-8?q?1769167108930835466?= 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 Acked-by: Lee Jones --- 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 2311dae7f070..f625738392bf 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: if (trigger_data->net_dev) @@ -384,7 +441,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; } @@ -427,7 +484,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 8af62ff431f0..126b79019429 100644 --- a/include/linux/leds.h +++ b/include/linux/leds.h @@ -555,6 +555,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 Mon Jun 19 20:46:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 110159 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3252606vqr; Mon, 19 Jun 2023 14:13:30 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7o6/eR8S02lKN0QUoJbO4VtVWqmt+v+m7UlaztB1EXKwoEcSdf68aGKb684gQd+CTGQCG+ X-Received: by 2002:a05:6a21:3388:b0:121:3e28:19ee with SMTP id yy8-20020a056a21338800b001213e2819eemr7755341pzb.10.1687209210500; Mon, 19 Jun 2023 14:13:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687209210; cv=none; d=google.com; s=arc-20160816; b=yhimsOkgsuy8QLsPmPqzCL+BY1kv9L9OWfR+upRJKiFKDXqkFyw7x5qz7fxJfV4QUI h/ffDs6NDi3mmIb1P6u6cvg5UjDbac4mdmnNKWHW387SO20sIH33TUriSHvfMZoR5Aex pvmtZ7vumYId9nvKvhNadcVuZ2XMIcpo9brW21/XsM8xbKpL2EjnWPVQKv47XksuhGCl lfagVAccA8vVs5VjyJJFmGY9oq1zHoZTLJ9FCMbOdiROYbLkgs2iu8Az313qRKz3w/rZ Yr7MnfzCI/cmFjDw08d9cFn5tHWlnQfTZ90FUxbihbqAguQKpwzfSHp5H4ShA1DgJzYM 8u9g== 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=AMRt/p5AFtsO4siT1tV2NzpQd/2q9CfYdluDALvWqMM=; b=kAe88h6i2FFOT6+mWcAWOZvHZcUV66ZiH3kINfClgNzPW/NwC0+NqRi33bF3zh5cY5 2uMYY/5f5Y+lCT4Y9dXV5o3HU0HmRr3/17/jg0r4J13F3rHDLoecefOaI0nCAMd38hrp L1tDFDaiwe7VJtC5p6uL5dq+HgjbUHIrsbAmuqNbzAla+B8vZIYdMqnVksqBvU4/xXvR nrBLigdccpp30qsQJr4sYzy0l8R+gBp+lnpb6GQRwuNcQHYQo5+hh1WaeGG8Yms9bJF0 1VEi5MWsKlIu6+Cqk2r7VAGtvf0L0q7N6jRqZR5ZSoOXXa97XWI+Plc2kL4L1RuataF7 XuMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=MImxId9F; 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 b5-20020aa79505000000b006530c90eaa6si238768pfp.192.2023.06.19.14.13.14; Mon, 19 Jun 2023 14:13:30 -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=MImxId9F; 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 S229825AbjFSUrb (ORCPT + 99 others); Mon, 19 Jun 2023 16:47:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42562 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229783AbjFSUr0 (ORCPT ); Mon, 19 Jun 2023 16:47:26 -0400 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 246CCE72; Mon, 19 Jun 2023 13:47:23 -0700 (PDT) Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-31122c346f4so4353671f8f.3; Mon, 19 Jun 2023 13:47:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687207641; x=1689799641; 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=AMRt/p5AFtsO4siT1tV2NzpQd/2q9CfYdluDALvWqMM=; b=MImxId9FbF6JT3vzfROAnJb0iM3n8pb1LG4GlrNthaZreA/7PhQfVBGRDN0IXfIB1q EotHJtpDaWTb/uvIbATG+OtnEG3Xj0t7P9h12lyFcPkrSwGALgXKrP9D9jaeqs0UUDxK J68OEJKPS45lT21dED8dkk5bWwQJAtkof60atirR/dqsWqOvPX4km7s72Za+dcIIp3je oZ3qoJlZbY5/uKr9/pcf5MPLzKSwVFLtIlAjIkXZmsDxOzA2tuOdtYUTufcBXkwTukwN 47gd6O9nbgmuqsKQmekDTIOfD1KgbDmXHs/HmBCIP6aOc8SyUpgRvV2uAs8VqUSrub7q cFGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687207641; x=1689799641; 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=AMRt/p5AFtsO4siT1tV2NzpQd/2q9CfYdluDALvWqMM=; b=cyxG0W4BJc92bUjUvmH0Evb8xF8u9GHL5pfgZ3kV/0a30/YSP+eIZeDi5cpkveq/eU FtnGZMQ09B63zMgiQGuluCp45IE011OTLSxnxKOqHL18XbYDqacqJy7F1wKSrhIQJhPb hqr+dCV8t23HboI3bC6u9ukrxW98ToVd5afajUAJ3KsgCZ6/RVIYxV5zeoMI+wB8Fld4 h7N0UaoFPslnzjHZBb5cp17xeb6QZVWBpdJZjKpmsD2S74FiFLVJNCl8HWKs4/sDcJAw MxoZuUDPV6asJKFOWq25yJlKUE5oD4vm84/cjk2VRqW5XtIwxXfsUieaFFF7hx67NkCz uzFQ== X-Gm-Message-State: AC+VfDwKjXiLzjHnQyWIJavIqb46P9vKS/qwxKIFP4Usfa7m8kIxUjQW SGSUwg+B0HD/fJYt2gUY7bw= X-Received: by 2002:a5d:468d:0:b0:30f:be1f:8711 with SMTP id u13-20020a5d468d000000b0030fbe1f8711mr10415118wrq.63.1687207641431; Mon, 19 Jun 2023 13:47:21 -0700 (PDT) Received: from localhost.localdomain (93-34-93-173.ip49.fastwebnet.it. [93.34.93.173]) by smtp.googlemail.com with ESMTPSA id k10-20020adff5ca000000b0030ae87bd3e3sm434043wrp.18.2023.06.19.13.47.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jun 2023 13:47:20 -0700 (PDT) From: Christian Marangi To: Pavel Machek , Lee Jones , Andrew Lunn , Christian Marangi , "David S. Miller" , Dan Carpenter , linux-leds@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [net-next PATCH v5 2/3] leds: trigger: netdev: add additional specific link duplex mode Date: Mon, 19 Jun 2023 22:46:59 +0200 Message-Id: <20230619204700.6665-3-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230619204700.6665-1-ansuelsmth@gmail.com> References: <20230619204700.6665-1-ansuelsmth@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,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=ham 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?1769167085185868685?= X-GMAIL-MSGID: =?utf-8?q?1769167085185868685?= 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 Acked-by: Lee Jones --- 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 f625738392bf..2c1c9e95860e 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); @@ -487,7 +508,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 126b79019429..3a65ff72bb04 100644 --- a/include/linux/leds.h +++ b/include/linux/leds.h @@ -558,6 +558,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 Mon Jun 19 20:47:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 110158 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3243582vqr; Mon, 19 Jun 2023 13:51:36 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4/es0pnghnV/pKxy6UaRCwgX5Uke30z+kn8YOw76d9+GLnYPxmaePbCEC3kBiZYiFldbL0 X-Received: by 2002:a05:6a20:4299:b0:121:d74e:8b46 with SMTP id o25-20020a056a20429900b00121d74e8b46mr2218296pzj.55.1687207895991; Mon, 19 Jun 2023 13:51:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687207895; cv=none; d=google.com; s=arc-20160816; b=ZSLVWeJdkCW3s+hN2lfk6SAStTb48RhEuoaL1Ig7ro2ur1hSu/FizVZM/WwoxAbgkK sHXXTm+yFhw+u7uXR0qLKV0mvp74aWcAn6DGj8sPoBgMUUPkATR7YuuTBrOhcA8FL5D7 HsSJwh6xLY2ElRqO4BZJ4SpvkUU0WmufeH3qT/k7ZEOlyFOaUcym8vHfLiSV1u0b7E1D qb8Z6NBDyEs/VShXGG3EKi8p9s1HkzMHTnk4d/Kbex0RFMQd+nk0UK3A1+LpbwLiYYyV rXs3+3iw9oe8PjUaKiyIPvgBjUtWJFGB91sWS7VPJkYzQAk8c1EWRS0alDQVRXhRRRJH npwQ== 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=ccjdX+IZqQAhgyk6xPOcJY+ngvdDgr2cEw+3he/cnkM=; b=lDr45bL3ZmVf2vWksnAYeDg14U+zIRmNgwD7v5idDi35GOg2JdlA7dVnjesqTVg+YF GMDP5cYtOzmMNdMJpf6sAFY5YTcCWlYZZeaMOkxNTLy79LMgGcoAlR7FhoJRFqB1ldis cOllmDk2o2rKGPR9h0aURENa1QjJo5WLNM9x1QxKOk9mlZmD+zE9gQ2fz6mPTQEG+SAC rliROy/6ObD3/z/fZXGfmD67+VBfaueIS+x3rdm0KobfpXd2LZ4vKlKEsq5swDTl/IsV KA6nW+2780zZ8lXoUQm/8cn1DVQjHlOV1mJxvo0VZmuNEyeLJvSBZLtwajJlFaoG/pp1 rbpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=jHYqsvXA; 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 r12-20020aa7988c000000b0066874556a58si189901pfl.213.2023.06.19.13.51.20; Mon, 19 Jun 2023 13:51:35 -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=jHYqsvXA; 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 S229875AbjFSUrd (ORCPT + 99 others); Mon, 19 Jun 2023 16:47:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229807AbjFSUr1 (ORCPT ); Mon, 19 Jun 2023 16:47:27 -0400 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9D57F1A3; Mon, 19 Jun 2023 13:47:24 -0700 (PDT) Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-31272fcedf6so1056097f8f.2; Mon, 19 Jun 2023 13:47:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687207643; x=1689799643; 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=ccjdX+IZqQAhgyk6xPOcJY+ngvdDgr2cEw+3he/cnkM=; b=jHYqsvXA6NiTfeCcqKVcOiRIKTt+m2BZuSNb260ylv7/IACNKLfLYiqzemybP73R7r E/cN0oKUQtbleX04sIgx0XWdlndkVtGIgOtq1JGz3fBggnfoZzhCzPobJVyvq78WBhi3 Jv5wWJaHtzIVPu98JdDMdLI7YpEwnmQ2fb+TzOU/533Ypi+Kh40R9a0BcOEuH+k/tyzk lKdHnqhkGNit4/GxpXJgLxQ9Bqh3oIY5iLMPn0DUmvdd4c4EtqssVw0tDoDaIGZHumqe LJvTUul00cc/6PGucXfyjJtbtveK2sex0Z8cZsyyD9IROs71j3KltUJxgSdzBn22EkKs jr/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687207643; x=1689799643; 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=ccjdX+IZqQAhgyk6xPOcJY+ngvdDgr2cEw+3he/cnkM=; b=iQ4iNkmWuXmo/LfzyjT2dcexZcd2rNabGJAFYaVzqMYi1cEGT0pXJHw1pfvRG0/LCq k98plSkvUiFIrGOs7W4+H+K6gN2xPOP7xIJjzkzqVJ8G5EQZvzeNhAyEM+MGTm0BasRF HN1Qnhh8/THdGO5b+R5sLgotIpdndqdyc1pPZ5tsDDNx/MYRY5YuMJPm1ELC+w4RyJM1 FUt/2+iR8k0YYv3e5UnFvJXRNU3G3g/vDWYb70K1Juvmw7hw+C1HxGAHThFI8FGDld8q HdDfD0icU1zsQx6suYs2bUIl0EkOutT7a7H98O8VouhWACW7P/smfn3nG1bCAc5JkkFS rvYg== X-Gm-Message-State: AC+VfDwdv37asNIHY5OMtI/GguNBczFe0hEcD4udRqvE7hIAp5qKx3ur 1x8sxJZKasgYLoU1EYStvWg= X-Received: by 2002:a5d:6292:0:b0:30f:cf67:564e with SMTP id k18-20020a5d6292000000b0030fcf67564emr7527330wru.62.1687207642690; Mon, 19 Jun 2023 13:47:22 -0700 (PDT) Received: from localhost.localdomain (93-34-93-173.ip49.fastwebnet.it. [93.34.93.173]) by smtp.googlemail.com with ESMTPSA id k10-20020adff5ca000000b0030ae87bd3e3sm434043wrp.18.2023.06.19.13.47.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jun 2023 13:47:22 -0700 (PDT) From: Christian Marangi To: Pavel Machek , Lee Jones , Andrew Lunn , Christian Marangi , "David S. Miller" , Dan Carpenter , linux-leds@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [net-next PATCH v5 3/3] leds: trigger: netdev: expose hw_control status via sysfs Date: Mon, 19 Jun 2023 22:47:00 +0200 Message-Id: <20230619204700.6665-4-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230619204700.6665-1-ansuelsmth@gmail.com> References: <20230619204700.6665-1-ansuelsmth@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,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=ham 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?1769165706670429661?= X-GMAIL-MSGID: =?utf-8?q?1769165706670429661?= 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 Acked-by: Lee Jones --- 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 2c1c9e95860e..32b66703068a 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);