From: Piotr Pietruszewski <piotr.pietruszew...@intel.com>
Add method to toggle VF's TX queues to work around silicon errata.
Signed-off-by: Piotr Pietruszewski <piotr.pietruszew...@intel.com>
Signed-off-by: Anatoly Burakov <anatoly.bura...@intel.com>
---
drivers/net/intel/ixgbe/base/ixgbe_api.c | 13 +++++
drivers/net/intel/ixgbe/base/ixgbe_api.h | 1 +
drivers/net/intel/ixgbe/base/ixgbe_common.c | 56 +++++++++++++++++++++
drivers/net/intel/ixgbe/base/ixgbe_common.h | 1 +
drivers/net/intel/ixgbe/base/ixgbe_type.h | 1 +
5 files changed, 72 insertions(+)
diff --git a/drivers/net/intel/ixgbe/base/ixgbe_api.c
b/drivers/net/intel/ixgbe/base/ixgbe_api.c
index ffff670dd3..6caa68b5c5 100644
--- a/drivers/net/intel/ixgbe/base/ixgbe_api.c
+++ b/drivers/net/intel/ixgbe/base/ixgbe_api.c
@@ -1116,6 +1116,19 @@ s32 ixgbe_set_vlvf(struct ixgbe_hw *hw, u32 vlan, u32
vind, bool vlan_on,
IXGBE_NOT_IMPLEMENTED);
}
+/**
+ * ixgbe_toggle_txdctl - Toggle VF's queues
+ * @hw: pointer to hardware structure
+ * @vind: VMDq pool index
+ *
+ * Enable and disable each queue in VF.
+ */
+s32 ixgbe_toggle_txdctl(struct ixgbe_hw *hw, u32 vind)
+{
+ return ixgbe_call_func(hw, hw->mac.ops.toggle_txdctl, (hw,
+ vind), IXGBE_NOT_IMPLEMENTED);
+}
+
/**
* ixgbe_fc_enable - Enable flow control
* @hw: pointer to hardware structure
diff --git a/drivers/net/intel/ixgbe/base/ixgbe_api.h
b/drivers/net/intel/ixgbe/base/ixgbe_api.h
index 5d2b2313eb..4f166f729a 100644
--- a/drivers/net/intel/ixgbe/base/ixgbe_api.h
+++ b/drivers/net/intel/ixgbe/base/ixgbe_api.h
@@ -102,6 +102,7 @@ s32 ixgbe_set_vfta(struct ixgbe_hw *hw, u32 vlan,
s32 ixgbe_set_vlvf(struct ixgbe_hw *hw, u32 vlan, u32 vind,
bool vlan_on, u32 *vfta_delta, u32 vfta,
bool vlvf_bypass);
+s32 ixgbe_toggle_txdctl(struct ixgbe_hw *hw, u32 vind);
s32 ixgbe_fc_enable(struct ixgbe_hw *hw);
s32 ixgbe_setup_fc(struct ixgbe_hw *hw);
s32 ixgbe_set_fw_drv_ver(struct ixgbe_hw *hw, u8 maj, u8 min, u8 build,
diff --git a/drivers/net/intel/ixgbe/base/ixgbe_common.c
b/drivers/net/intel/ixgbe/base/ixgbe_common.c
index fbc9605e4d..099bdce568 100644
--- a/drivers/net/intel/ixgbe/base/ixgbe_common.c
+++ b/drivers/net/intel/ixgbe/base/ixgbe_common.c
@@ -104,6 +104,7 @@ s32 ixgbe_init_ops_generic(struct ixgbe_hw *hw)
mac->ops.init_uta_tables = NULL;
mac->ops.enable_rx = ixgbe_enable_rx_generic;
mac->ops.disable_rx = ixgbe_disable_rx_generic;
+ mac->ops.toggle_txdctl = ixgbe_toggle_txdctl_generic;
/* Flow Control */
mac->ops.fc_enable = ixgbe_fc_enable_generic;
@@ -4107,6 +4108,61 @@ s32 ixgbe_clear_vfta_generic(struct ixgbe_hw *hw)
return IXGBE_SUCCESS;
}
+/**
+ * ixgbe_toggle_txdctl_generic - Toggle VF's queues
+ * @hw: pointer to hardware structure
+ * @vf_number: VF index
+ *
+ * Enable and disable each queue in VF.
+ */
+s32 ixgbe_toggle_txdctl_generic(struct ixgbe_hw *hw, u32 vf_number)
+{
+ u8 queue_count, i;
+ u32 offset, reg;
+
+ if (vf_number > 63)
+ return IXGBE_ERR_PARAM;
+
+ /*
+ * Determine number of queues by checking
+ * number of virtual functions
+ */
+ reg = IXGBE_READ_REG(hw, IXGBE_GCR_EXT);
+ switch (reg & IXGBE_GCR_EXT_VT_MODE_MASK) {
+ case IXGBE_GCR_EXT_VT_MODE_64:
+ queue_count = 2;
+ break;
+ case IXGBE_GCR_EXT_VT_MODE_32:
+ queue_count = 4;
+ break;
+ case IXGBE_GCR_EXT_VT_MODE_16:
+ queue_count = 8;
+ break;
+ default:
+ return IXGBE_ERR_CONFIG;
+ }
+
+ /* Toggle queues */
+ for (i = 0; i < queue_count; ++i) {
+ /* Calculate offset of current queue */
+ offset = queue_count * vf_number + i;
+
+ /* Enable queue */
+ reg = IXGBE_READ_REG(hw, IXGBE_PVFTXDCTL(offset));
+ reg |= IXGBE_TXDCTL_ENABLE;
+ IXGBE_WRITE_REG(hw, IXGBE_PVFTXDCTL(offset), reg);
+ IXGBE_WRITE_FLUSH(hw);
+
+ /* Disable queue */
+ reg = IXGBE_READ_REG(hw, IXGBE_PVFTXDCTL(offset));
+ reg &= ~IXGBE_TXDCTL_ENABLE;
+ IXGBE_WRITE_REG(hw, IXGBE_PVFTXDCTL(offset), reg);
+ IXGBE_WRITE_FLUSH(hw);
+ }
+
+ return IXGBE_SUCCESS;
+}
+
/**
* ixgbe_need_crosstalk_fix - Determine if we need to do cross talk fix
* @hw: pointer to hardware structure
diff --git a/drivers/net/intel/ixgbe/base/ixgbe_common.h
b/drivers/net/intel/ixgbe/base/ixgbe_common.h
index bc4466ddf3..b4f469500f 100644
--- a/drivers/net/intel/ixgbe/base/ixgbe_common.h
+++ b/drivers/net/intel/ixgbe/base/ixgbe_common.h
@@ -111,6 +111,7 @@ s32 ixgbe_set_vlvf_generic(struct ixgbe_hw *hw, u32 vlan,
u32 vind,
bool vlvf_bypass);
s32 ixgbe_clear_vfta_generic(struct ixgbe_hw *hw);
s32 ixgbe_find_vlvf_slot(struct ixgbe_hw *hw, u32 vlan, bool vlvf_bypass);
+s32 ixgbe_toggle_txdctl_generic(struct ixgbe_hw *hw, u32 vind);
s32 ixgbe_check_mac_link_generic(struct ixgbe_hw *hw,
ixgbe_link_speed *speed,
diff --git a/drivers/net/intel/ixgbe/base/ixgbe_type.h
b/drivers/net/intel/ixgbe/base/ixgbe_type.h
index 99ae823119..73f7eeabab 100644
--- a/drivers/net/intel/ixgbe/base/ixgbe_type.h
+++ b/drivers/net/intel/ixgbe/base/ixgbe_type.h
@@ -4026,6 +4026,7 @@ struct ixgbe_mac_operations {
void (*set_vlan_anti_spoofing)(struct ixgbe_hw *, bool, int);
s32 (*update_xcast_mode)(struct ixgbe_hw *, int);
s32 (*set_rlpml)(struct ixgbe_hw *, u16);
+ s32 (*toggle_txdctl)(struct ixgbe_hw *hw, u32 vf_index);
/* Flow Control */
s32 (*fc_enable)(struct ixgbe_hw *);
--
2.47.1
