[Intel-wired-lan] [next PATCH S31 v4 00/12] i40e/i40evf updates

[Intel-wired-lan] [next PATCH S31 v4 00/12] i40e/i40evf updates

[Avinash Dayanand]

Anjali Singhai Jain has enabled Geneve offload for FW API version 1.5 and
	above for XL710/X710 devices

Avinash Dayanand has provided a fix for supported link modes in
	10GBaseT PHY's.

Catherine Sullivan has provided a fix for get_rss_aq issue and added new
	device ID for X722.

Mitch Williams has removed an unused variable, fixed VLAN features, made
	VF resets more reliable, added longer wait after removing the
	module and lowered some message levels

Shannon Nelson has added code to disable link polling and added support
	to request phy media event at reset time.

 drivers/net/ethernet/intel/i40e/i40e_common.c      |  1 +
 drivers/net/ethernet/intel/i40e/i40e_devids.h      |  1 +
 drivers/net/ethernet/intel/i40e/i40e_ethtool.c     | 16 ++++++++++
 drivers/net/ethernet/intel/i40e/i40e_main.c        | 12 +++++--
 drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 37 ++++++++++------------
 drivers/net/ethernet/intel/i40evf/i40e_common.c    |  1 +
 drivers/net/ethernet/intel/i40evf/i40e_devids.h    |  1 +
 drivers/net/ethernet/intel/i40evf/i40evf_main.c    | 31 +++++++++++++++---
 8 files changed, 74 insertions(+), 26 deletions(-)

-- 
2.4.3

[Intel-wired-lan] [next PATCH S31 v4 01/12] i40e: Enable Geneve offload for FW API ver > 1.4 for XL710/X710 devices

[Avinash Dayanand]

From: Anjali Singhai Jain <anjali.singhai@intel.com>

This patch enables the Capability for XL710/X710 devices with FW API
version higher than 1.4 to do geneve Rx offload.

Testing Hints: Test it on XL710 device with FW API version 1.5 and lower.

Signed-off-by: Anjali Singhai Jain <anjali.singhai@intel.com>
Change-ID: I9a8f87772c48d7d67dc85e3701d2e0b845034c0b
---
 drivers/net/ethernet/intel/i40e/i40e_main.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 39b0009..31f6ee1 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -9093,6 +9093,12 @@ static int i40e_config_netdev(struct i40e_vsi *vsi)
 					I40E_VLAN_ANY, false, true);
 			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 {
 		/* relate the VSI_VMDQ name to the VSI_MAIN name */
 		snprintf(netdev->name, IFNAMSIZ, "%sv%%d",
-- 
2.4.3

[Intel-wired-lan] [next PATCH S31 v4 02/12] i40e: Remove unused variable

[Avinash Dayanand]

From: Mitch Williams <mitch.a.williams@intel.com>

This variable is vestigial, a remnant of the primordial code from which
this driver spawned. We can safely remove it.

Testing Hints: VFs initialize and pass traffic.

Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
Change-ID: I24e0fe338e7c7c50d27dc5515564f33caefbb93a
---
 drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
index 2bde41b..80174de 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -1182,8 +1182,8 @@ static int i40e_vc_get_vf_resources_msg(struct i40e_vf *vf, u8 *msg)
 	struct i40e_pf *pf = vf->pf;
 	i40e_status aq_ret = 0;
 	struct i40e_vsi *vsi;
-	int i = 0, len = 0;
 	int num_vsis = 1;
+	int len = 0;
 	int ret;
 
 	if (!test_bit(I40E_VF_STAT_INIT, &vf->vf_states)) {
@@ -1238,15 +1238,14 @@ static int i40e_vc_get_vf_resources_msg(struct i40e_vf *vf, u8 *msg)
 	vfres->num_queue_pairs = vf->num_queue_pairs;
 	vfres->max_vectors = pf->hw.func_caps.num_msix_vectors_vf;
 	if (vf->lan_vsi_idx) {
-		vfres->vsi_res[i].vsi_id = vf->lan_vsi_id;
-		vfres->vsi_res[i].vsi_type = I40E_VSI_SRIOV;
-		vfres->vsi_res[i].num_queue_pairs = vsi->alloc_queue_pairs;
+		vfres->vsi_res[0].vsi_id = vf->lan_vsi_id;
+		vfres->vsi_res[0].vsi_type = I40E_VSI_SRIOV;
+		vfres->vsi_res[0].num_queue_pairs = vsi->alloc_queue_pairs;
 		/* 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]);
-		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);
-		i++;
 	}
 	set_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states);
 
-- 
2.4.3

[Intel-wired-lan] [next PATCH S31 v4 03/12] i40evf: Fix VLAN features

[Avinash Dayanand]

From: Mitch Williams <mitch.a.williams@intel.com>

Users of ethtool were being given the mistaken impression that this
driver was able to change its VLAN tagging features, and were
disappointed that this was not actually the case. Implement
ndo_fix_features method so that we can adjust these flags as needed to
avoid false impressions.

Testing Hints: Use 'ethtool -K rxvlan off' to attempt
to change the VLAN tagging.

Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
Change-ID: I08584f103a4fa73d6a4128d472e4ef44dcfda57f
---
 drivers/net/ethernet/intel/i40evf/i40evf_main.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index e397368..0c99974 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@ -2252,6 +2252,28 @@ static int i40evf_change_mtu(struct net_device *netdev, int new_mtu)
 	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 = {
 	.ndo_open		= i40evf_open,
 	.ndo_stop		= i40evf_close,
@@ -2264,6 +2286,7 @@ static const struct net_device_ops i40evf_netdev_ops = {
 	.ndo_tx_timeout		= i40evf_tx_timeout,
 	.ndo_vlan_rx_add_vid	= i40evf_vlan_rx_add_vid,
 	.ndo_vlan_rx_kill_vid	= i40evf_vlan_rx_kill_vid,
+	.ndo_fix_features	= i40evf_fix_features,
 #ifdef CONFIG_NET_POLL_CONTROLLER
 	.ndo_poll_controller	= i40evf_netpoll,
 #endif
-- 
2.4.3

[Intel-wired-lan] [next PATCH S31 v4 04/12] i40e: Add new device ID for X722

[Avinash Dayanand]

From: Catherine Sullivan 1452637417 -0500 <catherine.sullivan@intel.com>

The new device ID is 0x37D3 and it should follow the same flows and
branding string as for 0x37D0.

Testing Hints: Make sure the device loads.

Signed-off-by: Catherine Sullivan <catherine.sullivan@intel.com>
Change-ID: Ia5ad4a1910268c4666a3fd46a7afffbec55b4fc2
---
 drivers/net/ethernet/intel/i40e/i40e_common.c   | 1 +
 drivers/net/ethernet/intel/i40e/i40e_devids.h   | 1 +
 drivers/net/ethernet/intel/i40e/i40e_main.c     | 1 +
 drivers/net/ethernet/intel/i40evf/i40e_common.c | 1 +
 drivers/net/ethernet/intel/i40evf/i40e_devids.h | 1 +
 5 files changed, 5 insertions(+)

diff --git a/drivers/net/ethernet/intel/i40e/i40e_common.c b/drivers/net/ethernet/intel/i40e/i40e_common.c
index 8276a13..ebcc0d3 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_common.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_common.c
@@ -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_1G_BASE_T_X722:
 		case I40E_DEV_ID_10G_BASE_T_X722:
+		case I40E_DEV_ID_SFP_I_X722:
 			hw->mac.type = I40E_MAC_X722;
 			break;
 		default:
diff --git a/drivers/net/ethernet/intel/i40e/i40e_devids.h b/drivers/net/ethernet/intel/i40e/i40e_devids.h
index 99257fc..dd4457d 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_devids.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_devids.h
@@ -44,6 +44,7 @@
 #define I40E_DEV_ID_SFP_X722		0x37D0
 #define I40E_DEV_ID_1G_BASE_T_X722	0x37D1
 #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  || \
 					 (d) == I40E_DEV_ID_QSFP_B  || \
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 31f6ee1..33b6c68 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -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_1G_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_A), 0},
 	/* required last entry */
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_common.c b/drivers/net/ethernet/intel/i40evf/i40e_common.c
index 771ac6a..4db0c03 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_common.c
+++ b/drivers/net/ethernet/intel/i40evf/i40e_common.c
@@ -58,6 +58,7 @@ i40e_status i40e_set_mac_type(struct i40e_hw *hw)
 		case I40E_DEV_ID_SFP_X722:
 		case I40E_DEV_ID_1G_BASE_T_X722:
 		case I40E_DEV_ID_10G_BASE_T_X722:
+		case I40E_DEV_ID_SFP_I_X722:
 			hw->mac.type = I40E_MAC_X722;
 			break;
 		case I40E_DEV_ID_X722_VF:
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_devids.h b/drivers/net/ethernet/intel/i40evf/i40e_devids.h
index ca8b58c..7023570 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_devids.h
+++ b/drivers/net/ethernet/intel/i40evf/i40e_devids.h
@@ -44,6 +44,7 @@
 #define I40E_DEV_ID_SFP_X722		0x37D0
 #define I40E_DEV_ID_1G_BASE_T_X722	0x37D1
 #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_HV		0x37D9
 
-- 
2.4.3

[Intel-wired-lan] [next PATCH S31 v4 05/12] i40e: Make VF resets more reliable

[Avinash Dayanand]

From: Mitch Williams <mitch.a.williams@intel.com>

Clear the VFLR bit immediately after triggering a reset instead of
waiting until after cleanup is complete. Make sure to trigger a reset
every time, not just if the PF is up.

These changes fix a problem where VF resets would get lost by the PF,
preventing the VF driver from initializing.

Testing Hints: Do VF driver load/unload test with
lots of VFs in the system.

Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
Change-ID: I5945cf2884095b7b0554867c64df8617e71d9d29
---
 drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
index 80174de..66763c1 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -807,6 +807,10 @@ void i40e_reset_vf(struct i40e_vf *vf, bool flr)
 		wr32(hw, I40E_VPGEN_VFRTRIG(vf->vf_id), reg);
 		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))
 		dev_err(&pf->pdev->dev, "VF %d PCI transactions stuck\n",
@@ -857,10 +861,6 @@ complete_reset:
 	/* tell the VF the reset is done */
 	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);
 	clear_bit(__I40E_VF_DISABLE, &pf->state);
 }
@@ -2059,11 +2059,9 @@ int i40e_vc_process_vflr_event(struct i40e_pf *pf)
 		/* read GLGEN_VFLRSTAT register to find out the flr VFs */
 		vf = &pf->vf[vf_id];
 		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 */
-			if (!test_bit(__I40E_DOWN, &pf->state))
-				i40e_reset_vf(vf, true);
-		}
+			i40e_reset_vf(vf, true);
 	}
 
 	return 0;
-- 
2.4.3

[Intel-wired-lan] [next PATCH S31 v4 06/12] i40evf: Add longer wait after remove module

[Avinash Dayanand]

From: Mitch Williams <mitch.a.williams@intel.com>

Upon module remove, wait a little longer after requesting a reset before
checking to see if the firmware responded. This change prevents double
resets when the firmware is busy.

Testing Hints: Load and unload VF driver repeatedly
with a lot of VFs enabled and make sure it reinitializes properly each
time.

Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
Change-ID: Ieedc988ee82fac1f32a074bf4d9e4dba426bfa58
---
 drivers/net/ethernet/intel/i40evf/i40evf_main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index 0c99974..8598c5f 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@ -2854,11 +2854,11 @@ static void i40evf_remove(struct pci_dev *pdev)
 	adapter->state = __I40EVF_REMOVE;
 	adapter->aq_required = 0;
 	i40evf_request_reset(adapter);
-	msleep(20);
+	msleep(50);
 	/* If the FW isn't responding, kick it once, but only once. */
 	if (!i40evf_asq_done(hw)) {
 		i40evf_request_reset(adapter);
-		msleep(20);
+		msleep(50);
 	}
 
 	if (adapter->msix_entries) {
-- 
2.4.3

[Intel-wired-lan] [next PATCH S31 v4 07/12] i40e: Disable link polling

[Avinash Dayanand]

From: Shannon Nelson <shannon.nelson@intel.com>

Periodic link polling was added when the link events were found not to be
trustworthy.  This was the case early on, but was likely because the link
event mask was being used incorrectly.  As this has been fixed in recent
code, we can disable the link polling to lessen the AQ traffic.

Testing Hints:
	Do some link tests, removing and reinserting the wire, etc.

Signed-off-by: Shannon Nelson <shannon.nelson@intel.com>
Change-ID: Id890b5ee3c2d04381fc76ffa434777644f5d8eb0
---
 drivers/net/ethernet/intel/i40e/i40e_main.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 33b6c68..18877f0 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -8389,7 +8389,6 @@ static int i40e_sw_init(struct i40e_pf *pf)
 	/* Set default capability flags */
 	pf->flags = I40E_FLAG_RX_CSUM_ENABLED |
 		    I40E_FLAG_MSI_ENABLED     |
-		    I40E_FLAG_LINK_POLLING_ENABLED |
 		    I40E_FLAG_MSIX_ENABLED;
 
 	if (iommu_present(&pci_bus_type))
-- 
2.4.3

[Intel-wired-lan] [next PATCH S31 v4 08/12] i40evf: Fix get_rss_aq

[Avinash Dayanand]

From: Catherine Sullivan <catherine.sullivan@intel.com>

We were passing in the seed where we should just be passing false
because we want the vsi table not the pf table.

Testing Hints: Make sure that ethtool -x gives the proper table.

Signed-off-by: Catherine Sullivan <catherine.sullivan@intel.com>
Change-ID: I9b633ab06eb59468087f0c0af8539857e99f9495
---
 drivers/net/ethernet/intel/i40evf/i40evf_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index 8598c5f..e66f47e 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@ -1341,7 +1341,7 @@ static int i40evf_get_rss_aq(struct i40e_vsi *vsi, const u8 *seed,
 	}
 
 	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) {
 			dev_err(&adapter->pdev->dev,
 				"Cannot get RSS lut, err %s aq_err %s\n",
-- 
2.4.3

[Intel-wired-lan] [next PATCH S31 v4 09/12] i40e: Fix for supported link modes in 10GBaseT PHY's

[Avinash Dayanand]

100baseT/Full is now listed and supported link mode for 10GBaseT PHY.
This is a fix to list all the supported link modes of 10GBaseT PHY.

Testing Hints: Use 'ethtool -s ethx advertise
0x008' to change supported link mode. Check if 100baseT is displayed.

Signed-off-by: Avinash Dayanand <avinash.dayanand@intel.com>
Change-ID: If2be3212ef0fef85fd5d6e4550c7783de2f915e9
---
 drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
index 410d237..8a83d45 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
@@ -313,6 +313,13 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw,
 			ecmd->advertising |= ADVERTISED_10000baseT_Full;
 		if (hw_link_info->requested_speeds & I40E_LINK_SPEED_1GB)
 			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;
 	case I40E_PHY_TYPE_1000BASE_T_OPTICAL:
 		ecmd->supported = SUPPORTED_Autoneg |
@@ -325,6 +332,15 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw,
 				  SUPPORTED_100baseT_Full;
 		if (hw_link_info->requested_speeds & I40E_LINK_SPEED_100MB)
 			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;
 	case I40E_PHY_TYPE_10GBASE_CR1_CU:
 	case I40E_PHY_TYPE_10GBASE_CR1:
-- 
2.4.3

[Intel-wired-lan] [next PATCH S31 v4 10/12] i40e: Lower some message levels

[Avinash Dayanand]

From: Mitch Williams <mitch.a.williams@intel.com>

These conditions can happen any time VFs are enabled or disabled and are
not really indicative of fatal problems unless they happen continuously.

Lower the log level so that people don't get scared.

Testing Hints: Enable and disable lots of VFs until
you see the messages. Note the log level.

Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
Change-ID: I1ceb4adbd10d03cbeed54d1f5b7f20d60328351d
---
 drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
index 66763c1..f93a649 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -1103,8 +1103,8 @@ static int i40e_vc_send_msg_to_vf(struct i40e_vf *vf, u32 v_opcode,
 	/* single place to detect unsuccessful return values */
 	if (v_retval) {
 		vf->num_invalid_msgs++;
-		dev_err(&pf->pdev->dev, "VF %d failed opcode %d, error: %d\n",
-			vf->vf_id, v_opcode, v_retval);
+		dev_info(&pf->pdev->dev, "VF %d failed opcode %d, retval: %d\n",
+			 vf->vf_id, v_opcode, v_retval);
 		if (vf->num_invalid_msgs >
 		    I40E_DEFAULT_NUM_INVALID_MSGS_ALLOWED) {
 			dev_err(&pf->pdev->dev,
@@ -1122,9 +1122,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,
 					msg, msglen, NULL);
 	if (aq_ret) {
-		dev_err(&pf->pdev->dev,
-			"Unable to send the message to VF %d aq_err %d\n",
-			vf->vf_id, pf->hw.aq.asq_last_status);
+		dev_info(&pf->pdev->dev,
+			 "Unable to send the message to VF %d aq_err %d\n",
+			 vf->vf_id, pf->hw.aq.asq_last_status);
 		return -EIO;
 	}
 
-- 
2.4.3

[Intel-wired-lan] [next PATCH S31 v4 11/12] i40e: Request phy media event at reset time

[Avinash Dayanand]

From: Shannon Nelson <shannon.nelson@intel.com>

Add the Media Not Available flag to the link event mask.  It seems
that event comes first if you have a DA cable pulled out, but there's no
followup event for Link Down; if you're not looking for MEDIA_NA you will
get no event, even though there's now no Link.

Testing Hints:
	Do some link tests, removing and reinserting the wire, etc.
	after a reset.

Signed-off-by: Shannon Nelson <shannon.nelson@intel.com>
Change-ID: cb3340a2849805bb881f64f6f2ae810eef46eba7
---
 drivers/net/ethernet/intel/i40e/i40e_main.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 18877f0..ba9d0cc 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -6836,6 +6836,7 @@ static void i40e_reset_and_rebuild(struct i40e_pf *pf, bool reinit)
 	 */
 	ret = i40e_aq_set_phy_int_mask(&pf->hw,
 				       ~(I40E_AQ_EVENT_LINK_UPDOWN |
+					 I40E_AQ_EVENT_MEDIA_NA |
 					 I40E_AQ_EVENT_MODULE_QUAL_FAIL), NULL);
 	if (ret)
 		dev_info(&pf->pdev->dev, "set phy mask fail, err %s aq_err %s\n",
@@ -10992,6 +10993,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	 */
 	err = i40e_aq_set_phy_int_mask(&pf->hw,
 				       ~(I40E_AQ_EVENT_LINK_UPDOWN |
+					 I40E_AQ_EVENT_MEDIA_NA |
 					 I40E_AQ_EVENT_MODULE_QUAL_FAIL), NULL);
 	if (err)
 		dev_info(&pf->pdev->dev, "set phy mask fail, err %s aq_err %s\n",
-- 
2.4.3

[Intel-wired-lan] [next PATCH S31 v4 12/12] i40e/i40evf: Bump patch from 1.5.1 to 1.5.2

[Avinash Dayanand]

Signed-off-by: Avinash Dayanand <avinash.dayanand@intel.com>
---
 drivers/net/ethernet/intel/i40e/i40e_main.c     | 2 +-
 drivers/net/ethernet/intel/i40evf/i40evf_main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index ba9d0cc..fe7064d 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -46,7 +46,7 @@ static const char i40e_driver_string[] =
 
 #define DRV_VERSION_MAJOR 1
 #define DRV_VERSION_MINOR 5
-#define DRV_VERSION_BUILD 1
+#define DRV_VERSION_BUILD 2
 #define DRV_VERSION __stringify(DRV_VERSION_MAJOR) "." \
 	     __stringify(DRV_VERSION_MINOR) "." \
 	     __stringify(DRV_VERSION_BUILD)    DRV_KERN
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index e66f47e..54aa24b 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@ -38,7 +38,7 @@ static const char i40evf_driver_string[] =
 
 #define DRV_VERSION_MAJOR 1
 #define DRV_VERSION_MINOR 5
-#define DRV_VERSION_BUILD 1
+#define DRV_VERSION_BUILD 2
 #define DRV_VERSION __stringify(DRV_VERSION_MAJOR) "." \
 	     __stringify(DRV_VERSION_MINOR) "." \
 	     __stringify(DRV_VERSION_BUILD) \
-- 
2.4.3

[Intel-wired-lan] [next PATCH S31 v4 03/12] i40evf: Fix VLAN features

[Bowers, AndrewX]

> -----Original Message-----
> From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On
> Behalf Of Avinash Dayanand
> Sent: Friday, March 18, 2016 12:18 PM
> To: intel-wired-lan at lists.osuosl.org
> Subject: [Intel-wired-lan] [next PATCH S31 v4 03/12] i40evf: Fix VLAN
> features
> 
> From: Mitch Williams <mitch.a.williams@intel.com>
> 
> Users of ethtool were being given the mistaken impression that this driver
> was able to change its VLAN tagging features, and were disappointed that
> this was not actually the case. Implement ndo_fix_features method so that
> we can adjust these flags as needed to avoid false impressions.
> 
> Testing Hints: Use 'ethtool -K rxvlan off' to attempt to change the VLAN
> tagging.
> 
> Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
> Change-ID: I08584f103a4fa73d6a4128d472e4ef44dcfda57f
> ---
>  drivers/net/ethernet/intel/i40evf/i40evf_main.c | 23
> +++++++++++++++++++++++
>  1 file changed, 23 insertions(+)

Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Code changes correctly applied, ethtool features work correctly

[Intel-wired-lan] [next PATCH S31 v4 04/12] i40e: Add new device ID for X722

[Bowers, AndrewX]

> -----Original Message-----
> From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On
> Behalf Of Avinash Dayanand
> Sent: Friday, March 18, 2016 12:18 PM
> To: intel-wired-lan at lists.osuosl.org
> Subject: [Intel-wired-lan] [next PATCH S31 v4 04/12] i40e: Add new device ID
> for X722
> 
> From: Catherine Sullivan 1452637417 -0500 <catherine.sullivan@intel.com>
> 
> The new device ID is 0x37D3 and it should follow the same flows and
> branding string as for 0x37D0.
> 
> Testing Hints: Make sure the device loads.
> 
> Signed-off-by: Catherine Sullivan <catherine.sullivan@intel.com>
> Change-ID: Ia5ad4a1910268c4666a3fd46a7afffbec55b4fc2
> ---
>  drivers/net/ethernet/intel/i40e/i40e_common.c   | 1 +
>  drivers/net/ethernet/intel/i40e/i40e_devids.h   | 1 +
>  drivers/net/ethernet/intel/i40e/i40e_main.c     | 1 +
>  drivers/net/ethernet/intel/i40evf/i40e_common.c | 1 +
> drivers/net/ethernet/intel/i40evf/i40e_devids.h | 1 +
>  5 files changed, 5 insertions(+)

Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Code changes correctly applied, device is correctly recognized with patch applied

[Intel-wired-lan] [next PATCH S31 v4 05/12] i40e: Make VF resets more reliable

[Bowers, AndrewX]

> -----Original Message-----
> From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On
> Behalf Of Avinash Dayanand
> Sent: Friday, March 18, 2016 12:18 PM
> To: intel-wired-lan at lists.osuosl.org
> Subject: [Intel-wired-lan] [next PATCH S31 v4 05/12] i40e: Make VF resets
> more reliable
> 
> From: Mitch Williams <mitch.a.williams@intel.com>
> 
> Clear the VFLR bit immediately after triggering a reset instead of waiting until
> after cleanup is complete. Make sure to trigger a reset every time, not just if
> the PF is up.
> 
> These changes fix a problem where VF resets would get lost by the PF,
> preventing the VF driver from initializing.
> 
> Testing Hints: Do VF driver load/unload test with lots of VFs in the system.
> 
> Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
> Change-ID: I5945cf2884095b7b0554867c64df8617e71d9d29
> ---
>  drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 14 ++++++--------
>  1 file changed, 6 insertions(+), 8 deletions(-)

Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Code changes correctly applied, unloading and reloading VF driver with VFs created does not result in errors

[Intel-wired-lan] [next PATCH S31 v4 06/12] i40evf: Add longer wait after remove module

[Bowers, AndrewX]

> -----Original Message-----
> From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On
> Behalf Of Avinash Dayanand
> Sent: Friday, March 18, 2016 12:18 PM
> To: intel-wired-lan at lists.osuosl.org
> Subject: [Intel-wired-lan] [next PATCH S31 v4 06/12] i40evf: Add longer wait
> after remove module
> 
> From: Mitch Williams <mitch.a.williams@intel.com>
> 
> Upon module remove, wait a little longer after requesting a reset before
> checking to see if the firmware responded. This change prevents double
> resets when the firmware is busy.
> 
> Testing Hints: Load and unload VF driver repeatedly with a lot of VFs enabled
> and make sure it reinitializes properly each time.
> 
> Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
> Change-ID: Ieedc988ee82fac1f32a074bf4d9e4dba426bfa58
> ---
>  drivers/net/ethernet/intel/i40evf/i40evf_main.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Multiple repeated loading and unloading of VF driver with VFs active does not result in errors

[Intel-wired-lan] [next PATCH S31 v4 07/12] i40e: Disable link polling

[Bowers, AndrewX]

> -----Original Message-----
> From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On
> Behalf Of Avinash Dayanand
> Sent: Friday, March 18, 2016 12:18 PM
> To: intel-wired-lan at lists.osuosl.org
> Subject: [Intel-wired-lan] [next PATCH S31 v4 07/12] i40e: Disable link polling
> 
> From: Shannon Nelson <shannon.nelson@intel.com>
> 
> Periodic link polling was added when the link events were found not to be
> trustworthy.  This was the case early on, but was likely because the link event
> mask was being used incorrectly.  As this has been fixed in recent code, we
> can disable the link polling to lessen the AQ traffic.
> 
> Testing Hints:
> 	Do some link tests, removing and reinserting the wire, etc.
> 
> Signed-off-by: Shannon Nelson <shannon.nelson@intel.com>
> Change-ID: Id890b5ee3c2d04381fc76ffa434777644f5d8eb0
> ---
>  drivers/net/ethernet/intel/i40e/i40e_main.c | 1 -
>  1 file changed, 1 deletion(-)

Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Link events work properly

[Intel-wired-lan] [next PATCH S31 v4 08/12] i40evf: Fix get_rss_aq

[Bowers, AndrewX]

> -----Original Message-----
> From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On
> Behalf Of Avinash Dayanand
> Sent: Friday, March 18, 2016 12:18 PM
> To: intel-wired-lan at lists.osuosl.org
> Subject: [Intel-wired-lan] [next PATCH S31 v4 08/12] i40evf: Fix get_rss_aq
> 
> From: Catherine Sullivan <catherine.sullivan@intel.com>
> 
> We were passing in the seed where we should just be passing false because
> we want the vsi table not the pf table.
> 
> Testing Hints: Make sure that ethtool -x gives the proper table.
> 
> Signed-off-by: Catherine Sullivan <catherine.sullivan@intel.com>
> Change-ID: I9b633ab06eb59468087f0c0af8539857e99f9495
> ---
>  drivers/net/ethernet/intel/i40evf/i40evf_main.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
ethtool -x returns correct table when used on VF

[Intel-wired-lan] [next PATCH S31 v4 09/12] i40e: Fix for supported link modes in 10GBaseT PHY's

[Bowers, AndrewX]

> -----Original Message-----
> From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On
> Behalf Of Avinash Dayanand
> Sent: Friday, March 18, 2016 12:18 PM
> To: intel-wired-lan at lists.osuosl.org
> Subject: [Intel-wired-lan] [next PATCH S31 v4 09/12] i40e: Fix for supported
> link modes in 10GBaseT PHY's
> 
> 100baseT/Full is now listed and supported link mode for 10GBaseT PHY.
> This is a fix to list all the supported link modes of 10GBaseT PHY.
> 
> Testing Hints: Use 'ethtool -s ethx advertise 0x008' to change supported link
> mode. Check if 100baseT is displayed.
> 
> Signed-off-by: Avinash Dayanand <avinash.dayanand@intel.com>
> Change-ID: If2be3212ef0fef85fd5d6e4550c7783de2f915e9
> ---
>  drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 16 ++++++++++++++++
>  1 file changed, 16 insertions(+)

Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
ethtool shows correct link mode

[Intel-wired-lan] [next PATCH S31 v4 10/12] i40e: Lower some message levels

[Bowers, AndrewX]

> -----Original Message-----
> From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On
> Behalf Of Avinash Dayanand
> Sent: Friday, March 18, 2016 12:18 PM
> To: intel-wired-lan at lists.osuosl.org
> Subject: [Intel-wired-lan] [next PATCH S31 v4 10/12] i40e: Lower some
> message levels
> 
> From: Mitch Williams <mitch.a.williams@intel.com>
> 
> These conditions can happen any time VFs are enabled or disabled and are
> not really indicative of fatal problems unless they happen continuously.
> 
> Lower the log level so that people don't get scared.
> 
> Testing Hints: Enable and disable lots of VFs until you see the messages. Note
> the log level.
> 
> Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
> Change-ID: I1ceb4adbd10d03cbeed54d1f5b7f20d60328351d
> ---
>  drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)

Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Error messages not logged to console with patch applied

[Intel-wired-lan] [next PATCH S31 v4 11/12] i40e: Request phy media event at reset time

[Bowers, AndrewX]

> -----Original Message-----
> From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On
> Behalf Of Avinash Dayanand
> Sent: Friday, March 18, 2016 12:18 PM
> To: intel-wired-lan at lists.osuosl.org
> Subject: [Intel-wired-lan] [next PATCH S31 v4 11/12] i40e: Request phy media
> event at reset time
> 
> From: Shannon Nelson <shannon.nelson@intel.com>
> 
> Add the Media Not Available flag to the link event mask.  It seems that event
> comes first if you have a DA cable pulled out, but there's no followup event
> for Link Down; if you're not looking for MEDIA_NA you will get no event,
> even though there's now no Link.
> 
> Testing Hints:
> 	Do some link tests, removing and reinserting the wire, etc.
> 	after a reset.
> 
> Signed-off-by: Shannon Nelson <shannon.nelson@intel.com>
> Change-ID: cb3340a2849805bb881f64f6f2ae810eef46eba7
> ---
>  drivers/net/ethernet/intel/i40e/i40e_main.c | 2 ++
>  1 file changed, 2 insertions(+)

Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Driver reports correct link statuses after reset

[Intel-wired-lan] [next PATCH S31 v4 12/12] i40e/i40evf: Bump patch from 1.5.1 to 1.5.2

[Bowers, AndrewX]

> -----Original Message-----
> From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On
> Behalf Of Avinash Dayanand
> Sent: Friday, March 18, 2016 12:18 PM
> To: intel-wired-lan at lists.osuosl.org
> Subject: [Intel-wired-lan] [next PATCH S31 v4 12/12] i40e/i40evf: Bump patch
> from 1.5.1 to 1.5.2
> 
> Signed-off-by: Avinash Dayanand <avinash.dayanand@intel.com>
> ---
>  drivers/net/ethernet/intel/i40e/i40e_main.c     | 2 +-
>  drivers/net/ethernet/intel/i40evf/i40evf_main.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Drivers report correct version number

[Intel-wired-lan] [next PATCH S31 v4 03/12] i40evf: Fix VLAN features

[Alexander Duyck]

On Fri, Mar 18, 2016 at 12:18 PM, Avinash Dayanand
<avinash.dayanand@intel.com> wrote:
> From: Mitch Williams <mitch.a.williams@intel.com>
>
> Users of ethtool were being given the mistaken impression that this
> driver was able to change its VLAN tagging features, and were
> disappointed that this was not actually the case. Implement
> ndo_fix_features method so that we can adjust these flags as needed to
> avoid false impressions.
>
> Testing Hints: Use 'ethtool -K rxvlan off' to attempt
> to change the VLAN tagging.
>
> Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
> Change-ID: I08584f103a4fa73d6a4128d472e4ef44dcfda57f
> ---
>  drivers/net/ethernet/intel/i40evf/i40evf_main.c | 23 +++++++++++++++++++++++
>  1 file changed, 23 insertions(+)
>
> diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
> index e397368..0c99974 100644
> --- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
> +++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
> @@ -2252,6 +2252,28 @@ static int i40evf_change_mtu(struct net_device *netdev, int new_mtu)
>         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 = {
>         .ndo_open               = i40evf_open,
>         .ndo_stop               = i40evf_close,
> @@ -2264,6 +2286,7 @@ static const struct net_device_ops i40evf_netdev_ops = {
>         .ndo_tx_timeout         = i40evf_tx_timeout,
>         .ndo_vlan_rx_add_vid    = i40evf_vlan_rx_add_vid,
>         .ndo_vlan_rx_kill_vid   = i40evf_vlan_rx_kill_vid,
> +       .ndo_fix_features       = i40evf_fix_features,
>  #ifdef CONFIG_NET_POLL_CONTROLLER
>         .ndo_poll_controller    = i40evf_netpoll,
>  #endif

This fix isn't correct.  If you don't support toggling a feature you
should not be setting it in hw_features.  All you are doing here is
making more confusion since now you will just ignore the user input.

Just move the code that is setting these bits down further in
i40evf_process_config so that the netdev->features portion with the
VLAN bits doesn't get written until after you have set
netdev->hw_features.

- Alex

[Intel-wired-lan] [next PATCH S31 v4 03/12] i40evf: Fix VLAN features

[Williams, Mitch A]

Thanks Alex. We'll drop this one for now and I'll respin.

-Mitch

> -----Original Message-----
> From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On
> Behalf Of Alexander Duyck
> Sent: Wednesday, March 23, 2016 1:57 PM
> To: Dayanand, Avinash <avinash.dayanand@intel.com>
> Cc: intel-wired-lan <intel-wired-lan@lists.osuosl.org>
> Subject: Re: [Intel-wired-lan] [next PATCH S31 v4 03/12] i40evf: Fix VLAN
> features
> 
> On Fri, Mar 18, 2016 at 12:18 PM, Avinash Dayanand
> <avinash.dayanand@intel.com> wrote:
> > From: Mitch Williams <mitch.a.williams@intel.com>
> >
> > Users of ethtool were being given the mistaken impression that this
> > driver was able to change its VLAN tagging features, and were
> > disappointed that this was not actually the case. Implement
> > ndo_fix_features method so that we can adjust these flags as needed to
> > avoid false impressions.
> >
> > Testing Hints: Use 'ethtool -K rxvlan off' to attempt
> > to change the VLAN tagging.
> >
> > Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
> > Change-ID: I08584f103a4fa73d6a4128d472e4ef44dcfda57f
> > ---
> >  drivers/net/ethernet/intel/i40evf/i40evf_main.c | 23
> +++++++++++++++++++++++
> >  1 file changed, 23 insertions(+)
> >
> > diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
> b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
> > index e397368..0c99974 100644
> > --- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
> > +++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
> > @@ -2252,6 +2252,28 @@ static int i40evf_change_mtu(struct net_device
> *netdev, int new_mtu)
> >         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 = {
> >         .ndo_open               = i40evf_open,
> >         .ndo_stop               = i40evf_close,
> > @@ -2264,6 +2286,7 @@ static const struct net_device_ops i40evf_netdev_ops
> = {
> >         .ndo_tx_timeout         = i40evf_tx_timeout,
> >         .ndo_vlan_rx_add_vid    = i40evf_vlan_rx_add_vid,
> >         .ndo_vlan_rx_kill_vid   = i40evf_vlan_rx_kill_vid,
> > +       .ndo_fix_features       = i40evf_fix_features,
> >  #ifdef CONFIG_NET_POLL_CONTROLLER
> >         .ndo_poll_controller    = i40evf_netpoll,
> >  #endif
> 
> This fix isn't correct.  If you don't support toggling a feature you
> should not be setting it in hw_features.  All you are doing here is
> making more confusion since now you will just ignore the user input.
> 
> Just move the code that is setting these bits down further in
> i40evf_process_config so that the netdev->features portion with the
> VLAN bits doesn't get written until after you have set
> netdev->hw_features.
> 
> - Alex
> _______________________________________________
> Intel-wired-lan mailing list
> Intel-wired-lan at lists.osuosl.org
> http://lists.osuosl.org/mailman/listinfo/intel-wired-lan