From patchwork Sun Jun 11 14:47: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: 106166 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2263644vqr; Sun, 11 Jun 2023 16:36:10 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7m2sYqom2Gs0wGiS1WyFJRfazRit1wQAY6Pm5kPBZqlkPtbIyla4PzmQufI29zXOXkJjJZ X-Received: by 2002:a05:6402:44d:b0:4be:b39b:ea8f with SMTP id p13-20020a056402044d00b004beb39bea8fmr3694204edw.2.1686526570259; Sun, 11 Jun 2023 16:36:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686526570; cv=none; d=google.com; s=arc-20160816; b=NTwThM//JB+et4h+kUFoz9ra/0pMDVseNX21pOcfqRIn6UPvvIf1f7o54AoWpHQOkT XaPWb4/E4Wwa/FrZpfMpDtrrsLmP/k7dWq9CK9O6mtiTpkYBIAR25lodOsWoibu/h67A cD8Edn9CbPsBEBB/NRLp247R7MKAHNsy3n6bFwJSSFVztzhysOtGu+ESuLB4iupAMGDf bMvOR05mgcVBkXPKrMuXDuRkjLEWEGorg6j35gGeiqbk8zoOWIRHa7pVa2NGyqQxIlyH vpGLZjGqkSj+rlh3PRFv/b3uERIogbt9+qp2mroxUy4pa/OoL497+Ewb+FAQtudixeSu rHfw== 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=sCXcExTUJDmogOYExy4M9hxc1ot+E92nPjUMPhzkzDxC6pzYq4lZ5FS4cHEoEPFwne mahpLVn1vZp26VgC3B/TxQVPSJdD0aqUHPOmMl29wJmHkfnz4FTAHcmE2lgl19gvZHN9 GAgsinHPz2pqUBQzUhCbxrnRFWiA0eBy2rzbkB7zdMGaVHm3xIgJwqnsauTxf/8tCAdp YYQwcbpKCYCLEvyLx0xyYHUW7E70o7FBLZKfywNH+NHyeKEA0iwvrm7KM5HRRxw1AEQ8 ZehCvG8eIUtY01TO2q6efHoIJ2fZp4rBUv1zWfaPh6ce26QwRYp7KUpBfgf7kUrZIPPP dh5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b="VCCc/A2c"; 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 r10-20020aa7cb8a000000b005149e0f8897si5046514edt.331.2023.06.11.16.35.46; Sun, 11 Jun 2023 16:36:10 -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="VCCc/A2c"; 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 S231879AbjFKWaZ (ORCPT + 99 others); Sun, 11 Jun 2023 18:30:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35826 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229533AbjFKWaS (ORCPT ); Sun, 11 Jun 2023 18:30:18 -0400 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EED02E4E; Sun, 11 Jun 2023 15:30:16 -0700 (PDT) Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-3f6e1393f13so26709645e9.0; Sun, 11 Jun 2023 15:30:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686522615; x=1689114615; 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=VCCc/A2cfpGNAa3ZCYJfYjZG9Ogc9ISQJ9820DHNQPBlM3feGZqTajn4qcaPWBGShC ifcQCYgLQY20LhxjB5yE2QnBeThS0AKvCv60cC2PGr08xZOlLdkX6tK9F93KhvnHri8E ZPH1aNYzv8uc73SN+Cll23lHm2OpGd/R0bFJ34bgqMnsaolm+KVwh0JOyXW2WcKN8C8X wKyWi29I4VKIjU+ZPt1Tqpcj9AdZWS9Dip/RjycddMaPSKsrVQ59KPSm7/c1fq4nCrEn LZ6DXhqe7YazUBMLn+MDhZhoK0K3yNttCwgshY/zNyF35J8EoUcy3d6IWnxeJHwOu2+/ tu1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686522615; x=1689114615; 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=RlFIsv+vTMvhjYC4CDTMKrqmQVS99FAaGCSGSE6hArsC5YV0vtk6udtrnZQ/SzAkuh Pe/bIJMCNeavgKyangknkak7EO3eH1OTxttNNiTwWi7qhNg8h7zqlwtuIzPtFcys7dJS e0lxQXpHUM8eMPlyNxvBe4NT0buMPhERXa50bO7Nm7kWJjRv+aSWXOZFLohaI5Z0B90I U4sa10YWINzB8PZvBTOvvuO7l7u7UBZiHQYak9YTMF2NwX9IzUEJz/pYlg7/suknYomM 8M+AICQr/nkhuNfPAmu+DFJIVLnot63Wt032AmA0iEtZlsfc4v0dSqHxWP6hAV+PHB9G aB3w== X-Gm-Message-State: AC+VfDx0laPQ0eNkuuWInm0U+fYs8z09c5CdcsmuZheffE37RFCLtvM4 oqXJe+cYwvnfgEyJWj0CHQo= X-Received: by 2002:a7b:c84c:0:b0:3f7:33cf:707b with SMTP id c12-20020a7bc84c000000b003f733cf707bmr5563528wml.1.1686522615332; Sun, 11 Jun 2023 15:30:15 -0700 (PDT) Received: from localhost.localdomain (93-34-93-173.ip49.fastwebnet.it. [93.34.93.173]) by smtp.googlemail.com with ESMTPSA id a7-20020a05600c224700b003f60a9ccd34sm9509479wmm.37.2023.06.11.15.30.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Jun 2023 15:30:14 -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 v3 2/2] leds: trigger: netdev: add additional specific link duplex mode Date: Sun, 11 Jun 2023 16:47:59 +0200 Message-Id: <20230611144759.6096-3-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230611144759.6096-1-ansuelsmth@gmail.com> References: <20230611144759.6096-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?1768451284903202859?= X-GMAIL-MSGID: =?utf-8?q?1768451284903202859?= 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,