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

Commit 218d48e7 authored by Hariprasad Shenai's avatar Hariprasad Shenai Committed by David S. Miller
Browse files

cxgb4: Reset dcb state machine and tx queue prio only if dcb is enabled 



When cxgb4 is enabled with CONFIG_CHELSIO_T4_DCB set, VI enable command
gets called with DCB enabled. But when we have a back to back setup with
DCB enabled on one side and non-DCB on the Peer side. Firmware doesn't
send any DCB_L2_CFG, and DCB priority is never set for Tx queue.
But driver resets the queue priority and state machine whenever there
is a link down, this patch fixes it by adding a check to reset only if
cxgb4_dcb_enabled() returns true.

Signed-off-by: default avatarHariprasad Shenai <hariprasad@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5113bfdb

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c

+20 −18
Original line number Original line Diff line number Diff line
@@ -304,6 +304,22 @@ static void dcb_tx_queue_prio_enable(struct net_device *dev, int enable) 
}

}

#endif /* CONFIG_CHELSIO_T4_DCB */

#endif /* CONFIG_CHELSIO_T4_DCB */





int cxgb4_dcb_enabled(const struct net_device *dev)

{

#ifdef CONFIG_CHELSIO_T4_DCB

	struct port_info *pi = netdev_priv(dev);



	if (!pi->dcb.enabled)

		return 0;



	return ((pi->dcb.state == CXGB4_DCB_STATE_FW_ALLSYNCED) ||

		(pi->dcb.state == CXGB4_DCB_STATE_HOST));

#else

	return 0;

#endif

}

EXPORT_SYMBOL(cxgb4_dcb_enabled);



void t4_os_link_changed(struct adapter *adapter, int port_id, int link_stat)

void t4_os_link_changed(struct adapter *adapter, int port_id, int link_stat)

{

{

	struct net_device *dev = adapter->port[port_id];

	struct net_device *dev = adapter->port[port_id];
@@ -314,8 +330,10 @@ void t4_os_link_changed(struct adapter *adapter, int port_id, int link_stat) 
			netif_carrier_on(dev);

			netif_carrier_on(dev);

		else {

		else {

#ifdef CONFIG_CHELSIO_T4_DCB

#ifdef CONFIG_CHELSIO_T4_DCB

			if (cxgb4_dcb_enabled(dev)) {

				cxgb4_dcb_state_init(dev);

				cxgb4_dcb_state_init(dev);

				dcb_tx_queue_prio_enable(dev, false);

				dcb_tx_queue_prio_enable(dev, false);

			}

#endif /* CONFIG_CHELSIO_T4_DCB */

#endif /* CONFIG_CHELSIO_T4_DCB */

			netif_carrier_off(dev);

			netif_carrier_off(dev);

		}

		}
@@ -494,22 +512,6 @@ static int link_start(struct net_device *dev) 
	return ret;

	return ret;

}

}





int cxgb4_dcb_enabled(const struct net_device *dev)

{

#ifdef CONFIG_CHELSIO_T4_DCB

	struct port_info *pi = netdev_priv(dev);



	if (!pi->dcb.enabled)

		return 0;



	return ((pi->dcb.state == CXGB4_DCB_STATE_FW_ALLSYNCED) ||

		(pi->dcb.state == CXGB4_DCB_STATE_HOST));

#else

	return 0;

#endif

}

EXPORT_SYMBOL(cxgb4_dcb_enabled);



#ifdef CONFIG_CHELSIO_T4_DCB

#ifdef CONFIG_CHELSIO_T4_DCB

/* Handle a Data Center Bridging update message from the firmware. */

/* Handle a Data Center Bridging update message from the firmware. */

static void dcb_rpl(struct adapter *adap, const struct fw_port_cmd *pcmd)

static void dcb_rpl(struct adapter *adap, const struct fw_port_cmd *pcmd)