From nobody Mon Feb 9 00:53:51 2026 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.15]) (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 6FCC0248872; Wed, 5 Mar 2025 13:02:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.15 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741179736; cv=none; b=kzSF0z3fG/Kj5LmsUZaFmwGr47kwXwv+6TP9c/ueA+BboaspUE7SYJfabxKHENRyFrXkl7PrL2akfdbm408MHjjdkgJ2VxWe9OqxTunfmZ6hnMZiBWdUZvd8j0BtAHAYi4SQJ7bstCpil2UpHuNMfE8JaJ+HkD0xQRvU5w6J2n4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741179736; c=relaxed/simple; bh=53bjcwBoOZAPsqRNQ3fKEphCjwEGIYzxF8r+fwuUfvM=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=D3Zq2TFYDZpcZ5P+Oop5lBfoh2OuOWVItdoaBm+sk6uRb6gj1eEerGt8YDPAN3E7CM8pGYQHQ6kpFfYX0tUzIqsjjonYcyQnWMRynwv3g8FL5c1ITxvGPZmbDLhqgQCNhf4q9/GDs/rCNdUvsUiQopd5phIwpAEg0CPrcyuj9lw= 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=cs/lZpMY; arc=none smtp.client-ip=198.175.65.15 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="cs/lZpMY" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741179736; x=1772715736; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=53bjcwBoOZAPsqRNQ3fKEphCjwEGIYzxF8r+fwuUfvM=; b=cs/lZpMY9RikMPugTd5f8nJjpvJqjAwQ4P2g2zID53UbdFkLF6Lt+6lJ XtDVBsl/ut+ag/U0qGoqqDga61anoVQA1E1FQNRxkN73vEX2s0SpqVBBU UU2iWV+eJeXPlO9KxOuSi1zUEW/aO2wDWDXl/TDx7FqmjRaO1x3FaPO51 W2fYQW3JVyGNjMuqnSDdXKmWS+E9gj2s2uRiXEaWJMVwgiZT544CkPgH4 yi7PHTEkpVVbbXOxM7Y62AO3YZ8HIyZl3HNTnvLBzdXs34dFy0vNUDYPx rUObhdjgNOqjxKogPVKYNlzijeDxzlleihjMpC9A82eUVknMOYAAA+HHp Q==; X-CSE-ConnectionGUID: dyE8ZVUZQHmlWbzdbfPdGQ== X-CSE-MsgGUID: EIp7AsKeQA+IlFlwAcpDiA== X-IronPort-AV: E=McAfee;i="6700,10204,11363"; a="45795192" X-IronPort-AV: E=Sophos;i="6.14,223,1736841600"; d="scan'208";a="45795192" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Mar 2025 05:02:15 -0800 X-CSE-ConnectionGUID: PyTt62bcRWu9OQ7sMqOaNw== X-CSE-MsgGUID: ibYl+DxXRgC42qezk0BUYg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,223,1736841600"; d="scan'208";a="123277205" Received: from mohdfai2-ilbpg12-1.png.intel.com ([10.88.227.73]) by fmviesa005.fm.intel.com with ESMTP; 05 Mar 2025 05:02:07 -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 , Choong Yong Liang , Chwee-Lin Choong , 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 v8 10/11] igc: add support to get MAC Merge data via ethtool Date: Wed, 5 Mar 2025 08:00:25 -0500 Message-Id: <20250305130026.642219-11-faizal.abdul.rahim@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250305130026.642219-1-faizal.abdul.rahim@linux.intel.com> References: <20250305130026.642219-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 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 *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 igc_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) @@ -2101,6 +2114,7 @@ static const struct ethtool_ops igc_ethtool_ops =3D { .get_link_ksettings =3D igc_ethtool_get_link_ksettings, .set_link_ksettings =3D igc_ethtool_set_link_ksettings, .self_test =3D igc_ethtool_diag_test, + .get_mm =3D igc_ethtool_get_mm, .set_mm =3D igc_ethtool_set_mm, }; =20 diff --git a/drivers/net/ethernet/intel/igc/igc_tsn.h b/drivers/net/etherne= t/intel/igc/igc_tsn.h index 975f4e38836e..2b885f98e720 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