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

Commit dec0d8e4 authored by Jeff Kirsher's avatar Jeff Kirsher
Browse files

ixgbevf: Fix code comments and whitespace 



Fix the code comments to align with drivers/net/ code commenting style,
as well as whitespace issues.  The whitespace issues resolve checkpatch
errors, like lines exceeding 80 chars (except for strings) and the use
of tabs where possible.

CC: <kernel-team@fb.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
parent 856f606e

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

+142 −143
Original line number Diff line number Diff line 
/*******************************************************************************



  Intel 82599 Virtual Function driver

  Copyright(c) 1999 - 2012 Intel Corporation.

  Copyright(c) 1999 - 2015 Intel Corporation.



  This program is free software; you can redistribute it and/or modify it

  under the terms and conditions of the GNU General Public License,
@@ -13,8 +13,7 @@ 
  more details.



  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.,

  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.

  this program; if not, see <http://www.gnu.org/licenses/>.



  The full GNU General Public License is included in this distribution in

  the file called "COPYING".
@@ -182,7 +181,7 @@ typedef u32 ixgbe_link_speed; 
#define IXGBE_TXD_CMD_IFCS	0x02000000 /* Insert FCS (Ethernet CRC) */

#define IXGBE_TXD_CMD_IC	0x04000000 /* Insert Checksum */

#define IXGBE_TXD_CMD_RS	0x08000000 /* Report Status */

#define IXGBE_TXD_CMD_DEXT   0x20000000 /* Descriptor extension (0 = legacy) */

#define IXGBE_TXD_CMD_DEXT	0x20000000 /* Descriptor ext (0 = legacy) */

#define IXGBE_TXD_CMD_VLE	0x40000000 /* Add VLAN tag */

#define IXGBE_TXD_STAT_DD	0x00000001 /* Descriptor Done */

#define IXGBE_TXD_CMD		(IXGBE_TXD_CMD_EOP | IXGBE_TXD_CMD_RS)

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

