From patchwork Tue Mar 18 03:07:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Faizal Rahim X-Patchwork-Id: 14020219 X-Patchwork-Delegate: kuba@kernel.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.13]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 31C641C2324; Tue, 18 Mar 2025 03:10:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.13 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742267407; cv=none; b=evvigUh+8tC/UggC8MT24Z+uB/Cdbc/X6VTsOrWsew+aMppIJg6Tb7dnpUshOzzYMCzKdIYalaTr9gWix5XBA5m2uSEZjlF9IS6M2HrkHuNE4k/zVr3AXMdqoU5jklk7bIDGCT+U5Uu5rOlPNJRy9luchxdg3YHHiIdS1yXAUCM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742267407; c=relaxed/simple; bh=0isZ6zpvYikdgV/NzKrMVcv5aGLqnoGvYP3OSYye2YU=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=BeiWi0pYuniLZ7WXJCM3qXTWZai51qpCqhliMtlyr38YsTsTfRoeZQNSSiyPMSgK1fzQx5eyr1JjhFqiH3Ea+jyGkTngSvEuQ8mvQRMSsJW2hUxFzyGNkWye+NslZdGHocrj3xmCMcW8EvPooDfhgzdMWRi5Ag2hclZAHEp19x4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=dp/Re1TA; arc=none smtp.client-ip=198.175.65.13 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="dp/Re1TA" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1742267406; x=1773803406; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=0isZ6zpvYikdgV/NzKrMVcv5aGLqnoGvYP3OSYye2YU=; b=dp/Re1TAYNTySbe2PdZhx6XXjP4FbXAbdKnCtwfai0l2Sh7L4n/6Kgsd FX5hT050EDlvN+3w5u8OSSNbJzFNgmXpC46InuFz5BEmQ7ht4KdzGpO/M C3JPOjhwpK6MVF2cfcyVMLvR3hiUA0efL6KMFks8Vh44YDSVse3UUC5qH fhumhe3lIrX9HxLIaf3byWn55wBOJKITZF0ZKZoJRK7xRKkw1JZMfjyTG wXYgIZNCJVy25eySQD6+fWY/gtatldlnP/Wvai/AVdD/o19oDiV4Dvyna JTQCf7vaAR4h5bwVgVVO/lSGGbVnhkywJvIshu4LvYkENqZFTMmP/W26O w==; X-CSE-ConnectionGUID: u90r+VAjR0SWZxynl0x75g== X-CSE-MsgGUID: SHAY4vGASS+Lh1LXb0ozbQ== X-IronPort-AV: E=McAfee;i="6700,10204,11376"; a="54383264" X-IronPort-AV: E=Sophos;i="6.14,255,1736841600"; d="scan'208";a="54383264" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2025 20:10:05 -0700 X-CSE-ConnectionGUID: 5FibIxdTT+a3rSLWBjSJaQ== X-CSE-MsgGUID: UnUGj4uJS+uGDEJtg6FShg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,255,1736841600"; d="scan'208";a="126313965" Received: from mohdfai2-ilbpg12-1.png.intel.com ([10.88.227.73]) by fmviesa003.fm.intel.com with ESMTP; 17 Mar 2025 20:09:58 -0700 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 , Vladimir Oltean , Russell King , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Furong Xu <0x1207@gmail.com>, Choong Yong Liang , Russell King , Hariprasad Kelam , Xiaolei Wang , Suraj Jaiswal , Kory Maincent , Gal Pressman , Jesper Nilsson , linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, intel-wired-lan@lists.osuosl.org, linux-stm32@st-md-mailman.stormreply.com, Chwee-Lin Choong , Vinicius Costa Gomes , Faizal Rahim , Kunihiko Hayashi , Serge Semin Subject: [PATCH iwl-next v10 13/14] igc: add support to get MAC Merge data via ethtool Date: Mon, 17 Mar 2025 23:07:41 -0400 Message-Id: <20250318030742.2567080-14-faizal.abdul.rahim@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250318030742.2567080-1-faizal.abdul.rahim@linux.intel.com> References: <20250318030742.2567080-1-faizal.abdul.rahim@linux.intel.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.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. Reviewed-by: Vladimir Oltean 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 529654ccd83f..fd4b4b332309 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 igc_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) @@ -2101,6 +2114,7 @@ static const struct ethtool_ops igc_ethtool_ops = { .get_link_ksettings = igc_ethtool_get_link_ksettings, .set_link_ksettings = igc_ethtool_set_link_ksettings, .self_test = igc_ethtool_diag_test, + .get_mm = igc_ethtool_get_mm, .set_mm = igc_ethtool_set_mm, }; diff --git a/drivers/net/ethernet/intel/igc/igc_tsn.h b/drivers/net/ethernet/intel/igc/igc_tsn.h index 58fe5f0773d7..c2a77229207b 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 enum igc_txd_popts_type {