Commit 8fe088bd 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/tnguy/next-queue 



Tony Nguyen says:

====================
100GbE Intel Wired LAN Driver Updates 2021-06-17

This series contains updates to ice driver only.

Jake corrects a couple of entries in the PTYPE table to properly
reflect the datasheet and removes unneeded NULL checks for some
PTP calls.

Paul reduces the scope of variables and removes the use of a local
variable.

Shaokun Zhang removes a duplicate function declaration.

Lorenzo Bianconi fixes a compilation warning if PTP_1588_CLOCK is
disabled.

Colin Ian King changes a for loop to remove an unneeded 'continue'.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 200cedf1 587b839d

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

+2 −2
Original line number Diff line number Diff line
@@ -630,7 +630,7 @@ static const struct ice_rx_ptype_decoded ice_ptype_lkup[] = { 
	/* L2 Packet types */

	ICE_PTT_UNUSED_ENTRY(0),

	ICE_PTT(1, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY2),

	ICE_PTT(2, L2, NONE, NOF, NONE, NONE, NOF, NONE, NONE),

	ICE_PTT_UNUSED_ENTRY(2),

	ICE_PTT_UNUSED_ENTRY(3),

	ICE_PTT_UNUSED_ENTRY(4),

	ICE_PTT_UNUSED_ENTRY(5),
@@ -744,7 +744,7 @@ static const struct ice_rx_ptype_decoded ice_ptype_lkup[] = { 
	/* Non Tunneled IPv6 */

	ICE_PTT(88, IP, IPV6, FRG, NONE, NONE, NOF, NONE, PAY3),

	ICE_PTT(89, IP, IPV6, NOF, NONE, NONE, NOF, NONE, PAY3),

	ICE_PTT(90, IP, IPV6, NOF, NONE, NONE, NOF, UDP,  PAY3),

	ICE_PTT(90, IP, IPV6, NOF, NONE, NONE, NOF, UDP,  PAY4),

	ICE_PTT_UNUSED_ENTRY(91),

	ICE_PTT(92, IP, IPV6, NOF, NONE, NONE, NOF, TCP,  PAY4),

	ICE_PTT(93, IP, IPV6, NOF, NONE, NONE, NOF, SCTP, PAY4),

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

+4 −4
Original line number Diff line number Diff line
@@ -1205,11 +1205,11 @@ static int ice_vsi_setup_vector_base(struct ice_vsi *vsi) 
	num_q_vectors = vsi->num_q_vectors;

	/* reserve slots from OS requested IRQs */

	if (vsi->type == ICE_VSI_CTRL && vsi->vf_id != ICE_INVAL_VFID) {

		struct ice_vf *vf;

		int i;



		ice_for_each_vf(pf, i) {

			vf = &pf->vf[i];

			struct ice_vf *vf = &pf->vf[i];



			if (i != vsi->vf_id && vf->ctrl_vsi_idx != ICE_NO_VSI) {

				base = pf->vsi[vf->ctrl_vsi_idx]->base_vector;

				break;
@@ -2873,11 +2873,11 @@ int ice_vsi_release(struct ice_vsi *vsi) 
	 * cleared in the same manner.

	 */

	if (vsi->type == ICE_VSI_CTRL && vsi->vf_id != ICE_INVAL_VFID) {

		struct ice_vf *vf;

		int i;



		ice_for_each_vf(pf, i) {

			vf = &pf->vf[i];

			struct ice_vf *vf = &pf->vf[i];



			if (i != vsi->vf_id && vf->ctrl_vsi_idx != ICE_NO_VSI)

				break;

		}

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

+3 −4
Original line number Diff line number Diff line
@@ -3078,7 +3078,6 @@ static void ice_set_netdev_features(struct net_device *netdev) 
 */

static int ice_cfg_netdev(struct ice_vsi *vsi)

{

	struct ice_pf *pf = vsi->back;

	struct ice_netdev_priv *np;

	struct net_device *netdev;

	u8 mac_addr[ETH_ALEN];
@@ -3098,7 +3097,7 @@ static int ice_cfg_netdev(struct ice_vsi *vsi) 
	ice_set_ops(netdev);



	if (vsi->type == ICE_VSI_PF) {

		SET_NETDEV_DEV(netdev, ice_pf_to_dev(pf));

		SET_NETDEV_DEV(netdev, ice_pf_to_dev(vsi->back));

		ether_addr_copy(mac_addr, vsi->port_info->mac.perm_addr);

		ether_addr_copy(netdev->dev_addr, mac_addr);

		ether_addr_copy(netdev->perm_addr, mac_addr);
@@ -5631,7 +5630,6 @@ ice_update_vsi_tx_ring_stats(struct ice_vsi *vsi, struct ice_ring **rings, 
static void ice_update_vsi_ring_stats(struct ice_vsi *vsi)

{

	struct rtnl_link_stats64 *vsi_stats = &vsi->net_stats;

	struct ice_ring *ring;

	u64 pkts, bytes;

	int i;
@@ -5655,7 +5653,8 @@ static void ice_update_vsi_ring_stats(struct ice_vsi *vsi) 


	/* update Rx rings counters */

	ice_for_each_rxq(vsi, i) {

		ring = READ_ONCE(vsi->rx_rings[i]);

		struct ice_ring *ring = READ_ONCE(vsi->rx_rings[i]);



		ice_fetch_u64_stats_per_ring(ring, &pkts, &bytes);

		vsi_stats->rx_packets += pkts;

		vsi_stats->rx_bytes += bytes;

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

+4 −8
Original line number Diff line number Diff line
@@ -219,13 +219,11 @@ ice_ptp_read_src_clk_reg(struct ice_pf *pf, struct ptp_system_timestamp *sts) 


	tmr_idx = ice_get_ptp_src_clock_index(hw);

	/* Read the system timestamp pre PHC read */

	if (sts)

	ptp_read_system_prets(sts);



	lo = rd32(hw, GLTSYN_TIME_L(tmr_idx));



	/* Read the system timestamp post PHC read */

	if (sts)

	ptp_read_system_postts(sts);



	hi = rd32(hw, GLTSYN_TIME_H(tmr_idx));
@@ -235,10 +233,8 @@ ice_ptp_read_src_clk_reg(struct ice_pf *pf, struct ptp_system_timestamp *sts) 
		/* if TIME_L rolled over read TIME_L again and update

		 * system timestamps

		 */

		if (sts)

		ptp_read_system_prets(sts);

		lo = rd32(hw, GLTSYN_TIME_L(tmr_idx));

		if (sts)

		ptp_read_system_postts(sts);

		hi = rd32(hw, GLTSYN_TIME_H(tmr_idx));

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ static inline int ice_get_ptp_clock_index(struct ice_pf *pf) 
	return -1;

}



static inline

static inline s8

ice_ptp_request_ts(struct ice_ptp_tx *tx, struct sk_buff *skb)

{

	return -1;