From nobody Sun Feb 8 19:40:09 2026 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.18]) (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 C33F623A9AF; Thu, 27 Feb 2025 14:03:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740665009; cv=none; b=DjVj9kxJ9AcLM7E0y9k0Zw/WgrIP8ke+3hm8AsFfsyoQ66NGH+Wt1oOlJTlbFWO0AiFNU4ks+11Yzepg37i1ys/0jhLwAK/ZTw6/i6eAbYa6tl4XZHP4kAMUi8DWG7GFKCK3CwuRnN7uF5uP6vcFUd0/XeqsMFWsyLiY6UQfipQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740665009; c=relaxed/simple; bh=claEV0o7Z2UgBKhKfxHYHpDfoRczRJppwv++FUBhBRg=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=qQBsfZ36YjMKqLP+hd4i3+H/EONyRZ6pw9EASgzY3J2Wli2pQiRzxpqKKn2UcicVBKXOIO558TC0DAk+SUzGPWiZi1QlHRS6+c/JRYMJz5muEq8IYpX4Em+EjuXeXJE75XD4MsmN4LKpU3X8MZMATa5RgrWJaJK06OWawz5Vhy0= 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=N5WkGAxb; arc=none smtp.client-ip=198.175.65.18 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="N5WkGAxb" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1740665008; x=1772201008; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=claEV0o7Z2UgBKhKfxHYHpDfoRczRJppwv++FUBhBRg=; b=N5WkGAxbbcRAKMU4zjrxD2jziDbRT98RpqGbZNPPZjIbLluuHqJlIfte 3YQ7uAqtoyM9la/sNrsWorKkIzSj6oq8OIHMd99M+WsUeiYsuCLahO+Oo GgTLGEzGYk718JiQf4VnVh+wZKfnDUeD91LatScXZlZP5LE/ShFFArgUK eWSp+Bkf9f3i6/nFclkVssw8aENMfY+cor+tRLpKhSvCywWYg1E4B6Dma 29PNNzrkkX7aw5hp3rVa7HiVF9H3tScBOZroHQNAv9GZyx+TIkIn4iaE4 BEOz3SNZRwiQIlUYJTxjqwWp+dw0CFVPLR0f/anroPQdrTVM3Ov3Bo/8y w==; X-CSE-ConnectionGUID: y1Au7YueRcaSMTUhpVPkDg== X-CSE-MsgGUID: UbF4qunNQAaSvHrKW3NJnA== X-IronPort-AV: E=McAfee;i="6700,10204,11314"; a="41752492" X-IronPort-AV: E=Sophos;i="6.12,310,1728975600"; d="scan'208";a="41752492" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by orvoesa110.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Feb 2025 06:03:27 -0800 X-CSE-ConnectionGUID: 3whTWWJwQZyZVdxfg1Hj+A== X-CSE-MsgGUID: l48GnSgRSCm/l9QxzDQuSg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,319,1732608000"; d="scan'208";a="122149788" Received: from mohdfai2-ilbpg12-1.png.intel.com ([10.88.227.73]) by fmviesa004.fm.intel.com with ESMTP; 27 Feb 2025 06:03:19 -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 , Furong Xu <0x1207@gmail.com>, Russell King , Vladimir Oltean , Serge Semin , Xiaolei Wang , Suraj Jaiswal , Kory Maincent , Gal Pressman , Jesper Nilsson , Andrew Halaney , Choong Yong Liang , Faizal Rahim , 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 v6 8/9] igc: Add support to get MAC Merge data via ethtool Date: Thu, 27 Feb 2025 09:01:56 -0500 Message-Id: <20250227140158.2129988-9-faizal.abdul.rahim@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250227140158.2129988-1-faizal.abdul.rahim@linux.intel.com> References: <20250227140158.2129988-1-faizal.abdul.rahim@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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/eth= ernet/intel/igc/igc_ethtool.c index 081e24f228b2..7f0052e0d50c 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 *ne= tdev, return 0; } =20 +static int igc_ethtool_get_mm(struct net_device *netdev, + struct ethtool_mm_state *cmd) +{ + struct igc_adapter *adapter =3D netdev_priv(netdev); + struct fpe_t *fpe =3D &adapter->fpe; + + ethtool_mmsv_get_mm(&fpe->mmsv, cmd); + cmd->tx_min_frag_size =3D fpe->tx_min_frag_size; + cmd->rx_min_frag_size =3D 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) @@ -2093,6 +2106,7 @@ static const struct ethtool_ops igc_ethtool_ops =3D { .set_rxfh =3D igc_ethtool_set_rxfh, .get_ts_info =3D igc_ethtool_get_ts_info, .get_channels =3D igc_ethtool_get_channels, + .get_mm =3D igc_ethtool_get_mm, .set_mm =3D igc_ethtool_set_mm, .set_channels =3D igc_ethtool_set_channels, .get_priv_flags =3D igc_ethtool_get_priv_flags, diff --git a/drivers/net/ethernet/intel/igc/igc_tsn.h b/drivers/net/etherne= t/intel/igc/igc_tsn.h index 7491fd65b846..14495a22f77d 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_ =20 +#define IGC_RX_MIN_FRAG_SIZE 60 #define SMD_FRAME_SIZE 60 =20 enum igc_txd_popts_type { --=20 2.34.1