From patchwork Wed Feb 5 10:05:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Faizal Rahim X-Patchwork-Id: 13960780 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 EF2F0C02192 for ; Wed, 5 Feb 2025 10:22:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To: Cc:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=suHBE4qKRGIWWNKry9d5l0GLhTwwO1mu+DeNz8w65O0=; b=X1fsUDDeoTKeCizvzsR6t4WVn0 wEkeAF+Rj2OhSchanAK9V5Okhnd6z2eACqrcQ80lMSF/MDIFmusttlm6N93AClGq8fBTslzWx8KwX Wz4eaJbrR66dgx0FWtGqk/jlwNLh9Ttdox70ua+jy63UdP07Pt6QPXyKEDUAQ7yR7afzQWliXhpqY mKTRO5K6TTQd87S3Jyw1ySBvbD/qNvxMN/nQNN9zm0SB4zEAD1sR+UPrWjRrDjj/8b+4DJs8JqYjg Vb3qTrF0boSEeYGGJr3mqD5BYlzyNzYO+6aqFqLjxj+vBb8/PDE5y4EqkU1yc9WbO00LWkLjIOlmG lp5GOjZQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tfcYT-00000002rUb-0P9K; Wed, 05 Feb 2025 10:22:49 +0000 Received: from mgamail.intel.com ([198.175.65.12]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tfcIn-00000002ob6-3IFG for linux-arm-kernel@lists.infradead.org; Wed, 05 Feb 2025 10:06:38 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1738749998; x=1770285998; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=LAGXwfWPNxonbtIoO1+jyMLnCooM8DQlGtdO0BdPI4I=; b=LiKIuj2J1YzKVAzHZBXIrAsXaLEVVBVygnznivGBkj4eYRpZ8B7ts6ad 5zUD39hE3Y3KLdAeLAZSUKmscqQocrZ2QO3cL/mwgDt44PFZhy/oEOqkG 9LW7u6hb+qG151y5gesaLdTQesbJJjonGRIs5JybWWHoUIVASZlX/fHfR Grtinvjc0+VF9aSRAsXRCb0OTi6peno0x+EFKorW93xw7NUg3bGQZbZat eMQHSA5g/4ycRCbWAJM0AgdjHagmhOeFtihbEGM8NTuyNxb39c3I08qkh q22agK/Y6HAyHbJlDUQV88ZM7YHaAQROV4OysVeVsTQ/sbGNsXL/0GNGN Q==; X-CSE-ConnectionGUID: Q5VEq/T/S3iDRWTeoF12cQ== X-CSE-MsgGUID: OT2HWIyeTHGhT4SWiwKIvQ== X-IronPort-AV: E=McAfee;i="6700,10204,11336"; a="50699247" X-IronPort-AV: E=Sophos;i="6.13,261,1732608000"; d="scan'208";a="50699247" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Feb 2025 02:06:37 -0800 X-CSE-ConnectionGUID: SO+z4F50SRGjNDyjQPY7bA== X-CSE-MsgGUID: cyzSz0zcRe66lFbCq+Qmpw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="111297759" Received: from mohdfai2-ilbpg12-1.png.intel.com ([10.88.227.73]) by orviesa007.jf.intel.com with ESMTP; 05 Feb 2025 02:06:30 -0800 From: Faizal Rahim To: Tony Nguyen , Przemek Kitszel , Andrew Lunn , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Alexandre Torgue , Simon Horman , Russell King , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Russell King , Furong Xu <0x1207@gmail.com>, Vladimir Oltean , Serge Semin , Xiaolei Wang , Suraj Jaiswal , Kory Maincent , Petr Tesarik , Faizal Rahim , Choong Yong Liang , Kunihiko Hayashi , Vinicius Costa Gomes , intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, bpf@vger.kernel.org Subject: [PATCH iwl-next v2 8/9] igc: Add support to get MAC Merge data via ethtool Date: Wed, 5 Feb 2025 05:05:23 -0500 Message-Id: <20250205100524.1138523-9-faizal.abdul.rahim@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250205100524.1138523-1-faizal.abdul.rahim@linux.intel.com> References: <20250205100524.1138523-1-faizal.abdul.rahim@linux.intel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250205_020637_866148_6E6CD6BC X-CRM114-Status: GOOD ( 10.43 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Implement "ethtool --show-mm" callback for IGC. Tested with command: $ ethtool --show-mm enp1s0. MAC Merge layer state for enp1s0: pMAC enabled: on TX enabled: on TX active: on TX minimum fragment size: 64 RX minimum fragment size: 60 Verify enabled: on Verify time: 128 Max verify time: 128 Verification status: SUCCEEDED Verified that the fields value are retrieved correctly. Signed-off-by: Faizal Rahim --- drivers/net/ethernet/intel/igc/igc_ethtool.c | 14 ++++++++++++++ drivers/net/ethernet/intel/igc/igc_tsn.h | 1 + 2 files changed, 15 insertions(+) diff --git a/drivers/net/ethernet/intel/igc/igc_ethtool.c b/drivers/net/ethernet/intel/igc/igc_ethtool.c index 83da59aec59e..0140f2258823 100644 --- a/drivers/net/ethernet/intel/igc/igc_ethtool.c +++ b/drivers/net/ethernet/intel/igc/igc_ethtool.c @@ -1782,6 +1782,19 @@ static int igc_ethtool_set_eee(struct net_device *netdev, return 0; } +static int igc_ethtool_get_mm(struct net_device *netdev, + struct ethtool_mm_state *cmd) +{ + struct igc_adapter *adapter = netdev_priv(netdev); + struct fpe_t *fpe = &adapter->fpe; + + ethtool_mmsv_get_mm(&fpe->mmsv, cmd); + cmd->tx_min_frag_size = fpe->tx_min_frag_size; + cmd->rx_min_frag_size = IGC_RX_MIN_FRAG_SIZE; + + return 0; +} + static int igc_ethtool_set_mm(struct net_device *netdev, struct ethtool_mm_cfg *cmd, struct netlink_ext_ack *extack) @@ -2091,6 +2104,7 @@ static const struct ethtool_ops igc_ethtool_ops = { .set_rxfh = igc_ethtool_set_rxfh, .get_ts_info = igc_ethtool_get_ts_info, .get_channels = igc_ethtool_get_channels, + .get_mm = igc_ethtool_get_mm, .set_mm = igc_ethtool_set_mm, .set_channels = igc_ethtool_set_channels, .get_priv_flags = igc_ethtool_get_priv_flags, diff --git a/drivers/net/ethernet/intel/igc/igc_tsn.h b/drivers/net/ethernet/intel/igc/igc_tsn.h index 898c4630bc70..c82f9718cb85 100644 --- a/drivers/net/ethernet/intel/igc/igc_tsn.h +++ b/drivers/net/ethernet/intel/igc/igc_tsn.h @@ -4,6 +4,7 @@ #ifndef _IGC_TSN_H_ #define _IGC_TSN_H_ +#define IGC_RX_MIN_FRAG_SIZE 60 #define SMD_FRAME_SIZE 60 DECLARE_STATIC_KEY_FALSE(igc_fpe_enabled);