From nobody Mon Feb 9 00:00:58 2026 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) (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 EBCE91C54A7; Mon, 10 Feb 2025 07:03:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739171009; cv=none; b=r78MFOUEzy1Vj/1GXYNP6wd+/rptSK9PVVh3RwoQNyYyn2FEZYVQA8P0euEzmFUXug7d/O1/tSgq2UnYEi6bKIN8LrhfhfP1B1CQBjDZQE15Z8hLQ1ifv46sV0uQvFsQFWA9QMeQU5d4Zf9xtjna28AzYOT+rsToAPZHeNV6VmM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739171009; c=relaxed/simple; bh=qK9qrQMjSldwbrNHCdVyeZMm0a8dUnl6Ry1EmjgiouE=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=HXpF3fYBx5dVKwx41Ez+0MEgOI662ePEhvpClvTQthC53vHN4tTCOBiJciZYJ3I7nJNJexAW6QqCJWIomjxamvrSj5/FIPumF+3GLaOyJgnOoCoqktIrGAhsZwGTi+OPRZJDVFPIR5hC5QS6yjC0BR/1G9RaBfr/1U2KcgHSHGc= 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=g8myTlEV; arc=none smtp.client-ip=192.198.163.19 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="g8myTlEV" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1739171008; x=1770707008; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=qK9qrQMjSldwbrNHCdVyeZMm0a8dUnl6Ry1EmjgiouE=; b=g8myTlEVMp2YCvu6bx025noM0Dyr6ozuLRZFf+BXf821FtIANB0+IXXM U7OPaf6D8neahjkF9aw3jCiLMSHOKlQb1TvedukoX15rVMKfefSbuhBOF ZPhTeTXZnpEBMtub6ym0eFBrdGppLxtXMqz9Xx04w2lBZNUOHNhbZGwML yo4gOqqwQnXu1vvekPidWn/mcyBfmK/UH1FSpXl3wRFzhp1E3EDC6uIDd Dp0866HtpSoX0dJxWnU11tRrn2DVDY4ECQeOmhP/3cKTpMyxLomMIeMMt h1468RrXSyXtt8qY7vk0Ne0sfZkcy+dCpBE71KBkALWAwmWWB/le0DkIy w==; X-CSE-ConnectionGUID: 37gdV1UXSue3E9jLrsp/Zw== X-CSE-MsgGUID: unD7ve80RF+GjE7mFSyrBg== X-IronPort-AV: E=McAfee;i="6700,10204,11340"; a="38938116" X-IronPort-AV: E=Sophos;i="6.13,273,1732608000"; d="scan'208";a="38938116" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Feb 2025 23:03:27 -0800 X-CSE-ConnectionGUID: VQz8EXWZSA6Iw55Jaf+IgA== X-CSE-MsgGUID: N6TeITz+TLisYv4dfBsjdw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,273,1732608000"; d="scan'208";a="112622764" Received: from mohdfai2-ilbpg12-1.png.intel.com ([10.88.227.73]) by fmviesa010.fm.intel.com with ESMTP; 09 Feb 2025 23:03:17 -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 v4 8/9] igc: Add support to get MAC Merge data via ethtool Date: Mon, 10 Feb 2025 02:02:06 -0500 Message-Id: <20250210070207.2615418-9-faizal.abdul.rahim@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250210070207.2615418-1-faizal.abdul.rahim@linux.intel.com> References: <20250210070207.2615418-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 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_ =20 +#define IGC_RX_MIN_FRAG_SIZE 60 #define SMD_FRAME_SIZE 60 =20 DECLARE_STATIC_KEY_FALSE(igc_fpe_enabled); --=20 2.34.1