diff mbox

[dpdk-dev,6/6] fm10k: Add default mac/vlan filter to SM

Message ID 1432887044-24777-7-git-send-email-jing.d.chen@intel.com (mailing list archive)
State Accepted, archived
Headers

Commit Message

Chen, Jing D May 29, 2015, 8:10 a.m. UTC 
  From: "Chen Jing D(Mark)" <jing.d.chen@intel.com>

Since the communication between PF/Switch Manager, VF/PF is
asynchronous through mailbox, it's hard to determine when Switch
Manager/PF host will send the default vlan to PF/VF. So, it's
necessary to set default vlan until the device is started.

Signed-off-by: Chen Jing D(Mark) <jing.d.chen@intel.com>
---
 drivers/net/fm10k/fm10k_ethdev.c |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)
diff mbox

Patch

diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c
index b6e82e3..3a26480 100644
--- a/drivers/net/fm10k/fm10k_ethdev.c
+++ b/drivers/net/fm10k/fm10k_ethdev.c
@@ -667,6 +667,17 @@  fm10k_dev_start(struct rte_eth_dev *dev)
 		}
 	}
 
+	if (hw->mac.default_vid && hw->mac.default_vid <= ETHER_MAX_VLAN_ID) {
+		fm10k_mbx_lock(hw);
+		/* Update default vlan */
+		hw->mac.ops.update_vlan(hw, hw->mac.default_vid, 0, true);
+
+		/* Add default mac/vlan filter to PF/Switch manger */
+		hw->mac.ops.update_uc_addr(hw, hw->mac.dglort_map, hw->mac.addr,
+				hw->mac.default_vid, true, 0);
+		fm10k_mbx_unlock(hw);
+	}
+
 	return 0;
 }
 
@@ -1839,15 +1850,12 @@  eth_fm10k_dev_init(struct rte_eth_dev *dev)
 	/* Enable port first */
 	hw->mac.ops.update_lport_state(hw, hw->mac.dglort_map, 1, 1);
 
-	/* Update default vlan */
-	hw->mac.ops.update_vlan(hw, hw->mac.default_vid, 0, true);
-
 	/*
-	 * Add default mac/vlan filter. glort is assigned by SM for PF, while is
+	 * Add default mac. glort is assigned by SM for PF, while is
 	 * unused for VF. PF will assign correct glort for VF.
 	 */
 	hw->mac.ops.update_uc_addr(hw, hw->mac.dglort_map, hw->mac.addr,
-			      hw->mac.default_vid, 1, 0);
+				0, 1, 0);
 
 	/* Set unicast mode by default. App can change to other mode in other
 	 * API func.