Commit d96112b2 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue 



Jeff Kirsher says:

====================
100GbE Intel Wired LAN Driver Updates 2018-10-01

This series contains updates to ice driver only.

Anirudh provides several changes to "prep" the driver for upcoming
features.  Specifically, the functions that are used for PF VSI/netdev
setup will also be used in SR-IOV support and to allow the reuse of
these functions, code needs to move.

Dave provides the only other change in the series, updates the driver to
protect the reset patch in its entirety.  This is done by adding the
various bit checks to determine if a reset is scheduled/initiated and
whether it came from the software or firmware.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 804fe108 5df7e45d

drivers/net/ethernet/intel/ice/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -13,5 +13,6 @@ ice-y := ice_main.o \ 
	 ice_nvm.o	\

	 ice_switch.o	\

	 ice_sched.o	\

	 ice_lib.o	\

	 ice_txrx.o	\

	 ice_ethtool.o

drivers/net/ethernet/intel/ice/ice.h

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ enum ice_state { 
	__ICE_DOWN,

	__ICE_NEEDS_RESTART,

	__ICE_PREPARED_FOR_RESET,	/* set by driver when prepared */

	__ICE_RESET_RECOVERY_PENDING,	/* set by driver when reset starts */

	__ICE_RESET_OICR_RECV,		/* set by driver after rcv reset OICR */

	__ICE_PFR_REQ,			/* set by driver and peers */

	__ICE_CORER_REQ,		/* set by driver and peers */

	__ICE_GLOBR_REQ,		/* set by driver and peers */

drivers/net/ethernet/intel/ice/ice_common.c

+61 −0
Original line number Diff line number Diff line
@@ -2652,3 +2652,64 @@ ice_cfg_vsi_lan(struct ice_port_info *pi, u16 vsi_id, u8 tc_bitmap, 
	return ice_cfg_vsi_qs(pi, vsi_id, tc_bitmap, max_lanqs,

			      ICE_SCHED_NODE_OWNER_LAN);

}



/**

 * ice_stat_update40 - read 40 bit stat from the chip and update stat values

 * @hw: ptr to the hardware info

 * @hireg: high 32 bit HW register to read from

 * @loreg: low 32 bit HW register to read from

 * @prev_stat_loaded: bool to specify if previous stats are loaded

 * @prev_stat: ptr to previous loaded stat value

 * @cur_stat: ptr to current stat value

 */

void ice_stat_update40(struct ice_hw *hw, u32 hireg, u32 loreg,

		       bool prev_stat_loaded, u64 *prev_stat, u64 *cur_stat)

{

	u64 new_data;



	new_data = rd32(hw, loreg);

	new_data |= ((u64)(rd32(hw, hireg) & 0xFFFF)) << 32;



	/* device stats are not reset at PFR, they likely will not be zeroed

	 * when the driver starts. So save the first values read and use them as

	 * offsets to be subtracted from the raw values in order to report stats

	 * that count from zero.

	 */

	if (!prev_stat_loaded)

		*prev_stat = new_data;

	if (new_data >= *prev_stat)

		*cur_stat = new_data - *prev_stat;

	else

		/* to manage the potential roll-over */

		*cur_stat = (new_data + BIT_ULL(40)) - *prev_stat;

	*cur_stat &= 0xFFFFFFFFFFULL;

}



/**

 * ice_stat_update32 - read 32 bit stat from the chip and update stat values

 * @hw: ptr to the hardware info

 * @reg: HW register to read from

 * @prev_stat_loaded: bool to specify if previous stats are loaded

 * @prev_stat: ptr to previous loaded stat value

 * @cur_stat: ptr to current stat value

 */

void ice_stat_update32(struct ice_hw *hw, u32 reg, bool prev_stat_loaded,

		       u64 *prev_stat, u64 *cur_stat)

{

	u32 new_data;



	new_data = rd32(hw, reg);



	/* device stats are not reset at PFR, they likely will not be zeroed

	 * when the driver starts. So save the first values read and use them as

	 * offsets to be subtracted from the raw values in order to report stats

	 * that count from zero.

	 */

	if (!prev_stat_loaded)

		*prev_stat = new_data;

	if (new_data >= *prev_stat)

		*cur_stat = new_data - *prev_stat;

	else

		/* to manage the potential roll-over */

		*cur_stat = (new_data + BIT_ULL(32)) - *prev_stat;

}

drivers/net/ethernet/intel/ice/ice_common.h

+4 −0
Original line number Diff line number Diff line
@@ -96,4 +96,8 @@ ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_id, u8 tc, u8 num_qgrps, 
		struct ice_aqc_add_tx_qgrp *buf, u16 buf_size,

		struct ice_sq_cd *cd);

void ice_output_fw_log(struct ice_hw *hw, struct ice_aq_desc *desc, void *buf);

void ice_stat_update40(struct ice_hw *hw, u32 hireg, u32 loreg,

		       bool prev_stat_loaded, u64 *prev_stat, u64 *cur_stat);

void ice_stat_update32(struct ice_hw *hw, u32 reg, bool prev_stat_loaded,

		       u64 *prev_stat, u64 *cur_stat);

#endif /* _ICE_COMMON_H_ */

drivers/net/ethernet/intel/ice/ice_lib.c

0 → 100644
+2379 −0

File added.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE