From nobody Sun Feb 8 18:28:27 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 E494B2376E9; Thu, 27 Feb 2025 14:03:12 +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=1740664994; cv=none; b=HsjQL5aP68G6N1jB6Bh9xr1zna7X1RJTBOw18/jlRZvkKrnJJDXE+0WZ/q9Gf4khGmVEIpJIltOcbCji7Bvl4u68NOpNh8mx4D1juRge6OO7gIdwhdze4yEJCJucUxMGzRcaVFjJtWg81tw562fxJbsSVlD7IPO/3Za1u63onLc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740664994; c=relaxed/simple; bh=uHdGb/XevWeuAeirmuP1VjWhxLIfjbCVWdgvvlUnyvM=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=eaVUMd09mhk9RJsab6UTu3/Bwcurdr7xljPt+kTjpsTsmmdXZwNGAGlHyh0rhrYamaVW3N1d21NPgs4+hnGlV0x1xDwF2mZSrghaAbUzF75ZHnCwetVsiemv0ceBMtq1WNlTsOBQ7DlZqvQY3k0nTTrU560fQa4sd5zkf5yiDGY= 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=IgWzdtk/; 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="IgWzdtk/" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1740664993; x=1772200993; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=uHdGb/XevWeuAeirmuP1VjWhxLIfjbCVWdgvvlUnyvM=; b=IgWzdtk/pR1w2GflvvEenn9qpqWIIsxxdyTqfzglIVvK5NNlY6EFqlIo 1YMaPsH4lAP2U2zOhjVhxCk+4++T58L3Az9VhShmcxKlqYgfMhM0/gCcE uKXs4NGBdcUPbcdTTjc+ioElbo5ZfyuukXkcfEnL/Xpxm3SrhISeligr9 YzwRWpgfeRXA/xkP4Z+BMBydZ2FsnT2MryF3/0NPpCuVaoLqElp6TT8vR icCmsLOjEcApJi8/tNRxlk3BWBD22jftNFuZ1ASOAxpNYjaqcgfzrc3xa yHxVDCORDQgEanjgdq3z2VNajv13PjyWYKww/mRVBxQpD2ABEUTusjP9c Q==; X-CSE-ConnectionGUID: EjpBX1iPRJWJu4uFbsXwIA== X-CSE-MsgGUID: luJVgFfuQ9ymbMkP9HfjIw== X-IronPort-AV: E=McAfee;i="6700,10204,11314"; a="41752415" X-IronPort-AV: E=Sophos;i="6.12,310,1728975600"; d="scan'208";a="41752415" 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:12 -0800 X-CSE-ConnectionGUID: AAz8e3ToRjSYv13sn+kcPA== X-CSE-MsgGUID: oWxo3uO9Ti2Oo0PSKFMpvg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,319,1732608000"; d="scan'208";a="122149646" Received: from mohdfai2-ilbpg12-1.png.intel.com ([10.88.227.73]) by fmviesa004.fm.intel.com with ESMTP; 27 Feb 2025 06:03:04 -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 6/9] igc: Add support to set tx-min-frag-size Date: Thu, 27 Feb 2025 09:01:54 -0500 Message-Id: <20250227140158.2129988-7-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" Add support to set tx-min-frag-size via set_mm callback in igc. Increase the max limit of tx-ming-frag-size in ethtool from 252 to 256 since i225/6 value range is 64, 128, 192 and 256. Co-developed-by: Vinicius Costa Gomes Signed-off-by: Vinicius Costa Gomes Signed-off-by: Faizal Rahim --- drivers/net/ethernet/intel/igc/igc.h | 1 + drivers/net/ethernet/intel/igc/igc_defines.h | 1 + drivers/net/ethernet/intel/igc/igc_ethtool.c | 5 +++ drivers/net/ethernet/intel/igc/igc_tsn.c | 37 ++++++++++++++++++-- drivers/net/ethernet/intel/igc/igc_tsn.h | 2 +- net/ethtool/mm.c | 2 +- 6 files changed, 43 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/intel/igc/igc.h b/drivers/net/ethernet/in= tel/igc/igc.h index 705bd4739e3b..2f3662143589 100644 --- a/drivers/net/ethernet/intel/igc/igc.h +++ b/drivers/net/ethernet/intel/igc/igc.h @@ -42,6 +42,7 @@ void igc_ethtool_set_ops(struct net_device *); =20 struct fpe_t { struct ethtool_mmsv mmsv; + u32 tx_min_frag_size; }; =20 enum igc_mac_filter_type { diff --git a/drivers/net/ethernet/intel/igc/igc_defines.h b/drivers/net/eth= ernet/intel/igc/igc_defines.h index 22db1de02964..038ee89f1e08 100644 --- a/drivers/net/ethernet/intel/igc/igc_defines.h +++ b/drivers/net/ethernet/intel/igc/igc_defines.h @@ -551,6 +551,7 @@ #define IGC_TQAVCTRL_PREEMPT_ENA 0x00000002 #define IGC_TQAVCTRL_ENHANCED_QAV 0x00000008 #define IGC_TQAVCTRL_FUTSCDDIS 0x00000080 +#define IGC_TQAVCTRL_MIN_FRAG_MASK 0x0000C000 =20 #define IGC_TXQCTL_QUEUE_MODE_LAUNCHT 0x00000001 #define IGC_TXQCTL_STRICT_CYCLE 0x00000002 diff --git a/drivers/net/ethernet/intel/igc/igc_ethtool.c b/drivers/net/eth= ernet/intel/igc/igc_ethtool.c index e2a14edf7552..081e24f228b2 100644 --- a/drivers/net/ethernet/intel/igc/igc_ethtool.c +++ b/drivers/net/ethernet/intel/igc/igc_ethtool.c @@ -1789,6 +1789,11 @@ static int igc_ethtool_set_mm(struct net_device *net= dev, struct igc_adapter *adapter =3D netdev_priv(netdev); struct fpe_t *fpe =3D &adapter->fpe; =20 + fpe->tx_min_frag_size =3D igc_fpe_get_supported_frag_size(cmd->tx_min_fra= g_size); + if (fpe->tx_min_frag_size !=3D cmd->tx_min_frag_size) + NL_SET_ERR_MSG_MOD(extack, + "tx-min-frag-size value set is unsupported. Rounded up to supported= value (64, 128, 192, 256)"); + if (fpe->mmsv.pmac_enabled !=3D cmd->pmac_enabled) { if (cmd->pmac_enabled) static_branch_inc(&igc_fpe_enabled); diff --git a/drivers/net/ethernet/intel/igc/igc_tsn.c b/drivers/net/etherne= t/intel/igc/igc_tsn.c index acfff3919793..c9c70544c4c1 100644 --- a/drivers/net/ethernet/intel/igc/igc_tsn.c +++ b/drivers/net/ethernet/intel/igc/igc_tsn.c @@ -7,6 +7,12 @@ #include "igc_hw.h" #include "igc_tsn.h" =20 +#define MIN_MULTPLIER_TX_MIN_FRAG 0 +#define MAX_MULTPLIER_TX_MIN_FRAG 3 +/* Frag size is based on the Section 8.12.2 of the SW User Manual */ +#define TX_MIN_FRAG_SIZE 64 +#define TX_MAX_FRAG_SIZE (TX_MIN_FRAG_SIZE * (MAX_MULTPLIER_TX_MIN_FRAG + = 1)) + DEFINE_STATIC_KEY_FALSE(igc_fpe_enabled); =20 static int igc_fpe_init_smd_frame(struct igc_ring *ring, @@ -129,6 +135,7 @@ static const struct ethtool_mmsv_ops igc_mmsv_ops =3D { =20 void igc_fpe_init(struct igc_adapter *adapter) { + adapter->fpe.tx_min_frag_size =3D TX_MIN_FRAG_SIZE; ethtool_mmsv_init(&adapter->fpe.mmsv, adapter->netdev, &igc_mmsv_ops); } =20 @@ -279,7 +286,7 @@ static int igc_tsn_disable_offload(struct igc_adapter *= adapter) tqavctrl =3D rd32(IGC_TQAVCTRL); tqavctrl &=3D ~(IGC_TQAVCTRL_TRANSMIT_MODE_TSN | IGC_TQAVCTRL_ENHANCED_QAV | IGC_TQAVCTRL_FUTSCDDIS | - IGC_TQAVCTRL_PREEMPT_ENA); + IGC_TQAVCTRL_PREEMPT_ENA | IGC_TQAVCTRL_MIN_FRAG_MASK); =20 wr32(IGC_TQAVCTRL, tqavctrl); =20 @@ -325,12 +332,34 @@ static void igc_tsn_set_retx_qbvfullthreshold(struct = igc_adapter *adapter) wr32(IGC_RETX_CTL, retxctl); } =20 +static u8 igc_fpe_get_frag_size_mult(const struct fpe_t *fpe) +{ + u8 mult =3D (fpe->tx_min_frag_size / TX_MIN_FRAG_SIZE) - 1; + + return clamp_t(u8, mult, MIN_MULTPLIER_TX_MIN_FRAG, + MAX_MULTPLIER_TX_MIN_FRAG); +} + +u32 igc_fpe_get_supported_frag_size(u32 frag_size) +{ + const u32 supported_sizes[] =3D {64, 128, 192, 256}; + + /* Find the smallest supported size that is >=3D frag_size */ + for (int i =3D 0; i < ARRAY_SIZE(supported_sizes); i++) { + if (frag_size <=3D supported_sizes[i]) + return supported_sizes[i]; + } + + return TX_MAX_FRAG_SIZE; /* Should not happen, value > 256 is blocked by = ethtool */ +} + static int igc_tsn_enable_offload(struct igc_adapter *adapter) { struct igc_hw *hw =3D &adapter->hw; u32 tqavctrl, baset_l, baset_h; u32 sec, nsec, cycle, rxpbs; ktime_t base_time, systim; + u32 frag_size_mult; int i; =20 wr32(IGC_TSAUXC, 0); @@ -502,13 +531,15 @@ static int igc_tsn_enable_offload(struct igc_adapter = *adapter) } =20 tqavctrl =3D rd32(IGC_TQAVCTRL) & ~(IGC_TQAVCTRL_FUTSCDDIS | - IGC_TQAVCTRL_PREEMPT_ENA); - + IGC_TQAVCTRL_PREEMPT_ENA | IGC_TQAVCTRL_MIN_FRAG_MASK); tqavctrl |=3D IGC_TQAVCTRL_TRANSMIT_MODE_TSN | IGC_TQAVCTRL_ENHANCED_QAV; =20 if (adapter->fpe.mmsv.pmac_enabled) tqavctrl |=3D IGC_TQAVCTRL_PREEMPT_ENA; =20 + frag_size_mult =3D igc_fpe_get_frag_size_mult(&adapter->fpe); + tqavctrl |=3D FIELD_PREP(IGC_TQAVCTRL_MIN_FRAG_MASK, frag_size_mult); + adapter->qbv_count++; =20 cycle =3D adapter->cycle_time; diff --git a/drivers/net/ethernet/intel/igc/igc_tsn.h b/drivers/net/etherne= t/intel/igc/igc_tsn.h index 7ba232ef37c9..7491fd65b846 100644 --- a/drivers/net/ethernet/intel/igc/igc_tsn.h +++ b/drivers/net/ethernet/intel/igc/igc_tsn.h @@ -14,7 +14,7 @@ enum igc_txd_popts_type { DECLARE_STATIC_KEY_FALSE(igc_fpe_enabled); =20 void igc_fpe_init(struct igc_adapter *adapter); -u32 igc_fpe_get_supported_frag_size(u32 user_frag_size); +u32 igc_fpe_get_supported_frag_size(u32 frag_size); int igc_tsn_offload_apply(struct igc_adapter *adapter); int igc_tsn_reset(struct igc_adapter *adapter); void igc_tsn_adjust_txtime_offset(struct igc_adapter *adapter); diff --git a/net/ethtool/mm.c b/net/ethtool/mm.c index ad9b40034003..4c395cd949ab 100644 --- a/net/ethtool/mm.c +++ b/net/ethtool/mm.c @@ -153,7 +153,7 @@ const struct nla_policy ethnl_mm_set_policy[ETHTOOL_A_M= M_MAX + 1] =3D { [ETHTOOL_A_MM_VERIFY_TIME] =3D NLA_POLICY_RANGE(NLA_U32, 1, 128), [ETHTOOL_A_MM_TX_ENABLED] =3D NLA_POLICY_MAX(NLA_U8, 1), [ETHTOOL_A_MM_PMAC_ENABLED] =3D NLA_POLICY_MAX(NLA_U8, 1), - [ETHTOOL_A_MM_TX_MIN_FRAG_SIZE] =3D NLA_POLICY_RANGE(NLA_U32, 60, 252), + [ETHTOOL_A_MM_TX_MIN_FRAG_SIZE] =3D NLA_POLICY_RANGE(NLA_U32, 60, 256), }; =20 static void mm_state_to_cfg(const struct ethtool_mm_state *state, --=20 2.34.1