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,