lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ixgbe: Enable support for VF API version 1.1 in the PF.

Browse Source 
This change switches on the last few bits for us enabling version 1.1 VF
support in the PF.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Tested-by: Robert Garrett <RobertX.Garrett@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Alexander Duyck
2012-07-20 08:09:37 +00:00
committed by Jeff Kirsher
parent f591cd9def
commit bffb3bc958
1 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
View File

@@ -371,14 +371,26 @@ static s32 ixgbe_set_vf_lpe(struct ixgbe_adapter *adapter, u32 *msgbuf, u32 vf)
IXGBE_FCOE_JUMBO_FRAME_SIZE); IXGBE_FCOE_JUMBO_FRAME_SIZE);
#endif /* CONFIG_FCOE */ #endif /* CONFIG_FCOE */
/* switch (adapter->vfinfo[vf].vf_api) {
* If the PF or VF are running w/ jumbo frames enabled we case ixgbe_mbox_api_11:
* need to shut down the VF Rx path as we cannot support /*
* jumbo frames on legacy VFs * Version 1.1 supports jumbo frames on VFs if PF has
*/ * jumbo frames enabled which means legacy VFs are
if ((pf_max_frame > ETH_FRAME_LEN) || * disabled
(max_frame > (ETH_FRAME_LEN + ETH_FCS_LEN))) */
err = -EINVAL; if (pf_max_frame > ETH_FRAME_LEN)
break;
default:
/*
* If the PF or VF are running w/ jumbo frames enabled
* we need to shut down the VF Rx path as we cannot
* support jumbo frames on legacy VFs
*/
if ((pf_max_frame > ETH_FRAME_LEN) ||
(max_frame > (ETH_FRAME_LEN + ETH_FCS_LEN)))
err = -EINVAL;
break;
}
/* determine VF receive enable location */ /* determine VF receive enable location */
vf_shift = vf % 32; vf_shift = vf % 32;
@@ -740,6 +752,7 @@ static int ixgbe_negotiate_vf_api(struct ixgbe_adapter *adapter,
switch (api) { switch (api) {
case ixgbe_mbox_api_10: case ixgbe_mbox_api_10:
case ixgbe_mbox_api_11:
adapter->vfinfo[vf].vf_api = api; adapter->vfinfo[vf].vf_api = api;
return 0; return 0;
default: default: