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: 13960770 X-Patchwork-Delegate: kuba@kernel.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (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 C73AA22B8BD; Wed, 5 Feb 2025 10:06:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738749999; cv=none; b=gvSp3uom5EKQWNez2LyCkWV+pov6Gi0LxDDpDH7WHWdjN3Dfv6PSBFbLev2pbNuqsiEFCz7sKOm3ZdVfICUi4ckCOBcTTEmoD4NcvmK8QxQVeP7aSFR0G1g6/OFxc4dJZxjUUBStvRH0tcRRnjulV+e9mAN/KH6ItxIDllUVbH0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738749999; c=relaxed/simple; bh=LAGXwfWPNxonbtIoO1+jyMLnCooM8DQlGtdO0BdPI4I=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=dqip5vmK94iFhQS5CiUeC6661kVFUOa/0A92rYCGi6WeCsV85oV4qf0TPNyZNc5YOKI2iIxWhaYx9EjUhLOUuB4Ies7vMbUyqE2RSKIFB+Wg3YfgAgx8ojpeSkv1mOdrRgGX8m3u53MmoIdmSsm2cEBmvnQk1EwlIT6/US36ArE= 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=LiKIuj2J; arc=none smtp.client-ip=198.175.65.12 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="LiKIuj2J" 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: UU7E8YlpRGSsZ9OXPRZstg== X-CSE-MsgGUID: iHgiKFPvTeKc27lu71GHKA== X-IronPort-AV: E=McAfee;i="6700,10204,11336"; a="50699240" X-IronPort-AV: E=Sophos;i="6.13,261,1732608000"; d="scan'208";a="50699240" 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> 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. 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);