+44 −42
Original line number Diff line number Diff line 
/*******************************************************************************



  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

  under the terms and conditions of the GNU General Public License,
@@ -13,8 +13,7 @@ 
  more details.



  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.,

  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.

  this program; if not, see <http://www.gnu.org/licenses/>.



  The full GNU General Public License is included in this distribution in

  the file called "COPYING".
@@ -100,6 +99,7 @@ static const char ixgbe_gstrings_test[][ETH_GSTRING_LEN] = { 
	"Register test  (offline)",

	"Link test   (on/offline)"

};



#define IXGBE_TEST_LEN (sizeof(ixgbe_gstrings_test) / ETH_GSTRING_LEN)



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) {

		__u32 speed = SPEED_10000;



		switch (link_speed) {

		case IXGBE_LINK_SPEED_10GB_FULL:

			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)

{

	struct ixgbevf_adapter *adapter = netdev_priv(netdev);



	return adapter->msg_enable;

}



static void ixgbevf_set_msglevel(struct net_device *netdev, u32 data)

{

	struct ixgbevf_adapter *adapter = netdev_priv(netdev);



	adapter->msg_enable = data;

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


	/* Interrupt */

	/* 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[6] = IXGBE_READ_REG(hw, IXGBE_VTEICS);

	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;



	/*

	 * 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.

	 */

	while (test->reg) {
@@ -670,7 +673,8 @@ static void ixgbevf_diag_test(struct net_device *netdev, 
		hw_dbg(&adapter->hw, "offline testing starting\n");



		/* 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]))

			eth_test->flags |= ETH_TEST_FL_FAILED;
@@ -724,7 +728,7 @@ static int ixgbevf_get_coalesce(struct net_device *netdev, 
	else

		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)

		return 0;
@@ -745,12 +749,11 @@ static int ixgbevf_set_coalesce(struct net_device *netdev, 
	int num_vectors, i;

	u16 tx_itr_param, rx_itr_param;



	/* 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

	    && ec->tx_coalesce_usecs)

	/* 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 && ec->tx_coalesce_usecs)

		return -EINVAL;





	if ((ec->rx_coalesce_usecs > (IXGBE_MAX_EITR >> 2)) ||

	    (ec->tx_coalesce_usecs > (IXGBE_MAX_EITR >> 2)))

		return -EINVAL;
@@ -765,7 +768,6 @@ static int ixgbevf_set_coalesce(struct net_device *netdev, 
	else

		rx_itr_param = adapter->rx_itr_setting;





	if (ec->tx_coalesce_usecs > 1)

		adapter->tx_itr_setting = ec->tx_coalesce_usecs << 2;

	else
@@ -781,10 +783,10 @@ static int ixgbevf_set_coalesce(struct net_device *netdev, 
	for (i = 0; i < num_vectors; i++) {

		q_vector = adapter->q_vector[i];

		if (q_vector->tx.count && !q_vector->rx.count)

			/* tx only */

			/* Tx only */

			q_vector->itr = tx_itr_param;

		else

			/* rx only or mixed */

			/* Rx only or mixed */

			q_vector->itr = rx_itr_param;

		ixgbevf_write_eitr(q_vector);

	}

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

+45 −37
Original line number Diff line number Diff line 
/*******************************************************************************



  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

  under the terms and conditions of the GNU General Public License,
@@ -13,8 +13,7 @@ 
  more details.



  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.,

  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.

  this program; if not, see <http://www.gnu.org/licenses/>.



  The full GNU General Public License is included in this distribution in

  the file called "COPYING".
@@ -51,7 +50,8 @@ 
#define DESC_NEEDED (MAX_SKB_FRAGS + 4)



/* 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 {

	union ixgbe_adv_tx_desc *next_to_watch;

	unsigned long time_stamp;
@@ -132,9 +132,10 @@ struct ixgbevf_ring { 
	u8 __iomem *tail;

	struct sk_buff *skb;



	u16 reg_idx; /* holds the special value that gets the hardware register

		      * offset associated with this ring, which is different

		      * for DCB and RSS modes */

	/* holds the special value that gets the hardware register offset

	 * associated with this ring, which is different for DCB and RSS modes

	 */

	u16 reg_idx;

	int queue_index; /* needed for multiqueue queue management */

};
@@ -186,9 +187,10 @@ struct ixgbevf_ring_container { 
 */

struct ixgbevf_q_vector {

	struct ixgbevf_adapter *adapter;

	u16 v_idx;		/* index of q_vector within array, also used for

				 * finding the bit in EICR and friends that

				 * represents the vector for this ring */

	/* index of q_vector within array, also used for finding the bit in

	 * EICR and friends that represents the vector for this ring

	 */

	u16 v_idx;

	u16 itr; /* Interrupt throttle rate written to EITR */

	struct napi_struct napi;

	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_STATE_NAPI_YIELD	8    /* NAPI 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_USER_PEND (IXGBEVF_QV_STATE_POLL | IXGBEVF_QV_STATE_POLL_YIELD)

#define IXGBEVF_QV_YIELD	(IXGBEVF_QV_STATE_NAPI_YIELD | \

				 IXGBEVF_QV_STATE_POLL_YIELD)

#define IXGBEVF_QV_USER_PEND	(IXGBEVF_QV_STATE_POLL | \

				 IXGBEVF_QV_STATE_POLL_YIELD)

	spinlock_t lock;

#endif /* CONFIG_NET_RX_BUSY_POLL */

};



#ifdef CONFIG_NET_RX_BUSY_POLL

static inline void ixgbevf_qv_init_lock(struct ixgbevf_q_vector *q_vector)

{



	spin_lock_init(&q_vector->lock);

	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)

{

	int rc = true;



	spin_lock_bh(&q_vector->lock);

	if (q_vector->state & IXGBEVF_QV_LOCKED) {

		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)

{

	int rc = false;



	spin_lock_bh(&q_vector->lock);

	WARN_ON(q_vector->state & (IXGBEVF_QV_STATE_POLL |

				   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)

{

	int rc = true;



	spin_lock_bh(&q_vector->lock);

	if ((q_vector->state & IXGBEVF_QV_LOCKED)) {

		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)

{

	int rc = false;



	spin_lock_bh(&q_vector->lock);

	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)

{

	int rc = true;



	spin_lock_bh(&q_vector->lock);

	if (q_vector->state & IXGBEVF_QV_OWNED)

		rc = false;
@@ -307,8 +316,7 @@ static inline bool ixgbevf_qv_disable(struct ixgbevf_q_vector *q_vector) 


#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

 */

#define IXGBE_MIN_RSC_ITR	24

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

+114 −115

File changed.

Preview size limit exceeded, changes collapsed.

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

+21 −22
Original line number Diff line number Diff line 
/*******************************************************************************



  Intel 82599 Virtual Function driver

  Copyright(c) 1999 - 2012 Intel Corporation.

  Copyright(c) 1999 - 2015 Intel Corporation.



  This program is free software; you can redistribute it and/or modify it

  under the terms and conditions of the GNU General Public License,
@@ -13,8 +13,7 @@ 
  more details.



  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.,

  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.

  this program; if not, see <http://www.gnu.org/licenses/>.



  The full GNU General Public License is included in this distribution in

  the file called "COPYING".
@@ -52,10 +51,10 @@ static s32 ixgbevf_poll_for_msg(struct ixgbe_hw *hw) 
}



/**

 *  ixgbevf_poll_for_ack - Wait for message acknowledgement

 *  ixgbevf_poll_for_ack - Wait for message acknowledgment

 *  @hw: pointer to the HW structure

 *

 *  returns 0 if it successfully received a message acknowledgement

 *  returns 0 if it successfully received a message acknowledgment

 **/

static s32 ixgbevf_poll_for_ack(struct ixgbe_hw *hw)

{
@@ -234,7 +233,7 @@ static s32 ixgbevf_obtain_mbx_lock_vf(struct ixgbe_hw *hw) 
	/* Take ownership of the buffer */

	IXGBE_WRITE_REG(hw, IXGBE_VFMAILBOX, IXGBE_VFMAILBOX_VFU);



	/* reserve mailbox for vf use */

	/* reserve mailbox for VF use */

	if (ixgbevf_read_v2p_mailbox(hw) & IXGBE_VFMAILBOX_VFU)

		ret_val = 0;
@@ -254,8 +253,7 @@ static s32 ixgbevf_write_mbx_vf(struct ixgbe_hw *hw, u32 *msg, u16 size) 
	s32 ret_val;

	u16 i;





	/* lock the mailbox to prevent pf/vf race condition */

	/* lock the mailbox to prevent PF/VF race condition */

	ret_val = ixgbevf_obtain_mbx_lock_vf(hw);

	if (ret_val)

		goto out_no_write;
@@ -279,7 +277,7 @@ static s32 ixgbevf_write_mbx_vf(struct ixgbe_hw *hw, u32 *msg, u16 size) 
}



/**

 *  ixgbevf_read_mbx_vf - Reads a message from the inbox intended for vf

 *  ixgbevf_read_mbx_vf - Reads a message from the inbox intended for VF

 *  @hw: pointer to the HW structure

 *  @msg: The message buffer

 *  @size: Length of buffer
@@ -291,7 +289,7 @@ static s32 ixgbevf_read_mbx_vf(struct ixgbe_hw *hw, u32 *msg, u16 size) 
	s32 ret_val = 0;

	u16 i;



	/* lock the mailbox to prevent pf/vf race condition */

	/* lock the mailbox to prevent PF/VF race condition */

	ret_val = ixgbevf_obtain_mbx_lock_vf(hw);

	if (ret_val)

		goto out_no_read;
@@ -311,17 +309,18 @@ static s32 ixgbevf_read_mbx_vf(struct ixgbe_hw *hw, u32 *msg, u16 size) 
}



/**

 *  ixgbevf_init_mbx_params_vf - set initial values for vf mailbox

 *  ixgbevf_init_mbx_params_vf - set initial values for VF mailbox

 *  @hw: pointer to the HW structure

 *

 *  Initializes the hw->mbx struct to correct values for vf mailbox

 *  Initializes the hw->mbx struct to correct values for VF mailbox

 */

static s32 ixgbevf_init_mbx_params_vf(struct ixgbe_hw *hw)

{

	struct ixgbe_mbx_info *mbx = &hw->mbx;



	/* start mailbox as timed out and let the reset_hw call set the timeout

	 * value to begin communications */

	 * value to begin communications

	 */

	mbx->timeout = 0;

	mbx->udelay = IXGBE_VF_MBX_INIT_DELAY;