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 smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (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 AD4BACA6C9D for ; Tue, 27 Jan 2026 08:55:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 572BD40B84; Tue, 27 Jan 2026 08:55:55 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id vdhRw68mypik; Tue, 27 Jan 2026 08:55:54 +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 smtp4.osuosl.org 1202640B81 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org; s=default; t=1769504154; bh=QfY1g9C2h8elKkHTNNBWGB62LHLqZF4532Rj48fTap8=; h=From:To:CC:Date:In-Reply-To:References:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=wPD6Pw63hVG+aHwzsbGHVwV+am94kWzDAmy3QfOVo1D3ZAK16tJBTt10GNSLhPcil sagblko4N7pavN0IaCl46eDc+qEAkFk0TVECS8AiV69Ceu5nhNBVesXxAAq9NPflmP W+UI3hqXii1VtVgV63s2LYvxQQInkcrMpqbnbT9wbtJr5LuetP5onGhnUEzZmXnU6x TP4rOFs435e991WluriUeDa3JwqvLm+2InUT35RYAnxF0PpGuDyBl1LHVSw4Si9uoL qsT3aMd2zHEzTCj28bLzak7TcC4Z/U7WSqxcet3uVSoK9G4tjWxQhwXYz8qz0IZj9M MJPdVGWHLcu5A== Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp4.osuosl.org (Postfix) with ESMTP id 1202640B81; Tue, 27 Jan 2026 08:55:54 +0000 (UTC) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) by lists1.osuosl.org (Postfix) with ESMTP id 1ECD72F4 for ; Tue, 27 Jan 2026 08:55:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 0EA8460F2D for ; Tue, 27 Jan 2026 08:55:53 +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 66XctEd8xsb9 for ; Tue, 27 Jan 2026 08:55:52 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=44.246.1.125; helo=pdx-out-002.esa.us-west-2.outbound.mail-perimeter.amazon.com; envelope-from=prvs=4803e00d0=takkozu@amazon.co.jp; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org 07B8D60F29 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 07B8D60F29 Received: from pdx-out-002.esa.us-west-2.outbound.mail-perimeter.amazon.com (pdx-out-002.esa.us-west-2.outbound.mail-perimeter.amazon.com [44.246.1.125]) by smtp3.osuosl.org (Postfix) with ESMTPS id 07B8D60F29 for ; Tue, 27 Jan 2026 08:55:51 +0000 (UTC) X-CSE-ConnectionGUID: h6rt98Y2S+ytNYHQ1vJRDQ== X-CSE-MsgGUID: ohHjiut/QPKWiA28xw+EWw== X-IronPort-AV: E=Sophos;i="6.21,256,1763424000"; d="scan'208";a="11668567" Received: from ip-10-5-9-48.us-west-2.compute.internal (HELO smtpout.naws.us-west-2.prod.farcaster.email.amazon.dev) ([10.5.9.48]) by internal-pdx-out-002.esa.us-west-2.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Jan 2026 08:55:49 +0000 Received: from EX19MTAUWA001.ant.amazon.com [205.251.233.236:25481] by smtpin.naws.us-west-2.prod.farcaster.email.amazon.dev [10.0.21.97:2525] with esmtp (Farcaster) id 58bd2a5e-5ca5-4efb-ae3e-72a03727abff; Tue, 27 Jan 2026 08:55:48 +0000 (UTC) X-Farcaster-Flow-ID: 58bd2a5e-5ca5-4efb-ae3e-72a03727abff Received: from EX19D001UWA001.ant.amazon.com (10.13.138.214) by EX19MTAUWA001.ant.amazon.com (10.250.64.218) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.35; Tue, 27 Jan 2026 08:55:48 +0000 Received: from 603e5f7bc1fe.amazon.com (10.37.245.7) 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; Tue, 27 Jan 2026 08:55:46 +0000 From: Takashi Kozu To: CC: , , , , , , , , , , , , Takashi Kozu Date: Tue, 27 Jan 2026 17:54:08 +0900 Message-ID: <20260127085410.79645-6-takkozu@amazon.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20260127085410.79645-5-takkozu@amazon.com> References: <20260127085410.79645-5-takkozu@amazon.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.37.245.7] 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=1769504152; x=1801040152; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=QfY1g9C2h8elKkHTNNBWGB62LHLqZF4532Rj48fTap8=; b=kFoICwVoN/wKI0SDsfAH5IIgl9FCoiWHRqeX76/s2NDLyYLSxSO3HvgL U4F6Vu0pQO/nCzQTMJ85cOQOgeUDiUhFN2Uj7WyFvYmsrU44gyCBcu4vu HNQO6s3UnAOTq8RdlLZrOqaoBFnAfCgzIvhUnWpzUQUL0+hoBp8z/GuC9 43DuRvLTyG3B7SM3pp3oHXg1ZD1NwOAE7+zHs9W6ueBMuzmvyCpD68pRy Y1zRIKMTtAIiXwm4nGk+biVleaW0IIvQaRehJiJKCbBr3J0ywy0AN1Er0 iFoMJpyIajnC4qC7rJCdQ1z7BLpRdR23KQNTGa0FXh+I1Cr5N55JzTK59 Q==; X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.com X-Mailman-Original-Authentication-Results: smtp3.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=kFoICwVo Subject: [Intel-wired-lan] [PATCH iwl-next v5 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(). Reviewed-by: Piotr Kwapulinski Reviewed-by: Aleksandr Loktionov Signed-off-by: Takashi Kozu --- drivers/net/ethernet/intel/igb/igb.h | 3 +++ drivers/net/ethernet/intel/igb/igb_ethtool.c | 21 ++++++++++++++++++++ drivers/net/ethernet/intel/igb/igb_main.c | 8 ++++---- 3 files changed, 28 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 b507576b28b2..a93069b761a6 100644 --- a/drivers/net/ethernet/intel/igb/igb_ethtool.c +++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c @@ -3019,6 +3019,27 @@ static int igb_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd) return ret; } +/** + * igb_write_rss_key - Program the RSS key into device registers + * @adapter: board private structure + * + * Write the RSS key stored in adapter->rss_key to the E1000 hardware registers. + * Each 32-bit chunk of the key is read using get_unaligned_le32() and written + * to the appropriate register. + */ +void igb_write_rss_key(struct igb_adapter *adapter) +{ + struct e1000_hw *hw = &adapter->hw; + + ASSERT_RTNL(); + + for (int i = 0; i < IGB_RSS_KEY_SIZE / 4; i++) { + u32 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 dbea37269d2c..c703011b19ec 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -4050,6 +4050,9 @@ static int igb_sw_init(struct igb_adapter *adapter) pci_read_config_word(pdev, PCI_COMMAND, &hw->bus.pci_cmd_word); + /* init RSS key */ + netdev_rss_key_fill(adapter->rss_key, sizeof(adapter->rss_key)); + /* set default ring sizes */ adapter->tx_ring_count = IGB_DEFAULT_TXD; adapter->rx_ring_count = IGB_DEFAULT_RXD; @@ -4525,11 +4528,8 @@ 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]); + igb_write_rss_key(adapter); num_rx_queues = adapter->rss_queues; -- 2.52.0