aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeerav Parikh <neerav.parikh@intel.com>2015-02-24 01:58:53 -0500
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2015-03-03 04:07:30 -0500
commitfc51de96ed2f7fcefb99991200aac6710b769eba (patch)
treedb28ed46a599e3f807a1fbfc70f694f8edd4ba73
parent15d504b9464c87821db1e56f6d6774eb4ea929ea (diff)
i40e: Only enable TC0 for NIC partition type
In case of MFP mode the driver was returning incorrect number of TCs for partitions that are not enabled for iSCSI. Though the driver does not configure these TCs in the Tx scheduler for the NIC partitions; it does use this map to setup the queue mappings. This patch fixes this and keeps all the NIC partitions to the default PF TC i.e. TC0. Change-ID: Iede214c907e7bac1356e999049b9f642759512b3 Signed-off-by: Neerav Parikh <neerav.parikh@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/ethernet/intel/i40e/i40e_main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index f9da8e805842..31450f9ee1bf 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -4107,7 +4107,7 @@ static u8 i40e_pf_get_num_tc(struct i40e_pf *pf)
4107 if (pf->hw.func_caps.iscsi) 4107 if (pf->hw.func_caps.iscsi)
4108 enabled_tc = i40e_get_iscsi_tc_map(pf); 4108 enabled_tc = i40e_get_iscsi_tc_map(pf);
4109 else 4109 else
4110 enabled_tc = pf->hw.func_caps.enabled_tcmap; 4110 return 1; /* Only TC0 */
4111 4111
4112 /* At least have TC0 */ 4112 /* At least have TC0 */
4113 enabled_tc = (enabled_tc ? enabled_tc : 0x1); 4113 enabled_tc = (enabled_tc ? enabled_tc : 0x1);
@@ -4157,11 +4157,11 @@ static u8 i40e_pf_get_tc_map(struct i40e_pf *pf)
4157 if (!(pf->flags & I40E_FLAG_MFP_ENABLED)) 4157 if (!(pf->flags & I40E_FLAG_MFP_ENABLED))
4158 return i40e_dcb_get_enabled_tc(&pf->hw.local_dcbx_config); 4158 return i40e_dcb_get_enabled_tc(&pf->hw.local_dcbx_config);
4159 4159
4160 /* MPF enabled and iSCSI PF type */ 4160 /* MFP enabled and iSCSI PF type */
4161 if (pf->hw.func_caps.iscsi) 4161 if (pf->hw.func_caps.iscsi)
4162 return i40e_get_iscsi_tc_map(pf); 4162 return i40e_get_iscsi_tc_map(pf);
4163 else 4163 else
4164 return pf->hw.func_caps.enabled_tcmap; 4164 return i40e_pf_get_default_tc(pf);
4165} 4165}
4166 4166
4167/** 4167/**