> -----Original Message-----
> From: Intel-wired-lan <[email protected]> On Behalf
> Of Takashi Kozu
> Sent: Thursday, January 8, 2026 6:20 AM
> To: Nguyen, Anthony L <[email protected]>
> Cc: Kitszel, Przemyslaw <[email protected]>;
> [email protected]; [email protected]; [email protected];
> [email protected]; [email protected]; [email protected];
> [email protected]; Takashi Kozu <[email protected]>; Kohei Enju
> <[email protected]>
> Subject: [Intel-wired-lan] [PATCH iwl-next v2 1/3] igb: prepare for
> RSS key get/set support
>
> 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 <[email protected]>
> Signed-off-by: Takashi Kozu <[email protected]>
> ---
> 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
Reviewed-by: Aleksandr Loktionov <[email protected]>
