From mboxrd@z Thu Jan 1 00:00:00 1970 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 smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (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 85DA0D1489D for ; Thu, 8 Jan 2026 05:21:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 3CD2260690; Thu, 8 Jan 2026 05:21:36 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id B6DKwcPnMlG6; Thu, 8 Jan 2026 05:21:34 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.142; helo=lists1.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 23A6B60665 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org; s=default; t=1767849694; bh=d4Qt9qNzW3pF7PVxWKXa7+NHQx1qYq7Xv1HOtfc7bR4=; h=From:To:CC:Date:In-Reply-To:References:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=MvOJd9rZcHGQmp0+hWW5kzYA8eiQX0VgT8XGOXH02sjJPN/hCBQDqOkraHlk5y5sz o1bOrkzlUkI//d0xelZHu85go728fQQJtiqhbEjY0Ny5JjAdPRC8wwFIdgz3XwP92l i67S+MIKk1hTxSgyWu6QLINtlBNocEFSJBICB2zi4+BzLZWzPRsd/saDy5NO39g9lO XtFng0MspZSnHeswyMfSHC4aL/IYteuI6N6udSASi9N73POclE7KPCJqaCxdWTVyd+ SD1grNuNV+1ZfVwAXWK38NfO61SQLcL1Bc4uvL9tRq5ioWGzihoPvN14fpJk5E691C uW6l0ObBF792g== Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp3.osuosl.org (Postfix) with ESMTP id 23A6B60665; Thu, 8 Jan 2026 05:21:34 +0000 (UTC) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists1.osuosl.org (Postfix) with ESMTP id F298025B for ; Thu, 8 Jan 2026 05:21:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id E4E8B400B5 for ; Thu, 8 Jan 2026 05:21:32 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id VhmXbovjaB38 for ; Thu, 8 Jan 2026 05:21:32 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=52.13.214.179; helo=pdx-out-005.esa.us-west-2.outbound.mail-perimeter.amazon.com; envelope-from=prvs=461565dfb=takkozu@amazon.co.jp; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org E73B540077 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org E73B540077 Received: from pdx-out-005.esa.us-west-2.outbound.mail-perimeter.amazon.com (pdx-out-005.esa.us-west-2.outbound.mail-perimeter.amazon.com [52.13.214.179]) by smtp2.osuosl.org (Postfix) with ESMTPS id E73B540077 for ; Thu, 8 Jan 2026 05:21:31 +0000 (UTC) X-CSE-ConnectionGUID: Y2jKij55SUqxKTv2AZxb5w== X-CSE-MsgGUID: w8qSXhB4TaGy6M7lI+j0qw== X-IronPort-AV: E=Sophos;i="6.21,209,1763424000"; d="scan'208";a="10449531" Received: from ip-10-5-12-219.us-west-2.compute.internal (HELO smtpout.naws.us-west-2.prod.farcaster.email.amazon.dev) ([10.5.12.219]) by internal-pdx-out-005.esa.us-west-2.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jan 2026 05:21:28 +0000 Received: from EX19MTAUWA002.ant.amazon.com [205.251.233.234:23064] by smtpin.naws.us-west-2.prod.farcaster.email.amazon.dev [10.0.2.24:2525] with esmtp (Farcaster) id 2af57c61-a40a-48c7-ba17-ae7a5310035f; Thu, 8 Jan 2026 05:21:28 +0000 (UTC) X-Farcaster-Flow-ID: 2af57c61-a40a-48c7-ba17-ae7a5310035f Received: from EX19D001UWA001.ant.amazon.com (10.13.138.214) by EX19MTAUWA002.ant.amazon.com (10.250.64.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.35; Thu, 8 Jan 2026 05:21:28 +0000 Received: from 603e5f7bc1fe.amazon.com (10.37.244.10) by EX19D001UWA001.ant.amazon.com (10.13.138.214) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.35; Thu, 8 Jan 2026 05:21:26 +0000 From: Takashi Kozu To: CC: , , , , , , , , Takashi Kozu , Kohei Enju Date: Thu, 8 Jan 2026 14:20:13 +0900 Message-ID: <20260108052020.84218-6-takkozu@amazon.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20260108052020.84218-5-takkozu@amazon.com> References: <20260108052020.84218-5-takkozu@amazon.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.37.244.10] X-ClientProxiedBy: EX19D045UWC004.ant.amazon.com (10.13.139.203) To EX19D001UWA001.ant.amazon.com (10.13.138.214) X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazoncorp2; t=1767849691; x=1799385691; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=d4Qt9qNzW3pF7PVxWKXa7+NHQx1qYq7Xv1HOtfc7bR4=; b=R6zjqXVCwBTkwFVkF4LQjG2NxeEWWQ+SxAj6oja6Z4mQiLweic6u0KvH wUu1Uz4BPfwrxgOFzbypu/cMzKrp4E+GLWkGvlqDFvnnpobP/swNnQLnw FdMbGQIMVxPM5HGY0r8wnsHsUYriP5WdhIBNsXP+8qgNbuoZAT8pyUBU8 jLpz2FVUarc6LbB/duMhqhbIkkvSkGHNa+GfLf3FfjTTPWi4q2K3f5g78 XgG8iIJVX5o9BGGyaygQwjlFZ3mqMM9meEGLBx7mTGWdXQ7cTooEoFiE5 DRxMpau1HefA9FhCy27FSgysivNz1vr1ZLA+F+q7pNQr1a1cc2IIo8U57 Q==; X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.com X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=amazon.com header.i=@amazon.com header.a=rsa-sha256 header.s=amazoncorp2 header.b=R6zjqXVC Subject: [Intel-wired-lan] [PATCH iwl-next v2 1/3] igb: prepare for RSS key get/set support X-BeenThere: intel-wired-lan@osuosl.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" Store the RSS key inside struct igb_adapter and introduce the igb_write_rss_key() helper function. This allows the driver to program the E1000 registers using a persistent RSS key, instead of using a stack-local buffer in igb_setup_mrqc(). Tested-by: Kohei Enju Signed-off-by: Takashi Kozu --- drivers/net/ethernet/intel/igb/igb.h | 3 +++ drivers/net/ethernet/intel/igb/igb_ethtool.c | 12 ++++++++++++ drivers/net/ethernet/intel/igb/igb_main.c | 6 ++---- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/intel/igb/igb.h b/drivers/net/ethernet/intel/igb/igb.h index 0fff1df81b7b..8c9b02058cec 100644 --- a/drivers/net/ethernet/intel/igb/igb.h +++ b/drivers/net/ethernet/intel/igb/igb.h @@ -495,6 +495,7 @@ struct hwmon_buff { #define IGB_N_PEROUT 2 #define IGB_N_SDP 4 #define IGB_RETA_SIZE 128 +#define IGB_RSS_KEY_SIZE 40 enum igb_filter_match_flags { IGB_FILTER_FLAG_ETHER_TYPE = 0x1, @@ -655,6 +656,7 @@ struct igb_adapter { struct i2c_client *i2c_client; u32 rss_indir_tbl_init; u8 rss_indir_tbl[IGB_RETA_SIZE]; + u8 rss_key[IGB_RSS_KEY_SIZE]; unsigned long link_check_timeout; int copper_tries; @@ -735,6 +737,7 @@ void igb_down(struct igb_adapter *); void igb_reinit_locked(struct igb_adapter *); void igb_reset(struct igb_adapter *); int igb_reinit_queues(struct igb_adapter *); +void igb_write_rss_key(struct igb_adapter *adapter); void igb_write_rss_indir_tbl(struct igb_adapter *); int igb_set_spd_dplx(struct igb_adapter *, u32, u8); int igb_setup_tx_resources(struct igb_ring *); diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c index 10e2445e0ded..8695ff28a7b8 100644 --- a/drivers/net/ethernet/intel/igb/igb_ethtool.c +++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c @@ -3016,6 +3016,18 @@ static int igb_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd) return ret; } +void igb_write_rss_key(struct igb_adapter *adapter) +{ + struct e1000_hw *hw = &adapter->hw; + u32 val; + int i; + + for (i = 0; i < IGB_RSS_KEY_SIZE / 4; i++) { + val = get_unaligned_le32(&adapter->rss_key[i * 4]); + wr32(E1000_RSSRK(i), val); + } +} + static int igb_get_eee(struct net_device *netdev, struct ethtool_keee *edata) { struct igb_adapter *adapter = netdev_priv(netdev); diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index 85f9589cc568..da0f550de605 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -4525,11 +4525,9 @@ static void igb_setup_mrqc(struct igb_adapter *adapter) struct e1000_hw *hw = &adapter->hw; u32 mrqc, rxcsum; u32 j, num_rx_queues; - u32 rss_key[10]; - netdev_rss_key_fill(rss_key, sizeof(rss_key)); - for (j = 0; j < 10; j++) - wr32(E1000_RSSRK(j), rss_key[j]); + netdev_rss_key_fill(adapter->rss_key, sizeof(adapter->rss_key)); + igb_write_rss_key(adapter); num_rx_queues = adapter->rss_queues; -- 2.52.0