Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f525c6d2 authored by John Fastabend's avatar John Fastabend Committed by Jeff Kirsher
Browse files

ixgbe: dcb: BIT_APP_UPCHG not set by ixgbe_copy_dcb_cfg() 



After this commit:

commit aacc1bea
Author: Multanen, Eric W <eric.w.multanen@intel.com>
Date:   Wed Mar 28 07:49:09 2012 +0000

    ixgbe: driver fix for link flap

The BIT_APP_UPCHG bit is no longer set when ixgbe_dcbnl_set_all() is
called. This results in the FCoE app user priority never getting set
and the driver will not configure the tx_rings correctly for FCoE
packets which use the SAN MTU and FCoE offloads.

We resolve this regression by fixing ixgbe_copy_dcb_cfg() to also
check for FCoE application changes. Additionally, we can drop the
IEEE variants of get_dcb_app() because this path is never called
with the IEEE mode enabled.

Signed-off-by: default avatarJohn Fastabend <john.r.fastabend@intel.com>
Tested-by: default avatarRoss Brattain <ross.b.brattain@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent ab6039a7

drivers/net/ethernet/intel/ixgbe/ixgbe.h

+0 −3
Original line number Diff line number Diff line
@@ -574,9 +574,6 @@ extern struct ixgbe_info ixgbe_82599_info; 
extern struct ixgbe_info ixgbe_X540_info;

#ifdef CONFIG_IXGBE_DCB

extern const struct dcbnl_rtnl_ops dcbnl_ops;

extern int ixgbe_copy_dcb_cfg(struct ixgbe_dcb_config *src_dcb_cfg,

                              struct ixgbe_dcb_config *dst_dcb_cfg,

                              int tc_max);

#endif



extern char ixgbe_driver_name[];

drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c

+20 −23
Original line number Diff line number Diff line
@@ -44,18 +44,26 @@ 
#define DCB_NO_HW_CHG   1  /* DCB configuration did not change */

#define DCB_HW_CHG      2  /* DCB configuration changed, no reset */



int ixgbe_copy_dcb_cfg(struct ixgbe_dcb_config *scfg,

		       struct ixgbe_dcb_config *dcfg, int tc_max)

static int ixgbe_copy_dcb_cfg(struct ixgbe_adapter *adapter, int tc_max)

{

	struct ixgbe_dcb_config *scfg = &adapter->temp_dcb_cfg;

	struct ixgbe_dcb_config *dcfg = &adapter->dcb_cfg;

	struct tc_configuration *src = NULL;

	struct tc_configuration *dst = NULL;

	int i, j;

	int tx = DCB_TX_CONFIG;

	int rx = DCB_RX_CONFIG;

	int changes = 0;

#ifdef IXGBE_FCOE

	struct dcb_app app = {

			      .selector = DCB_APP_IDTYPE_ETHTYPE,

			      .protocol = ETH_P_FCOE,

			     };

	u8 up = dcb_getapp(adapter->netdev, &app);



	if (!scfg || !dcfg)

		return changes;

	if (up && !(up & (1 << adapter->fcoe.up)))

		changes |= BIT_APP_UPCHG;

#endif



	for (i = DCB_PG_ATTR_TC_0; i < tc_max + DCB_PG_ATTR_TC_0; i++) {

		src = &scfg->tc_config[i - DCB_PG_ATTR_TC_0];
@@ -332,28 +340,12 @@ static u8 ixgbe_dcbnl_set_all(struct net_device *netdev) 
	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	int ret = DCB_NO_HW_CHG;

	int i;

#ifdef IXGBE_FCOE

	struct dcb_app app = {

			      .selector = DCB_APP_IDTYPE_ETHTYPE,

			      .protocol = ETH_P_FCOE,

			     };

	u8 up;



	/* In IEEE mode, use the IEEE Ethertype selector value */

	if (adapter->dcbx_cap & DCB_CAP_DCBX_VER_IEEE) {

		app.selector = IEEE_8021QAZ_APP_SEL_ETHERTYPE;

		up = dcb_ieee_getapp_mask(netdev, &app);

	} else {

		up = dcb_getapp(netdev, &app);

	}

#endif



	/* Fail command if not in CEE mode */

	if (!(adapter->dcbx_cap & DCB_CAP_DCBX_VER_CEE))

		return ret;



	adapter->dcb_set_bitmap |= ixgbe_copy_dcb_cfg(&adapter->temp_dcb_cfg,

						      &adapter->dcb_cfg,

	adapter->dcb_set_bitmap |= ixgbe_copy_dcb_cfg(adapter,

						      MAX_TRAFFIC_CLASS);

	if (!adapter->dcb_set_bitmap)

		return ret;
@@ -440,8 +432,13 @@ static u8 ixgbe_dcbnl_set_all(struct net_device *netdev) 
	 * FCoE is using changes. This happens if the APP info

	 * changes or the up2tc mapping is updated.

	 */

	if ((up && !(up & (1 << adapter->fcoe.up))) ||

	    (adapter->dcb_set_bitmap & BIT_APP_UPCHG)) {

	if (adapter->dcb_set_bitmap & BIT_APP_UPCHG) {

		struct dcb_app app = {

				      .selector = DCB_APP_IDTYPE_ETHTYPE,

				      .protocol = ETH_P_FCOE,

				     };

		u8 up = dcb_getapp(netdev, &app);



		adapter->fcoe.up = ffs(up) - 1;

		ixgbe_dcbnl_devreset(netdev);

		ret = DCB_HW_CHG_RST;

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+2 −2
Original line number Diff line number Diff line
@@ -4418,8 +4418,8 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter) 
	adapter->dcb_cfg.pfc_mode_enable = false;

	adapter->dcb_set_bitmap = 0x00;

	adapter->dcbx_cap = DCB_CAP_DCBX_HOST | DCB_CAP_DCBX_VER_CEE;

	ixgbe_copy_dcb_cfg(&adapter->dcb_cfg, &adapter->temp_dcb_cfg,

			   MAX_TRAFFIC_CLASS);

	memcpy(&adapter->temp_dcb_cfg, &adapter->dcb_cfg,

	       sizeof(adapter->temp_dcb_cfg));



#endif