Commit 92b6d35f authored by David S. Miller's avatar David S. Miller

Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue

Jeff Kirsher says:

====================
40GbE Intel Wired LAN Driver Updates 2016-04-05

This series contains updates to i40e and i40evf only.

Colin Ian King cleaned up a redundant NULL check which was found by static
analysis.

Anjali enables geneve receive offload for XL710/X710 devices.

Mitch cleans up unused variable in i40e_vc_get_vf_resources_msg().
Fixed the driver to actually be able to adjust VLAN tagging features
through ethtool, as expected.  Fixed a problem where VF resets would
get lost by the PF preventing the VF driver from initializing.  Also
put users mind at ease by lowering some message levels since many of
these conditions can happen any time VFs are enabled or disabled and
are not really indicative a fatal problems, unless they happen
continuously.

Shannon disables the link polling to lessen the admin queue traffic
especially since the link event mask usage has been fixed recently.

Alex Duyck fixes the i40e and i40evf drivers to correctly update
checksums for frames up to 16776960 in length which should be more than
large enough for all possible TSO frames in the near future.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6f555635 24d41e5e
...@@ -60,6 +60,7 @@ static i40e_status i40e_set_mac_type(struct i40e_hw *hw) ...@@ -60,6 +60,7 @@ static i40e_status i40e_set_mac_type(struct i40e_hw *hw)
case I40E_DEV_ID_SFP_X722: case I40E_DEV_ID_SFP_X722:
case I40E_DEV_ID_1G_BASE_T_X722: case I40E_DEV_ID_1G_BASE_T_X722:
case I40E_DEV_ID_10G_BASE_T_X722: case I40E_DEV_ID_10G_BASE_T_X722:
case I40E_DEV_ID_SFP_I_X722:
hw->mac.type = I40E_MAC_X722; hw->mac.type = I40E_MAC_X722;
break; break;
default: default:
......
...@@ -147,9 +147,8 @@ static void i40e_dbg_dump_vsi_seid(struct i40e_pf *pf, int seid) ...@@ -147,9 +147,8 @@ static void i40e_dbg_dump_vsi_seid(struct i40e_pf *pf, int seid)
dev_info(&pf->pdev->dev, " vlan_features = 0x%08lx\n", dev_info(&pf->pdev->dev, " vlan_features = 0x%08lx\n",
(unsigned long int)nd->vlan_features); (unsigned long int)nd->vlan_features);
} }
if (vsi->active_vlans) dev_info(&pf->pdev->dev,
dev_info(&pf->pdev->dev, " vlgrp: & = %p\n", vsi->active_vlans);
" vlgrp: & = %p\n", vsi->active_vlans);
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
" state = %li flags = 0x%08lx, netdev_registered = %i, current_netdev_flags = 0x%04x\n", " state = %li flags = 0x%08lx, netdev_registered = %i, current_netdev_flags = 0x%04x\n",
vsi->state, vsi->flags, vsi->state, vsi->flags,
......
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
#define I40E_DEV_ID_SFP_X722 0x37D0 #define I40E_DEV_ID_SFP_X722 0x37D0
#define I40E_DEV_ID_1G_BASE_T_X722 0x37D1 #define I40E_DEV_ID_1G_BASE_T_X722 0x37D1
#define I40E_DEV_ID_10G_BASE_T_X722 0x37D2 #define I40E_DEV_ID_10G_BASE_T_X722 0x37D2
#define I40E_DEV_ID_SFP_I_X722 0x37D3
#define i40e_is_40G_device(d) ((d) == I40E_DEV_ID_QSFP_A || \ #define i40e_is_40G_device(d) ((d) == I40E_DEV_ID_QSFP_A || \
(d) == I40E_DEV_ID_QSFP_B || \ (d) == I40E_DEV_ID_QSFP_B || \
......
...@@ -313,6 +313,13 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw, ...@@ -313,6 +313,13 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw,
ecmd->advertising |= ADVERTISED_10000baseT_Full; ecmd->advertising |= ADVERTISED_10000baseT_Full;
if (hw_link_info->requested_speeds & I40E_LINK_SPEED_1GB) if (hw_link_info->requested_speeds & I40E_LINK_SPEED_1GB)
ecmd->advertising |= ADVERTISED_1000baseT_Full; ecmd->advertising |= ADVERTISED_1000baseT_Full;
/* adding 100baseT support for 10GBASET_PHY */
if (pf->flags & I40E_FLAG_HAVE_10GBASET_PHY) {
ecmd->supported |= SUPPORTED_100baseT_Full;
ecmd->advertising |= ADVERTISED_100baseT_Full |
ADVERTISED_1000baseT_Full |
ADVERTISED_10000baseT_Full;
}
break; break;
case I40E_PHY_TYPE_1000BASE_T_OPTICAL: case I40E_PHY_TYPE_1000BASE_T_OPTICAL:
ecmd->supported = SUPPORTED_Autoneg | ecmd->supported = SUPPORTED_Autoneg |
...@@ -325,6 +332,15 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw, ...@@ -325,6 +332,15 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw,
SUPPORTED_100baseT_Full; SUPPORTED_100baseT_Full;
if (hw_link_info->requested_speeds & I40E_LINK_SPEED_100MB) if (hw_link_info->requested_speeds & I40E_LINK_SPEED_100MB)
ecmd->advertising |= ADVERTISED_100baseT_Full; ecmd->advertising |= ADVERTISED_100baseT_Full;
/* firmware detects 10G phy as 100M phy at 100M speed */
if (pf->flags & I40E_FLAG_HAVE_10GBASET_PHY) {
ecmd->supported |= SUPPORTED_10000baseT_Full |
SUPPORTED_1000baseT_Full;
ecmd->advertising |= ADVERTISED_Autoneg |
ADVERTISED_100baseT_Full |
ADVERTISED_1000baseT_Full |
ADVERTISED_10000baseT_Full;
}
break; break;
case I40E_PHY_TYPE_10GBASE_CR1_CU: case I40E_PHY_TYPE_10GBASE_CR1_CU:
case I40E_PHY_TYPE_10GBASE_CR1: case I40E_PHY_TYPE_10GBASE_CR1:
......
...@@ -46,7 +46,7 @@ static const char i40e_driver_string[] = ...@@ -46,7 +46,7 @@ static const char i40e_driver_string[] =
#define DRV_VERSION_MAJOR 1 #define DRV_VERSION_MAJOR 1
#define DRV_VERSION_MINOR 5 #define DRV_VERSION_MINOR 5
#define DRV_VERSION_BUILD 1 #define DRV_VERSION_BUILD 2
#define DRV_VERSION __stringify(DRV_VERSION_MAJOR) "." \ #define DRV_VERSION __stringify(DRV_VERSION_MAJOR) "." \
__stringify(DRV_VERSION_MINOR) "." \ __stringify(DRV_VERSION_MINOR) "." \
__stringify(DRV_VERSION_BUILD) DRV_KERN __stringify(DRV_VERSION_BUILD) DRV_KERN
...@@ -90,6 +90,7 @@ static const struct pci_device_id i40e_pci_tbl[] = { ...@@ -90,6 +90,7 @@ static const struct pci_device_id i40e_pci_tbl[] = {
{PCI_VDEVICE(INTEL, I40E_DEV_ID_SFP_X722), 0}, {PCI_VDEVICE(INTEL, I40E_DEV_ID_SFP_X722), 0},
{PCI_VDEVICE(INTEL, I40E_DEV_ID_1G_BASE_T_X722), 0}, {PCI_VDEVICE(INTEL, I40E_DEV_ID_1G_BASE_T_X722), 0},
{PCI_VDEVICE(INTEL, I40E_DEV_ID_10G_BASE_T_X722), 0}, {PCI_VDEVICE(INTEL, I40E_DEV_ID_10G_BASE_T_X722), 0},
{PCI_VDEVICE(INTEL, I40E_DEV_ID_SFP_I_X722), 0},
{PCI_VDEVICE(INTEL, I40E_DEV_ID_20G_KR2), 0}, {PCI_VDEVICE(INTEL, I40E_DEV_ID_20G_KR2), 0},
{PCI_VDEVICE(INTEL, I40E_DEV_ID_20G_KR2_A), 0}, {PCI_VDEVICE(INTEL, I40E_DEV_ID_20G_KR2_A), 0},
/* required last entry */ /* required last entry */
...@@ -6858,6 +6859,7 @@ static void i40e_reset_and_rebuild(struct i40e_pf *pf, bool reinit) ...@@ -6858,6 +6859,7 @@ static void i40e_reset_and_rebuild(struct i40e_pf *pf, bool reinit)
*/ */
ret = i40e_aq_set_phy_int_mask(&pf->hw, ret = i40e_aq_set_phy_int_mask(&pf->hw,
~(I40E_AQ_EVENT_LINK_UPDOWN | ~(I40E_AQ_EVENT_LINK_UPDOWN |
I40E_AQ_EVENT_MEDIA_NA |
I40E_AQ_EVENT_MODULE_QUAL_FAIL), NULL); I40E_AQ_EVENT_MODULE_QUAL_FAIL), NULL);
if (ret) if (ret)
dev_info(&pf->pdev->dev, "set phy mask fail, err %s aq_err %s\n", dev_info(&pf->pdev->dev, "set phy mask fail, err %s aq_err %s\n",
...@@ -8447,7 +8449,6 @@ static int i40e_sw_init(struct i40e_pf *pf) ...@@ -8447,7 +8449,6 @@ static int i40e_sw_init(struct i40e_pf *pf)
/* Set default capability flags */ /* Set default capability flags */
pf->flags = I40E_FLAG_RX_CSUM_ENABLED | pf->flags = I40E_FLAG_RX_CSUM_ENABLED |
I40E_FLAG_MSI_ENABLED | I40E_FLAG_MSI_ENABLED |
I40E_FLAG_LINK_POLLING_ENABLED |
I40E_FLAG_MSIX_ENABLED; I40E_FLAG_MSIX_ENABLED;
if (iommu_present(&pci_bus_type)) if (iommu_present(&pci_bus_type))
...@@ -9158,6 +9159,12 @@ static int i40e_config_netdev(struct i40e_vsi *vsi) ...@@ -9158,6 +9159,12 @@ static int i40e_config_netdev(struct i40e_vsi *vsi)
I40E_VLAN_ANY, false, true); I40E_VLAN_ANY, false, true);
spin_unlock_bh(&vsi->mac_filter_list_lock); spin_unlock_bh(&vsi->mac_filter_list_lock);
} }
} else if ((pf->hw.aq.api_maj_ver > 1) ||
((pf->hw.aq.api_maj_ver == 1) &&
(pf->hw.aq.api_min_ver > 4))) {
/* Supported in FW API version higher than 1.4 */
pf->flags |= I40E_FLAG_GENEVE_OFFLOAD_CAPABLE;
pf->auto_disable_flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE;
} else { } else {
/* relate the VSI_VMDQ name to the VSI_MAIN name */ /* relate the VSI_VMDQ name to the VSI_MAIN name */
snprintf(netdev->name, IFNAMSIZ, "%sv%%d", snprintf(netdev->name, IFNAMSIZ, "%sv%%d",
...@@ -11064,6 +11071,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -11064,6 +11071,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
*/ */
err = i40e_aq_set_phy_int_mask(&pf->hw, err = i40e_aq_set_phy_int_mask(&pf->hw,
~(I40E_AQ_EVENT_LINK_UPDOWN | ~(I40E_AQ_EVENT_LINK_UPDOWN |
I40E_AQ_EVENT_MEDIA_NA |
I40E_AQ_EVENT_MODULE_QUAL_FAIL), NULL); I40E_AQ_EVENT_MODULE_QUAL_FAIL), NULL);
if (err) if (err)
dev_info(&pf->pdev->dev, "set phy mask fail, err %s aq_err %s\n", dev_info(&pf->pdev->dev, "set phy mask fail, err %s aq_err %s\n",
......
...@@ -2304,10 +2304,8 @@ static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb, ...@@ -2304,10 +2304,8 @@ static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb,
l4_offset = l4.hdr - skb->data; l4_offset = l4.hdr - skb->data;
/* remove payload length from outer checksum */ /* remove payload length from outer checksum */
paylen = (__force u16)l4.udp->check; paylen = skb->len - l4_offset;
paylen += ntohs((__force __be16)1) * csum_replace_by_diff(&l4.udp->check, htonl(paylen));
(u16)~(skb->len - l4_offset);
l4.udp->check = ~csum_fold((__force __wsum)paylen);
} }
/* reset pointers to inner headers */ /* reset pointers to inner headers */
...@@ -2327,9 +2325,8 @@ static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb, ...@@ -2327,9 +2325,8 @@ static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb,
l4_offset = l4.hdr - skb->data; l4_offset = l4.hdr - skb->data;
/* remove payload length from inner checksum */ /* remove payload length from inner checksum */
paylen = (__force u16)l4.tcp->check; paylen = skb->len - l4_offset;
paylen += ntohs((__force __be16)1) * (u16)~(skb->len - l4_offset); csum_replace_by_diff(&l4.tcp->check, htonl(paylen));
l4.tcp->check = ~csum_fold((__force __wsum)paylen);
/* compute length of segmentation header */ /* compute length of segmentation header */
*hdr_len = (l4.tcp->doff * 4) + l4_offset; *hdr_len = (l4.tcp->doff * 4) + l4_offset;
......
...@@ -937,6 +937,10 @@ void i40e_reset_vf(struct i40e_vf *vf, bool flr) ...@@ -937,6 +937,10 @@ void i40e_reset_vf(struct i40e_vf *vf, bool flr)
wr32(hw, I40E_VPGEN_VFRTRIG(vf->vf_id), reg); wr32(hw, I40E_VPGEN_VFRTRIG(vf->vf_id), reg);
i40e_flush(hw); i40e_flush(hw);
} }
/* clear the VFLR bit in GLGEN_VFLRSTAT */
reg_idx = (hw->func_caps.vf_base_id + vf->vf_id) / 32;
bit_idx = (hw->func_caps.vf_base_id + vf->vf_id) % 32;
wr32(hw, I40E_GLGEN_VFLRSTAT(reg_idx), BIT(bit_idx));
if (i40e_quiesce_vf_pci(vf)) if (i40e_quiesce_vf_pci(vf))
dev_err(&pf->pdev->dev, "VF %d PCI transactions stuck\n", dev_err(&pf->pdev->dev, "VF %d PCI transactions stuck\n",
...@@ -989,10 +993,6 @@ void i40e_reset_vf(struct i40e_vf *vf, bool flr) ...@@ -989,10 +993,6 @@ void i40e_reset_vf(struct i40e_vf *vf, bool flr)
/* tell the VF the reset is done */ /* tell the VF the reset is done */
wr32(hw, I40E_VFGEN_RSTAT1(vf->vf_id), I40E_VFR_VFACTIVE); wr32(hw, I40E_VFGEN_RSTAT1(vf->vf_id), I40E_VFR_VFACTIVE);
/* clear the VFLR bit in GLGEN_VFLRSTAT */
reg_idx = (hw->func_caps.vf_base_id + vf->vf_id) / 32;
bit_idx = (hw->func_caps.vf_base_id + vf->vf_id) % 32;
wr32(hw, I40E_GLGEN_VFLRSTAT(reg_idx), BIT(bit_idx));
i40e_flush(hw); i40e_flush(hw);
clear_bit(__I40E_VF_DISABLE, &pf->state); clear_bit(__I40E_VF_DISABLE, &pf->state);
} }
...@@ -1232,8 +1232,8 @@ static int i40e_vc_send_msg_to_vf(struct i40e_vf *vf, u32 v_opcode, ...@@ -1232,8 +1232,8 @@ static int i40e_vc_send_msg_to_vf(struct i40e_vf *vf, u32 v_opcode,
/* single place to detect unsuccessful return values */ /* single place to detect unsuccessful return values */
if (v_retval) { if (v_retval) {
vf->num_invalid_msgs++; vf->num_invalid_msgs++;
dev_err(&pf->pdev->dev, "VF %d failed opcode %d, error: %d\n", dev_info(&pf->pdev->dev, "VF %d failed opcode %d, retval: %d\n",
vf->vf_id, v_opcode, v_retval); vf->vf_id, v_opcode, v_retval);
if (vf->num_invalid_msgs > if (vf->num_invalid_msgs >
I40E_DEFAULT_NUM_INVALID_MSGS_ALLOWED) { I40E_DEFAULT_NUM_INVALID_MSGS_ALLOWED) {
dev_err(&pf->pdev->dev, dev_err(&pf->pdev->dev,
...@@ -1251,9 +1251,9 @@ static int i40e_vc_send_msg_to_vf(struct i40e_vf *vf, u32 v_opcode, ...@@ -1251,9 +1251,9 @@ static int i40e_vc_send_msg_to_vf(struct i40e_vf *vf, u32 v_opcode,
aq_ret = i40e_aq_send_msg_to_vf(hw, abs_vf_id, v_opcode, v_retval, aq_ret = i40e_aq_send_msg_to_vf(hw, abs_vf_id, v_opcode, v_retval,
msg, msglen, NULL); msg, msglen, NULL);
if (aq_ret) { if (aq_ret) {
dev_err(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"Unable to send the message to VF %d aq_err %d\n", "Unable to send the message to VF %d aq_err %d\n",
vf->vf_id, pf->hw.aq.asq_last_status); vf->vf_id, pf->hw.aq.asq_last_status);
return -EIO; return -EIO;
} }
...@@ -1311,8 +1311,8 @@ static int i40e_vc_get_vf_resources_msg(struct i40e_vf *vf, u8 *msg) ...@@ -1311,8 +1311,8 @@ static int i40e_vc_get_vf_resources_msg(struct i40e_vf *vf, u8 *msg)
struct i40e_pf *pf = vf->pf; struct i40e_pf *pf = vf->pf;
i40e_status aq_ret = 0; i40e_status aq_ret = 0;
struct i40e_vsi *vsi; struct i40e_vsi *vsi;
int i = 0, len = 0;
int num_vsis = 1; int num_vsis = 1;
int len = 0;
int ret; int ret;
if (!test_bit(I40E_VF_STAT_INIT, &vf->vf_states)) { if (!test_bit(I40E_VF_STAT_INIT, &vf->vf_states)) {
...@@ -1374,15 +1374,14 @@ static int i40e_vc_get_vf_resources_msg(struct i40e_vf *vf, u8 *msg) ...@@ -1374,15 +1374,14 @@ static int i40e_vc_get_vf_resources_msg(struct i40e_vf *vf, u8 *msg)
vfres->num_queue_pairs = vf->num_queue_pairs; vfres->num_queue_pairs = vf->num_queue_pairs;
vfres->max_vectors = pf->hw.func_caps.num_msix_vectors_vf; vfres->max_vectors = pf->hw.func_caps.num_msix_vectors_vf;
if (vf->lan_vsi_idx) { if (vf->lan_vsi_idx) {
vfres->vsi_res[i].vsi_id = vf->lan_vsi_id; vfres->vsi_res[0].vsi_id = vf->lan_vsi_id;
vfres->vsi_res[i].vsi_type = I40E_VSI_SRIOV; vfres->vsi_res[0].vsi_type = I40E_VSI_SRIOV;
vfres->vsi_res[i].num_queue_pairs = vsi->alloc_queue_pairs; vfres->vsi_res[0].num_queue_pairs = vsi->alloc_queue_pairs;
/* VFs only use TC 0 */ /* VFs only use TC 0 */
vfres->vsi_res[i].qset_handle vfres->vsi_res[0].qset_handle
= le16_to_cpu(vsi->info.qs_handle[0]); = le16_to_cpu(vsi->info.qs_handle[0]);
ether_addr_copy(vfres->vsi_res[i].default_mac_addr, ether_addr_copy(vfres->vsi_res[0].default_mac_addr,
vf->default_lan_addr.addr); vf->default_lan_addr.addr);
i++;
} }
set_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states); set_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states);
...@@ -2297,11 +2296,9 @@ int i40e_vc_process_vflr_event(struct i40e_pf *pf) ...@@ -2297,11 +2296,9 @@ int i40e_vc_process_vflr_event(struct i40e_pf *pf)
/* read GLGEN_VFLRSTAT register to find out the flr VFs */ /* read GLGEN_VFLRSTAT register to find out the flr VFs */
vf = &pf->vf[vf_id]; vf = &pf->vf[vf_id];
reg = rd32(hw, I40E_GLGEN_VFLRSTAT(reg_idx)); reg = rd32(hw, I40E_GLGEN_VFLRSTAT(reg_idx));
if (reg & BIT(bit_idx)) { if (reg & BIT(bit_idx))
/* i40e_reset_vf will clear the bit in GLGEN_VFLRSTAT */ /* i40e_reset_vf will clear the bit in GLGEN_VFLRSTAT */
if (!test_bit(__I40E_DOWN, &pf->state)) i40e_reset_vf(vf, true);
i40e_reset_vf(vf, true);
}
} }
return 0; return 0;
......
...@@ -58,6 +58,7 @@ i40e_status i40e_set_mac_type(struct i40e_hw *hw) ...@@ -58,6 +58,7 @@ i40e_status i40e_set_mac_type(struct i40e_hw *hw)
case I40E_DEV_ID_SFP_X722: case I40E_DEV_ID_SFP_X722:
case I40E_DEV_ID_1G_BASE_T_X722: case I40E_DEV_ID_1G_BASE_T_X722:
case I40E_DEV_ID_10G_BASE_T_X722: case I40E_DEV_ID_10G_BASE_T_X722:
case I40E_DEV_ID_SFP_I_X722:
hw->mac.type = I40E_MAC_X722; hw->mac.type = I40E_MAC_X722;
break; break;
case I40E_DEV_ID_X722_VF: case I40E_DEV_ID_X722_VF:
......
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
#define I40E_DEV_ID_SFP_X722 0x37D0 #define I40E_DEV_ID_SFP_X722 0x37D0
#define I40E_DEV_ID_1G_BASE_T_X722 0x37D1 #define I40E_DEV_ID_1G_BASE_T_X722 0x37D1
#define I40E_DEV_ID_10G_BASE_T_X722 0x37D2 #define I40E_DEV_ID_10G_BASE_T_X722 0x37D2
#define I40E_DEV_ID_SFP_I_X722 0x37D3
#define I40E_DEV_ID_X722_VF 0x37CD #define I40E_DEV_ID_X722_VF 0x37CD
#define I40E_DEV_ID_X722_VF_HV 0x37D9 #define I40E_DEV_ID_X722_VF_HV 0x37D9
......
...@@ -1571,10 +1571,8 @@ static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb, ...@@ -1571,10 +1571,8 @@ static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb,
l4_offset = l4.hdr - skb->data; l4_offset = l4.hdr - skb->data;
/* remove payload length from outer checksum */ /* remove payload length from outer checksum */
paylen = (__force u16)l4.udp->check; paylen = skb->len - l4_offset;
paylen += ntohs((__force __be16)1) * csum_replace_by_diff(&l4.udp->check, htonl(paylen));
(u16)~(skb->len - l4_offset);
l4.udp->check = ~csum_fold((__force __wsum)paylen);
} }
/* reset pointers to inner headers */ /* reset pointers to inner headers */
...@@ -1594,9 +1592,8 @@ static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb, ...@@ -1594,9 +1592,8 @@ static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb,
l4_offset = l4.hdr - skb->data; l4_offset = l4.hdr - skb->data;
/* remove payload length from inner checksum */ /* remove payload length from inner checksum */
paylen = (__force u16)l4.tcp->check; paylen = skb->len - l4_offset;
paylen += ntohs((__force __be16)1) * (u16)~(skb->len - l4_offset); csum_replace_by_diff(&l4.tcp->check, htonl(paylen));
l4.tcp->check = ~csum_fold((__force __wsum)paylen);
/* compute length of segmentation header */ /* compute length of segmentation header */
*hdr_len = (l4.tcp->doff * 4) + l4_offset; *hdr_len = (l4.tcp->doff * 4) + l4_offset;
......
...@@ -38,7 +38,7 @@ static const char i40evf_driver_string[] = ...@@ -38,7 +38,7 @@ static const char i40evf_driver_string[] =
#define DRV_VERSION_MAJOR 1 #define DRV_VERSION_MAJOR 1
#define DRV_VERSION_MINOR 5 #define DRV_VERSION_MINOR 5
#define DRV_VERSION_BUILD 1 #define DRV_VERSION_BUILD 2
#define DRV_VERSION __stringify(DRV_VERSION_MAJOR) "." \ #define DRV_VERSION __stringify(DRV_VERSION_MAJOR) "." \
__stringify(DRV_VERSION_MINOR) "." \ __stringify(DRV_VERSION_MINOR) "." \
__stringify(DRV_VERSION_BUILD) \ __stringify(DRV_VERSION_BUILD) \
...@@ -1341,7 +1341,7 @@ static int i40evf_get_rss_aq(struct i40e_vsi *vsi, const u8 *seed, ...@@ -1341,7 +1341,7 @@ static int i40evf_get_rss_aq(struct i40e_vsi *vsi, const u8 *seed,
} }
if (lut) { if (lut) {
ret = i40evf_aq_get_rss_lut(hw, vsi->id, seed, lut, lut_size); ret = i40evf_aq_get_rss_lut(hw, vsi->id, false, lut, lut_size);
if (ret) { if (ret) {
dev_err(&adapter->pdev->dev, dev_err(&adapter->pdev->dev,
"Cannot get RSS lut, err %s aq_err %s\n", "Cannot get RSS lut, err %s aq_err %s\n",
...@@ -2252,6 +2252,28 @@ static int i40evf_change_mtu(struct net_device *netdev, int new_mtu) ...@@ -2252,6 +2252,28 @@ static int i40evf_change_mtu(struct net_device *netdev, int new_mtu)
return 0; return 0;
} }
#define I40EVF_VLAN_FEATURES (NETIF_F_HW_VLAN_CTAG_TX |\
NETIF_F_HW_VLAN_CTAG_RX |\
NETIF_F_HW_VLAN_CTAG_FILTER)
/**
* i40evf_fix_features - fix up the netdev feature bits
* @netdev: our net device
* @features: desired feature bits
*
* Returns fixed-up features bits
**/
static netdev_features_t i40evf_fix_features(struct net_device *netdev,
netdev_features_t features)
{
struct i40evf_adapter *adapter = netdev_priv(netdev);
features &= ~I40EVF_VLAN_FEATURES;
if (adapter->vf_res->vf_offload_flags & I40E_VIRTCHNL_VF_OFFLOAD_VLAN)
features |= I40EVF_VLAN_FEATURES;
return features;
}
static const struct net_device_ops i40evf_netdev_ops = { static const struct net_device_ops i40evf_netdev_ops = {
.ndo_open = i40evf_open, .ndo_open = i40evf_open,
.ndo_stop = i40evf_close, .ndo_stop = i40evf_close,
...@@ -2264,6 +2286,7 @@ static const struct net_device_ops i40evf_netdev_ops = { ...@@ -2264,6 +2286,7 @@ static const struct net_device_ops i40evf_netdev_ops = {
.ndo_tx_timeout = i40evf_tx_timeout, .ndo_tx_timeout = i40evf_tx_timeout,
.ndo_vlan_rx_add_vid = i40evf_vlan_rx_add_vid, .ndo_vlan_rx_add_vid = i40evf_vlan_rx_add_vid,
.ndo_vlan_rx_kill_vid = i40evf_vlan_rx_kill_vid, .ndo_vlan_rx_kill_vid = i40evf_vlan_rx_kill_vid,
.ndo_fix_features = i40evf_fix_features,
#ifdef CONFIG_NET_POLL_CONTROLLER #ifdef CONFIG_NET_POLL_CONTROLLER
.ndo_poll_controller = i40evf_netpoll, .ndo_poll_controller = i40evf_netpoll,
#endif #endif
...@@ -2831,11 +2854,11 @@ static void i40evf_remove(struct pci_dev *pdev) ...@@ -2831,11 +2854,11 @@ static void i40evf_remove(struct pci_dev *pdev)
adapter->state = __I40EVF_REMOVE; adapter->state = __I40EVF_REMOVE;
adapter->aq_required = 0; adapter->aq_required = 0;
i40evf_request_reset(adapter); i40evf_request_reset(adapter);
msleep(20); msleep(50);
/* If the FW isn't responding, kick it once, but only once. */ /* If the FW isn't responding, kick it once, but only once. */
if (!i40evf_asq_done(hw)) { if (!i40evf_asq_done(hw)) {
i40evf_request_reset(adapter); i40evf_request_reset(adapter);
msleep(20); msleep(50);
} }
if (adapter->msix_entries) { if (adapter->msix_entries) {
......
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