[next,S98,5/6] i40e: Use correct shift for vlan priority

Message ID 20181026213333.51495-5-alice.michael@intel.com
State Under Review
Delegated to: Jeff Kirsher
Headers show
Series
  • [next,S98,1/6] i40e: don't restart nway if autoneg not supported
Related show

Commit Message

Alice Michael Oct. 26, 2018, 9:33 p.m.
From: Richard Rodriguez <richard.rodriguez@intel.com>

When using port VLAN, for VFs, and setting priority bits, the device
was sending out incorrect priority bits, and also setting the CFI
bit incorrectly.

To fix this, changed shift and mask bit definition for this function, to
use the correct ones.

Signed-off-by: Richard Rodriguez <richard.rodriguez@intel.com>
---
 drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Bowers, AndrewX Oct. 31, 2018, 4:27 p.m. | #1
> -----Original Message-----
> From: Intel-wired-lan [mailto:intel-wired-lan-bounces@osuosl.org] On
> Behalf Of Alice Michael
> Sent: Friday, October 26, 2018 2:34 PM
> To: Michael, Alice <alice.michael@intel.com>; intel-wired-
> lan@lists.osuosl.org
> Cc: Rodriguez, Richard <richard.rodriguez@intel.com>
> Subject: [Intel-wired-lan] [next PATCH S98 5/6] i40e: Use correct shift for vlan
> priority
> 
> From: Richard Rodriguez <richard.rodriguez@intel.com>
> 
> When using port VLAN, for VFs, and setting priority bits, the device was
> sending out incorrect priority bits, and also setting the CFI bit incorrectly.
> 
> To fix this, changed shift and mask bit definition for this function, to use the
> correct ones.
> 
> Signed-off-by: Richard Rodriguez <richard.rodriguez@intel.com>
> ---
>  drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Tested-by: Andrew Bowers <andrewx.bowers@intel.com>

Patch

diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h
index bf67d62..f962102 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h
@@ -13,9 +13,9 @@ 
 #define I40E_DEFAULT_NUM_MDD_EVENTS_ALLOWED	3
 #define I40E_DEFAULT_NUM_INVALID_MSGS_ALLOWED	10
 
-#define I40E_VLAN_PRIORITY_SHIFT	12
+#define I40E_VLAN_PRIORITY_SHIFT	13
 #define I40E_VLAN_MASK			0xFFF
-#define I40E_PRIORITY_MASK		0x7000
+#define I40E_PRIORITY_MASK		0xE000
 
 /* Various queue ctrls */
 enum i40e_queue_ctrl {