Commit d614cfbc authored by Ben Hutchings's avatar Ben Hutchings Committed by David S. Miller

sfc: Enable IPv6 RSS using random key for Toeplitz hash

Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 97e1eaa0
...@@ -135,12 +135,14 @@ static inline struct falcon_board *falcon_board(struct efx_nic *efx) ...@@ -135,12 +135,14 @@ static inline struct falcon_board *falcon_board(struct efx_nic *efx)
* @fw_build: Firmware build number * @fw_build: Firmware build number
* @mcdi: Management-Controller-to-Driver Interface * @mcdi: Management-Controller-to-Driver Interface
* @wol_filter_id: Wake-on-LAN packet filter id * @wol_filter_id: Wake-on-LAN packet filter id
* @ipv6_rss_key: Toeplitz hash key for IPv6 RSS
*/ */
struct siena_nic_data { struct siena_nic_data {
u64 fw_version; u64 fw_version;
u32 fw_build; u32 fw_build;
struct efx_mcdi_iface mcdi; struct efx_mcdi_iface mcdi;
int wol_filter_id; int wol_filter_id;
u8 ipv6_rss_key[40];
}; };
extern void siena_print_fwver(struct efx_nic *efx, char *buf, size_t len); extern void siena_print_fwver(struct efx_nic *efx, char *buf, size_t len);
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/random.h>
#include "net_driver.h" #include "net_driver.h"
#include "bitfield.h" #include "bitfield.h"
#include "efx.h" #include "efx.h"
...@@ -274,6 +275,9 @@ static int siena_probe_nic(struct efx_nic *efx) ...@@ -274,6 +275,9 @@ static int siena_probe_nic(struct efx_nic *efx)
goto fail5; goto fail5;
} }
get_random_bytes(&nic_data->ipv6_rss_key,
sizeof(nic_data->ipv6_rss_key));
return 0; return 0;
fail5: fail5:
...@@ -293,6 +297,7 @@ static int siena_probe_nic(struct efx_nic *efx) ...@@ -293,6 +297,7 @@ static int siena_probe_nic(struct efx_nic *efx)
*/ */
static int siena_init_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; efx_oword_t temp;
int rc; int rc;
...@@ -319,6 +324,20 @@ static int siena_init_nic(struct efx_nic *efx) ...@@ -319,6 +324,20 @@ static int siena_init_nic(struct efx_nic *efx)
EFX_SET_OWORD_FIELD(temp, FRF_BZ_RX_INGR_EN, 1); EFX_SET_OWORD_FIELD(temp, FRF_BZ_RX_INGR_EN, 1);
efx_writeo(efx, &temp, FR_AZ_RX_CFG); efx_writeo(efx, &temp, FR_AZ_RX_CFG);
/* Enable IPv6 RSS */
BUILD_BUG_ON(sizeof(nic_data->ipv6_rss_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));
efx_writeo(efx, &temp, FR_CZ_RX_RSS_IPV6_REG1);
memcpy(&temp, nic_data->ipv6_rss_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),
FRF_CZ_RX_RSS_IPV6_TKEY_HI_WIDTH / 8);
efx_writeo(efx, &temp, FR_CZ_RX_RSS_IPV6_REG3);
if (efx_nic_rx_xoff_thresh >= 0 || efx_nic_rx_xon_thresh >= 0) if (efx_nic_rx_xoff_thresh >= 0 || efx_nic_rx_xon_thresh >= 0)
/* No MCDI operation has been defined to set thresholds */ /* No MCDI operation has been defined to set thresholds */
EFX_ERR(efx, "ignoring RX flow control thresholds\n"); EFX_ERR(efx, "ignoring RX flow control thresholds\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment