ixgbevf: Fix code comments and whitespace (dec0d8e4) · Commits · jan.koester / Linux

drivers/net/ethernet/intel/ixgbevf/defines.h

+142 −143

drivers/net/ethernet/intel/ixgbevf/ethtool.c

+44 −42

Original line number	Original line	Diff line number	Diff line
	/*******************************************************************************		/*******************************************************************************

	Intel 82599 Virtual Function driver		Intel 82599 Virtual Function driver
	Copyright(c) 1999 - 2014 Intel Corporation.		Copyright(c) 1999 - 2015 Intel Corporation.

	This program is free software; you can redistribute it and/or modify it		This program is free software; you can redistribute it and/or modify it
	under the terms and conditions of the GNU General Public License,		under the terms and conditions of the GNU General Public License,
	@@ -13,8 +13,7 @@
	more details.		more details.

	You should have received a copy of the GNU General Public License along with		You should have received a copy of the GNU General Public License along with
	this program; if not, write to the Free Software Foundation, Inc.,		this program; if not, see <http://www.gnu.org/licenses/>.
	51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.

	The full GNU General Public License is included in this distribution in		The full GNU General Public License is included in this distribution in
	the file called "COPYING".		the file called "COPYING".
	@@ -100,6 +99,7 @@ static const char ixgbe_gstrings_test[][ETH_GSTRING_LEN] = {
	"Register test (offline)",		"Register test (offline)",
	"Link test (on/offline)"		"Link test (on/offline)"
	};		};

	#define IXGBE_TEST_LEN (sizeof(ixgbe_gstrings_test) / ETH_GSTRING_LEN)		#define IXGBE_TEST_LEN (sizeof(ixgbe_gstrings_test) / ETH_GSTRING_LEN)

	static int ixgbevf_get_settings(struct net_device *netdev,		static int ixgbevf_get_settings(struct net_device *netdev,
	@@ -120,6 +120,7 @@ static int ixgbevf_get_settings(struct net_device *netdev,

	if (link_up) {		if (link_up) {
	__u32 speed = SPEED_10000;		__u32 speed = SPEED_10000;

	switch (link_speed) {		switch (link_speed) {
	case IXGBE_LINK_SPEED_10GB_FULL:		case IXGBE_LINK_SPEED_10GB_FULL:
	speed = SPEED_10000;		speed = SPEED_10000;
	@@ -145,12 +146,14 @@ static int ixgbevf_get_settings(struct net_device *netdev,
	static u32 ixgbevf_get_msglevel(struct net_device *netdev)		static u32 ixgbevf_get_msglevel(struct net_device *netdev)
	{		{
	struct ixgbevf_adapter *adapter = netdev_priv(netdev);		struct ixgbevf_adapter *adapter = netdev_priv(netdev);

	return adapter->msg_enable;		return adapter->msg_enable;
	}		}

	static void ixgbevf_set_msglevel(struct net_device *netdev, u32 data)		static void ixgbevf_set_msglevel(struct net_device *netdev, u32 data)
	{		{
	struct ixgbevf_adapter *adapter = netdev_priv(netdev);		struct ixgbevf_adapter *adapter = netdev_priv(netdev);

	adapter->msg_enable = data;		adapter->msg_enable = data;
	}		}

	@@ -185,7 +188,8 @@ static void ixgbevf_get_regs(struct net_device *netdev,

	/* Interrupt */		/* Interrupt */
	/* don't read EICR because it can clear interrupt causes, instead		/* don't read EICR because it can clear interrupt causes, instead
	* read EICS which is a shadow but doesn't clear EICR */		* read EICS which is a shadow but doesn't clear EICR
			*/
	regs_buff[5] = IXGBE_READ_REG(hw, IXGBE_VTEICS);		regs_buff[5] = IXGBE_READ_REG(hw, IXGBE_VTEICS);
	regs_buff[6] = IXGBE_READ_REG(hw, IXGBE_VTEICS);		regs_buff[6] = IXGBE_READ_REG(hw, IXGBE_VTEICS);
	regs_buff[7] = IXGBE_READ_REG(hw, IXGBE_VTEIMS);		regs_buff[7] = IXGBE_READ_REG(hw, IXGBE_VTEIMS);
	@@ -594,8 +598,7 @@ static int ixgbevf_reg_test(struct ixgbevf_adapter adapter, u64 data)
	}		}
	test = reg_test_vf;		test = reg_test_vf;

	/*		/* Perform the register test, looping through the test table
	* Perform the register test, looping through the test table
	* until we either fail or reach the null entry.		* until we either fail or reach the null entry.
	*/		*/
	while (test->reg) {		while (test->reg) {
	@@ -670,7 +673,8 @@ static void ixgbevf_diag_test(struct net_device *netdev,
	hw_dbg(&adapter->hw, "offline testing starting\n");		hw_dbg(&adapter->hw, "offline testing starting\n");

	/* Link test performed before hardware reset so autoneg doesn't		/* Link test performed before hardware reset so autoneg doesn't
	* interfere with test result */		* interfere with test result
			*/
	if (ixgbevf_link_test(adapter, &data[1]))		if (ixgbevf_link_test(adapter, &data[1]))
	eth_test->flags \|= ETH_TEST_FL_FAILED;		eth_test->flags \|= ETH_TEST_FL_FAILED;

	@@ -724,7 +728,7 @@ static int ixgbevf_get_coalesce(struct net_device *netdev,
	else		else
	ec->rx_coalesce_usecs = adapter->rx_itr_setting >> 2;		ec->rx_coalesce_usecs = adapter->rx_itr_setting >> 2;

	/* if in mixed tx/rx queues per vector mode, report only rx settings */		/* if in mixed Tx/Rx queues per vector mode, report only Rx settings */
	if (adapter->q_vector[0]->tx.count && adapter->q_vector[0]->rx.count)		if (adapter->q_vector[0]->tx.count && adapter->q_vector[0]->rx.count)
	return 0;		return 0;

	@@ -745,12 +749,11 @@ static int ixgbevf_set_coalesce(struct net_device *netdev,
	int num_vectors, i;		int num_vectors, i;
	u16 tx_itr_param, rx_itr_param;		u16 tx_itr_param, rx_itr_param;

	/* don't accept tx specific changes if we've got mixed RxTx vectors */		/* don't accept Tx specific changes if we've got mixed RxTx vectors */
	if (adapter->q_vector[0]->tx.count && adapter->q_vector[0]->rx.count		if (adapter->q_vector[0]->tx.count &&
	&& ec->tx_coalesce_usecs)		adapter->q_vector[0]->rx.count && ec->tx_coalesce_usecs)
	return -EINVAL;		return -EINVAL;


	if ((ec->rx_coalesce_usecs > (IXGBE_MAX_EITR >> 2)) \|\|		if ((ec->rx_coalesce_usecs > (IXGBE_MAX_EITR >> 2)) \|\|
	(ec->tx_coalesce_usecs > (IXGBE_MAX_EITR >> 2)))		(ec->tx_coalesce_usecs > (IXGBE_MAX_EITR >> 2)))
	return -EINVAL;		return -EINVAL;
	@@ -765,7 +768,6 @@ static int ixgbevf_set_coalesce(struct net_device *netdev,
	else		else
	rx_itr_param = adapter->rx_itr_setting;		rx_itr_param = adapter->rx_itr_setting;


	if (ec->tx_coalesce_usecs > 1)		if (ec->tx_coalesce_usecs > 1)
	adapter->tx_itr_setting = ec->tx_coalesce_usecs << 2;		adapter->tx_itr_setting = ec->tx_coalesce_usecs << 2;
	else		else
	@@ -781,10 +783,10 @@ static int ixgbevf_set_coalesce(struct net_device *netdev,
	for (i = 0; i < num_vectors; i++) {		for (i = 0; i < num_vectors; i++) {
	q_vector = adapter->q_vector[i];		q_vector = adapter->q_vector[i];
	if (q_vector->tx.count && !q_vector->rx.count)		if (q_vector->tx.count && !q_vector->rx.count)
	/* tx only */		/* Tx only */
	q_vector->itr = tx_itr_param;		q_vector->itr = tx_itr_param;
	else		else
	/* rx only or mixed */		/* Rx only or mixed */
	q_vector->itr = rx_itr_param;		q_vector->itr = rx_itr_param;
	ixgbevf_write_eitr(q_vector);		ixgbevf_write_eitr(q_vector);
	}		}

drivers/net/ethernet/intel/ixgbevf/ixgbevf.h

+45 −37

Original line number	Original line	Diff line number	Diff line
	/*******************************************************************************		/*******************************************************************************

	Intel 82599 Virtual Function driver		Intel 82599 Virtual Function driver
	Copyright(c) 1999 - 2014 Intel Corporation.		Copyright(c) 1999 - 2015 Intel Corporation.

	This program is free software; you can redistribute it and/or modify it		This program is free software; you can redistribute it and/or modify it
	under the terms and conditions of the GNU General Public License,		under the terms and conditions of the GNU General Public License,
	@@ -13,8 +13,7 @@
	more details.		more details.

	You should have received a copy of the GNU General Public License along with		You should have received a copy of the GNU General Public License along with
	this program; if not, write to the Free Software Foundation, Inc.,		this program; if not, see <http://www.gnu.org/licenses/>.
	51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.

	The full GNU General Public License is included in this distribution in		The full GNU General Public License is included in this distribution in
	the file called "COPYING".		the file called "COPYING".
	@@ -51,7 +50,8 @@
	#define DESC_NEEDED (MAX_SKB_FRAGS + 4)		#define DESC_NEEDED (MAX_SKB_FRAGS + 4)

	/* wrapper around a pointer to a socket buffer,		/* wrapper around a pointer to a socket buffer,
	* so a DMA handle can be stored along with the buffer */		* so a DMA handle can be stored along with the buffer
			*/
	struct ixgbevf_tx_buffer {		struct ixgbevf_tx_buffer {
	union ixgbe_adv_tx_desc *next_to_watch;		union ixgbe_adv_tx_desc *next_to_watch;
	unsigned long time_stamp;		unsigned long time_stamp;
	@@ -132,9 +132,10 @@ struct ixgbevf_ring {
	u8 __iomem *tail;		u8 __iomem *tail;
	struct sk_buff *skb;		struct sk_buff *skb;

	u16 reg_idx; /* holds the special value that gets the hardware register		/* holds the special value that gets the hardware register offset
	* offset associated with this ring, which is different		* associated with this ring, which is different for DCB and RSS modes
	* for DCB and RSS modes */		*/
			u16 reg_idx;
	int queue_index; /* needed for multiqueue queue management */		int queue_index; /* needed for multiqueue queue management */
	};		};

	@@ -186,9 +187,10 @@ struct ixgbevf_ring_container {
	*/		*/
	struct ixgbevf_q_vector {		struct ixgbevf_q_vector {
	struct ixgbevf_adapter *adapter;		struct ixgbevf_adapter *adapter;
	u16 v_idx; /* index of q_vector within array, also used for		/* index of q_vector within array, also used for finding the bit in
	* finding the bit in EICR and friends that		* EICR and friends that represents the vector for this ring
	* represents the vector for this ring */		*/
			u16 v_idx;
	u16 itr; /* Interrupt throttle rate written to EITR */		u16 itr; /* Interrupt throttle rate written to EITR */
	struct napi_struct napi;		struct napi_struct napi;
	struct ixgbevf_ring_container rx, tx;		struct ixgbevf_ring_container rx, tx;
	@@ -203,15 +205,17 @@ struct ixgbevf_q_vector {
	#define IXGBEVF_QV_LOCKED (IXGBEVF_QV_OWNED \| IXGBEVF_QV_STATE_DISABLED)		#define IXGBEVF_QV_LOCKED (IXGBEVF_QV_OWNED \| IXGBEVF_QV_STATE_DISABLED)
	#define IXGBEVF_QV_STATE_NAPI_YIELD 8 /* NAPI yielded this QV */		#define IXGBEVF_QV_STATE_NAPI_YIELD 8 /* NAPI yielded this QV */
	#define IXGBEVF_QV_STATE_POLL_YIELD 16 /* poll yielded this QV */		#define IXGBEVF_QV_STATE_POLL_YIELD 16 /* poll yielded this QV */
	#define IXGBEVF_QV_YIELD (IXGBEVF_QV_STATE_NAPI_YIELD \| IXGBEVF_QV_STATE_POLL_YIELD)		#define IXGBEVF_QV_YIELD (IXGBEVF_QV_STATE_NAPI_YIELD \| \
	#define IXGBEVF_QV_USER_PEND (IXGBEVF_QV_STATE_POLL \| IXGBEVF_QV_STATE_POLL_YIELD)		IXGBEVF_QV_STATE_POLL_YIELD)
			#define IXGBEVF_QV_USER_PEND (IXGBEVF_QV_STATE_POLL \| \
			IXGBEVF_QV_STATE_POLL_YIELD)
	spinlock_t lock;		spinlock_t lock;
	#endif /* CONFIG_NET_RX_BUSY_POLL */		#endif /* CONFIG_NET_RX_BUSY_POLL */
	};		};

	#ifdef CONFIG_NET_RX_BUSY_POLL		#ifdef CONFIG_NET_RX_BUSY_POLL
	static inline void ixgbevf_qv_init_lock(struct ixgbevf_q_vector *q_vector)		static inline void ixgbevf_qv_init_lock(struct ixgbevf_q_vector *q_vector)
	{		{

	spin_lock_init(&q_vector->lock);		spin_lock_init(&q_vector->lock);
	q_vector->state = IXGBEVF_QV_STATE_IDLE;		q_vector->state = IXGBEVF_QV_STATE_IDLE;
	}		}
	@@ -220,6 +224,7 @@ static inline void ixgbevf_qv_init_lock(struct ixgbevf_q_vector *q_vector)
	static inline bool ixgbevf_qv_lock_napi(struct ixgbevf_q_vector *q_vector)		static inline bool ixgbevf_qv_lock_napi(struct ixgbevf_q_vector *q_vector)
	{		{
	int rc = true;		int rc = true;

	spin_lock_bh(&q_vector->lock);		spin_lock_bh(&q_vector->lock);
	if (q_vector->state & IXGBEVF_QV_LOCKED) {		if (q_vector->state & IXGBEVF_QV_LOCKED) {
	WARN_ON(q_vector->state & IXGBEVF_QV_STATE_NAPI);		WARN_ON(q_vector->state & IXGBEVF_QV_STATE_NAPI);
	@@ -240,6 +245,7 @@ static inline bool ixgbevf_qv_lock_napi(struct ixgbevf_q_vector *q_vector)
	static inline bool ixgbevf_qv_unlock_napi(struct ixgbevf_q_vector *q_vector)		static inline bool ixgbevf_qv_unlock_napi(struct ixgbevf_q_vector *q_vector)
	{		{
	int rc = false;		int rc = false;

	spin_lock_bh(&q_vector->lock);		spin_lock_bh(&q_vector->lock);
	WARN_ON(q_vector->state & (IXGBEVF_QV_STATE_POLL \|		WARN_ON(q_vector->state & (IXGBEVF_QV_STATE_POLL \|
	IXGBEVF_QV_STATE_NAPI_YIELD));		IXGBEVF_QV_STATE_NAPI_YIELD));
	@@ -256,6 +262,7 @@ static inline bool ixgbevf_qv_unlock_napi(struct ixgbevf_q_vector *q_vector)
	static inline bool ixgbevf_qv_lock_poll(struct ixgbevf_q_vector *q_vector)		static inline bool ixgbevf_qv_lock_poll(struct ixgbevf_q_vector *q_vector)
	{		{
	int rc = true;		int rc = true;

	spin_lock_bh(&q_vector->lock);		spin_lock_bh(&q_vector->lock);
	if ((q_vector->state & IXGBEVF_QV_LOCKED)) {		if ((q_vector->state & IXGBEVF_QV_LOCKED)) {
	q_vector->state \|= IXGBEVF_QV_STATE_POLL_YIELD;		q_vector->state \|= IXGBEVF_QV_STATE_POLL_YIELD;
	@@ -275,6 +282,7 @@ static inline bool ixgbevf_qv_lock_poll(struct ixgbevf_q_vector *q_vector)
	static inline bool ixgbevf_qv_unlock_poll(struct ixgbevf_q_vector *q_vector)		static inline bool ixgbevf_qv_unlock_poll(struct ixgbevf_q_vector *q_vector)
	{		{
	int rc = false;		int rc = false;

	spin_lock_bh(&q_vector->lock);		spin_lock_bh(&q_vector->lock);
	WARN_ON(q_vector->state & (IXGBEVF_QV_STATE_NAPI));		WARN_ON(q_vector->state & (IXGBEVF_QV_STATE_NAPI));

	@@ -297,6 +305,7 @@ static inline bool ixgbevf_qv_busy_polling(struct ixgbevf_q_vector *q_vector)
	static inline bool ixgbevf_qv_disable(struct ixgbevf_q_vector *q_vector)		static inline bool ixgbevf_qv_disable(struct ixgbevf_q_vector *q_vector)
	{		{
	int rc = true;		int rc = true;

	spin_lock_bh(&q_vector->lock);		spin_lock_bh(&q_vector->lock);
	if (q_vector->state & IXGBEVF_QV_OWNED)		if (q_vector->state & IXGBEVF_QV_OWNED)
	rc = false;		rc = false;
	@@ -307,8 +316,7 @@ static inline bool ixgbevf_qv_disable(struct ixgbevf_q_vector *q_vector)

	#endif /* CONFIG_NET_RX_BUSY_POLL */		#endif /* CONFIG_NET_RX_BUSY_POLL */

	/*		/* microsecond values for various ITR rates shifted by 2 to fit itr register
	* microsecond values for various ITR rates shifted by 2 to fit itr register
	* with the first 3 bits reserved 0		* with the first 3 bits reserved 0
	*/		*/
	#define IXGBE_MIN_RSC_ITR 24		#define IXGBE_MIN_RSC_ITR 24