From patchwork Wed Mar 5 13:00:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Faizal Rahim X-Patchwork-Id: 14002845 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 26824C19F32 for ; Wed, 5 Mar 2025 14:33:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To: Cc:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=xW3SD7VH/6AYdLN8aPQVxQKBQ9+Hj38arPQU9Btfah0=; b=2UUlLaAI5x+SFwcs7sZDTteyVl +l0yHwPPSRw8RPYF/Z2eBu0/l0yl6VPil1OqSH9sAFx523dcKDpsXBsUIy/Z4xvkORhgFBSn7Z0rv NCLO985ctSiFGx42kE4KwjcpvwnnQrFg7hsrWX1FZ2JnkrkWMNvw3dtEUJGZS3fd0yRu6iL9gmAl2 UL2rnytP5YqGR1+jHbWfjacfJlKOe+hk19vaeJHLCslUseuRFUqzAIv7g3k1KnkdZAoavPTQ7VZyP d/uUvxYihnQrWyd+u2ymUQMFFrP0LGGy4cLqeHHB7vk2Gw3fLRcUXVsK2eACGSTh3ILYfWEoXYG8O JD5s7n5w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tppob-00000008MYf-0ob5; Wed, 05 Mar 2025 14:33:41 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tpoOB-000000086ax-0FXr for linux-arm-kernel@bombadil.infradead.org; Wed, 05 Mar 2025 13:02:19 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description; bh=xW3SD7VH/6AYdLN8aPQVxQKBQ9+Hj38arPQU9Btfah0=; b=RYxrS75XgAB5BlNT3J15eyqyAX lrdeg55f3oy5sZNnLOYLDLr/u99TNQLF6QTpSChg72eBL7aUgdpf89LXPjJ6wlz3FdBaaOdLcP8bR cmOWf17/0S5cXypnjZ2lliujCdiUsLWXtVqIAPQKB79VG4Wcm0vANNDvrPKu21WTzAjXWHXNtwkBl s3HXn79q8vOm2cMZ85AsdSulnC3teYASCpy5hM1cD2DNIQ2bvBd0V/Ntibu+j1Eqm29zlFiZaw5Zt tRgWIOVioOZSAJzuL+sQFLWnKAP9T8arlqVRtm5V6FIxqkyeklJo3hCgrctUhlSeEWAWw0JGl4ctN XnR84nLw==; Received: from mgamail.intel.com ([198.175.65.15]) by desiato.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tpoO7-00000000XEF-2m1D for linux-arm-kernel@lists.infradead.org; Wed, 05 Mar 2025 13:02:17 +0000 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: wmj/g2ooSyiaTiubDQnMJg== X-CSE-MsgGUID: lGUfklE5Tj+iW/m/xvWzQw== X-IronPort-AV: E=McAfee;i="6700,10204,11363"; a="45795199" X-IronPort-AV: E=Sophos;i="6.14,223,1736841600"; d="scan'208";a="45795199" 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> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250305_130216_122909_EF4A1766 X-CRM114-Status: GOOD ( 10.72 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 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 *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 igc_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) @@ -2101,6 +2114,7 @@ static const struct ethtool_ops igc_ethtool_ops = { .get_link_ksettings = igc_ethtool_get_link_ksettings, .set_link_ksettings = igc_ethtool_set_link_ksettings, .self_test = igc_ethtool_diag_test, + .get_mm = igc_ethtool_get_mm, .set_mm = igc_ethtool_set_mm, }; diff --git a/drivers/net/ethernet/intel/igc/igc_tsn.h b/drivers/net/ethernet/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_ +#define IGC_RX_MIN_FRAG_SIZE 60 #define SMD_FRAME_SIZE 60 enum igc_txd_popts_type {