From mboxrd@z Thu Jan 1 00:00:00 1970 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 EC2CBC25B6E for ; Fri, 27 Oct 2023 06:54:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345294AbjJ0Gyb (ORCPT ); Fri, 27 Oct 2023 02:54:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57600 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229712AbjJ0Gy2 (ORCPT ); Fri, 27 Oct 2023 02:54:28 -0400 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B4298116; Thu, 26 Oct 2023 23:54:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1698389667; x=1729925667; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=FLxMqcP+5XqmQmOKGaFAfXKYkByQwryiGge0XuweW0I=; b=S+iOBHWU7sLWy/h2VgIQH+9iZP+9j7oLhUVH41XnTFVrQIllWxQutJQk Fls8wDniKpSMzmfpp4AGgCR0hCaH6MQ8iIc+kvKuwSvgFeosaj4Y0z1qc 6CQYAnK3kO6RgJ9gi5Lv2DwztrYn1FyMGRc+yy1pJRDcCexcYc3mPjSyV 4kmboAXynFj2hH9DvG+KjCNi2IulzZPiNbm6Qq4jXz6Fin7xMVymudr35 kVxjs++M2k0Dq+Gc9ihrL58Dq1QFJXp/h17lPREbUD5K8EdwXzU4x3V3Q nH8IpCmYqUkp0dLiJy6Tq2VMBbJ7BoYO/aHUIN2HqW6qSAqTdUFfZ40Ou A==; X-IronPort-AV: E=McAfee;i="6600,9927,10875"; a="539357" X-IronPort-AV: E=Sophos;i="6.03,255,1694761200"; d="scan'208";a="539357" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Oct 2023 23:54:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10875"; a="753016032" X-IronPort-AV: E=Sophos;i="6.03,255,1694761200"; d="scan'208";a="753016032" Received: from ssid-ilbpg3-teeminta.png.intel.com ([10.88.227.74]) by orsmga007.jf.intel.com with ESMTP; 26 Oct 2023 23:54:21 -0700 From: Gan Yi Fang To: Alexandre Torgue , Jose Abreu , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Russell King , netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Looi Hong Aun , Voon Weifeng , Song Yoong Siang , Ahmad Tarmizi Noor Azura , Gan Yi Fang Subject: [PATCH net-next 1/1] net: stmmac: add check for advertising linkmode request for set-eee Date: Fri, 27 Oct 2023 14:50:54 +0800 Message-Id: <20231027065054.3808352-1-yi.fang.gan@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Noor Azura Ahmad Tarmizi Add check for advertising linkmode set request with what is currently being supported by PHY before configuring the EEE. Unsupported setting will be rejected and a message will be prompted. No checking is required while setting the EEE to off. Signed-off-by: Noor Azura Ahmad Tarmizi Signed-off-by: Gan, Yi Fang --- .../ethernet/stmicro/stmmac/stmmac_ethtool.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c index f628411ae4ae..6c090d4b7117 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c @@ -867,8 +867,24 @@ static int stmmac_ethtool_op_set_eee(struct net_device *dev, netdev_warn(priv->dev, "Setting EEE tx-lpi is not supported\n"); - if (!edata->eee_enabled) + if (!edata->eee_enabled) { stmmac_disable_eee_mode(priv); + } else { + __ETHTOOL_DECLARE_LINK_MODE_MASK(supported); + __ETHTOOL_DECLARE_LINK_MODE_MASK(advertised); + + ethtool_convert_legacy_u32_to_link_mode(supported, + edata->supported); + ethtool_convert_legacy_u32_to_link_mode(advertised, + edata->advertised); + + /*Check if the advertise speed is supported.*/ + if (!bitmap_subset(advertised, + supported, + __ETHTOOL_LINK_MODE_MASK_NBITS)){ + return -EOPNOTSUPP; + } + } ret = phylink_ethtool_set_eee(priv->phylink, edata); if (ret) -- 2.34.1 From mboxrd@z Thu Jan 1 00:00:00 1970 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BBA67C25B6E for ; Fri, 27 Oct 2023 06:55:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=2rXI3GOV6LhwI1fBQyBu7EsHe4GPyN5ogDTaoDtmzZk=; b=WHLNLUS8h/WXK8 J0HRh4fHsqwGlcbXazef83qBTduLcAuqlb7M8BFOrfvJo5edLOpyg8zzitrhRT2qFSVTcKU/r9ZH3 WAgtqAv6uxOPJxgnk/9J35alJIqIPHb8iOpNKQ3xNwL4pYXM+CjfHJJopPKiON483lkzhMzRIE/2d UoePHntt1mmKZ5pMwv4eGkVYrDlzmXHECOEGjpBEFBU40SYvBP7awnFZxy7B58acnC86sNEFamM8c YN/Etwa2vwR7VMQbWqPu6J5lX2O9QbXJgbbuBYl9q/J/p3Hs2r99onIvnW4MtbfSxZCEIjRgLf3iw bYTcs9j+nteD8CZbbpFA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qwGjo-00FiGk-2Z; Fri, 27 Oct 2023 06:54:32 +0000 Received: from mgamail.intel.com ([198.175.65.10]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qwGjl-00FiFi-1r for linux-arm-kernel@lists.infradead.org; Fri, 27 Oct 2023 06:54:30 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1698389670; x=1729925670; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=FLxMqcP+5XqmQmOKGaFAfXKYkByQwryiGge0XuweW0I=; b=EuybapOtb1oGU9XsMo8cMCpoqOdaHILEWaD9CBL4uXcTnP9hZ5+zbNsB WZKXi0lC/WB4btNNT3FZ7Pgyt39SK+p/oZdVWNLbXuS/KKdzqvLZD5Mk+ rxxnpXAN65Nr04vCPEx6oaJMQWpJlEWNHmiEs65z6u50iZtA1qHYsQCvU 6KIyDOQnZShE2KrW4qPeFnyeuedMHVJWIS644eGyB+H2J/BCB6xaJjzUm 38tGONf+9NrOToTW5hW2rQ/hdJIHpLWZSHT41Z7yFSNvtJNmUUElfJksT Jm25XY8hePqpo+Pj6WVWW/M4CzyktJEJwGxkRd7XQbEbzhz2N6Rczdk++ g==; X-IronPort-AV: E=McAfee;i="6600,9927,10875"; a="539360" X-IronPort-AV: E=Sophos;i="6.03,255,1694761200"; d="scan'208";a="539360" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Oct 2023 23:54:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10875"; a="753016032" X-IronPort-AV: E=Sophos;i="6.03,255,1694761200"; d="scan'208";a="753016032" Received: from ssid-ilbpg3-teeminta.png.intel.com ([10.88.227.74]) by orsmga007.jf.intel.com with ESMTP; 26 Oct 2023 23:54:21 -0700 From: Gan Yi Fang To: Alexandre Torgue , Jose Abreu , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Russell King , netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Looi Hong Aun , Voon Weifeng , Song Yoong Siang , Ahmad Tarmizi Noor Azura , Gan Yi Fang Subject: [PATCH net-next 1/1] net: stmmac: add check for advertising linkmode request for set-eee Date: Fri, 27 Oct 2023 14:50:54 +0800 Message-Id: <20231027065054.3808352-1-yi.fang.gan@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231026_235429_707616_19296127 X-CRM114-Status: GOOD ( 11.70 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Noor Azura Ahmad Tarmizi Add check for advertising linkmode set request with what is currently being supported by PHY before configuring the EEE. Unsupported setting will be rejected and a message will be prompted. No checking is required while setting the EEE to off. Signed-off-by: Noor Azura Ahmad Tarmizi Signed-off-by: Gan, Yi Fang --- .../ethernet/stmicro/stmmac/stmmac_ethtool.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c index f628411ae4ae..6c090d4b7117 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c @@ -867,8 +867,24 @@ static int stmmac_ethtool_op_set_eee(struct net_device *dev, netdev_warn(priv->dev, "Setting EEE tx-lpi is not supported\n"); - if (!edata->eee_enabled) + if (!edata->eee_enabled) { stmmac_disable_eee_mode(priv); + } else { + __ETHTOOL_DECLARE_LINK_MODE_MASK(supported); + __ETHTOOL_DECLARE_LINK_MODE_MASK(advertised); + + ethtool_convert_legacy_u32_to_link_mode(supported, + edata->supported); + ethtool_convert_legacy_u32_to_link_mode(advertised, + edata->advertised); + + /*Check if the advertise speed is supported.*/ + if (!bitmap_subset(advertised, + supported, + __ETHTOOL_LINK_MODE_MASK_NBITS)){ + return -EOPNOTSUPP; + } + } ret = phylink_ethtool_set_eee(priv->phylink, edata); if (ret) -- 2.34.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel