Commit 5d3a6fca authored by Ben Hutchings's avatar Ben Hutchings Committed by David S. Miller
Browse files

sfc: Move siena_nic_data::ipv6_rss_key to efx_nic::rx_hash_key 



We will use this hash key for Toeplitz IPv4 hashing too.

Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 604f6049

drivers/net/sfc/efx.c

+3 −0
Original line number Diff line number Diff line
@@ -1134,6 +1134,9 @@ static int efx_probe_nic(struct efx_nic *efx) 
	 * in MSI-X interrupts. */

	efx_probe_interrupts(efx);



	if (efx->n_channels > 1)

		get_random_bytes(&efx->rx_hash_key, sizeof(efx->rx_hash_key));



	efx_set_channels(efx);

	efx->net_dev->real_num_tx_queues = efx->n_tx_channels;

drivers/net/sfc/net_driver.h

+1 −0
Original line number Diff line number Diff line
@@ -735,6 +735,7 @@ struct efx_nic { 
	unsigned n_tx_channels;

	unsigned int rx_buffer_len;

	unsigned int rx_buffer_order;

	u8 rx_hash_key[40];



	unsigned int_error_count;

	unsigned long int_error_expire;

drivers/net/sfc/nic.h

+0 −1
Original line number Diff line number Diff line
@@ -142,7 +142,6 @@ struct siena_nic_data { 
	u32 fw_build;

	struct efx_mcdi_iface mcdi;

	int wol_filter_id;

	u8 ipv6_rss_key[40];

};



extern void siena_print_fwver(struct efx_nic *efx, char *buf, size_t len);

drivers/net/sfc/siena.c

+4 −8
Original line number Diff line number Diff line
@@ -285,9 +285,6 @@ static int siena_probe_nic(struct efx_nic *efx) 
		goto fail5;

	}



	get_random_bytes(&nic_data->ipv6_rss_key,

			 sizeof(nic_data->ipv6_rss_key));



	return 0;



fail5:
@@ -307,7 +304,6 @@ static int siena_probe_nic(struct efx_nic *efx) 
 */

static int siena_init_nic(struct efx_nic *efx)

{

	struct siena_nic_data *nic_data = efx->nic_data;

	efx_oword_t temp;

	int rc;
@@ -336,16 +332,16 @@ static int siena_init_nic(struct efx_nic *efx) 
	efx_writeo(efx, &temp, FR_AZ_RX_CFG);



	/* Enable IPv6 RSS */

	BUILD_BUG_ON(sizeof(nic_data->ipv6_rss_key) !=

	BUILD_BUG_ON(sizeof(efx->rx_hash_key) <

		     2 * sizeof(temp) + FRF_CZ_RX_RSS_IPV6_TKEY_HI_WIDTH / 8 ||

		     FRF_CZ_RX_RSS_IPV6_TKEY_HI_LBN != 0);

	memcpy(&temp, nic_data->ipv6_rss_key, sizeof(temp));

	memcpy(&temp, efx->rx_hash_key, sizeof(temp));

	efx_writeo(efx, &temp, FR_CZ_RX_RSS_IPV6_REG1);

	memcpy(&temp, nic_data->ipv6_rss_key + sizeof(temp), sizeof(temp));

	memcpy(&temp, efx->rx_hash_key + sizeof(temp), sizeof(temp));

	efx_writeo(efx, &temp, FR_CZ_RX_RSS_IPV6_REG2);

	EFX_POPULATE_OWORD_2(temp, FRF_CZ_RX_RSS_IPV6_THASH_ENABLE, 1,

			     FRF_CZ_RX_RSS_IPV6_IP_THASH_ENABLE, 1);

	memcpy(&temp, nic_data->ipv6_rss_key + 2 * sizeof(temp),

	memcpy(&temp, efx->rx_hash_key + 2 * sizeof(temp),

	       FRF_CZ_RX_RSS_IPV6_TKEY_HI_WIDTH / 8);

	efx_writeo(efx, &temp, FR_CZ_RX_RSS_IPV6_REG3);