diff mbox

[net-next,6/8] i40e: provide correct API version to older VF drivers

Message ID 1433449442-31420-7-git-send-email-catherine.sullivan@intel.com
State Accepted
Delegated to: Jeff Kirsher
Headers show

Commit Message

Catherine Sullivan June 4, 2015, 8:24 p.m. UTC 
From: Mitch Williams <mitch.a.williams@intel.com>

This driver fully supports VF drivers using both the 1.0 and 1.1
versions of the virtual channel API. However, VF drivers using
version 1.0 get upset if we provide them with a version other than
that, and refuse to play with us.

Correct this by checking the VFs API version at the time that we
store it off, and provide the correct version number back to the VF
so we can all get along.

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

Comments

James Young July 1, 2015, 7:42 p.m. UTC | #1 
> -----Original Message-----
> From: Intel-wired-lan [mailto:intel-wired-lan-bounces@lists.osuosl.org] On
> Behalf Of Catherine Sullivan
> Sent: Thursday, June 04, 2015 1:24 PM
> To: intel-wired-lan@lists.osuosl.org
> Subject: [Intel-wired-lan] [intel-wired-lan][net-next PATCH 6/8] i40e: provide
> correct API version to older VF drivers
> 
> From: Mitch Williams <mitch.a.williams@intel.com>
> 
> This driver fully supports VF drivers using both the 1.0 and 1.1 versions of the
> virtual channel API. However, VF drivers using version 1.0 get upset if we
> provide them with a version other than that, and refuse to play with us.
> 
> Correct this by checking the VFs API version at the time that we store it off,
> and provide the correct version number back to the VF so we can all get
> along.
> 
> Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
> Change-ID: I86dfe02e67b2bef336b4b49a1bb072f3e7229abc
> ---
>  drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
Tested-by: Jim Young <james.m.young@intel.com>

Actually not testable on net-next kernel as I cannot find a API 1.0 i40evf driver that will build on the 4.1.0rc7 kernel (kcompat issues)
This patch does not break current i40evf driver operation so I am letting it pass.
diff mbox

Patch

diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
index 1bfc4d0..4f13619 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -1120,6 +1120,9 @@  static int i40e_vc_get_version_msg(struct i40e_vf *vf, u8 *msg)
 	};
 
 	vf->vf_ver = *(struct i40e_virtchnl_version_info *)msg;
+	/* VFs running the 1.0 API expect to get 1.0 back or they will cry. */
+	if (VF_IS_V10(vf))
+		info.minor = I40E_VIRTCHNL_VERSION_MINOR_NO_VF_CAPS;
 	return i40e_vc_send_msg_to_vf(vf, I40E_VIRTCHNL_OP_VERSION,
 				      I40E_SUCCESS, (u8 *)&info,
 				      sizeof(struct