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

Commit d9601be1 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 2017-10-02

This series contains updates to fm10k only.

Jake provides all but one of the changes in this series.  Most are small
fixes, starting with ensuring prompt transmission of messages queued up
after each VF message is received and handled.  Fix a possible race
condition between the watchdog task and the processing of mailbox
messages by just checking whether the mailbox is still open.  Fix a
couple of GCC v7 warnings, including misspelled "fall through" comments
and warnings about possible truncation of calls to snprintf().  Cleaned
up a convoluted bitshift and read for the PFVFLRE register.  Fixed a
potential divide by zero when finding the proper r_idx.

Markus Elfring fixes an issue which was found using Coccinelle, where
we should have been using seq_putc() instead of seq_puts().
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c4b3630a 04914390

drivers/net/ethernet/intel/fm10k/fm10k_common.c

+3 −3
Original line number Diff line number Diff line 
/* Intel(R) Ethernet Switch Host Interface Driver

 * Copyright(c) 2013 - 2016 Intel Corporation.

 * Copyright(c) 2013 - 2017 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,
@@ -517,8 +517,8 @@ s32 fm10k_get_host_state_generic(struct fm10k_hw *hw, bool *host_ready) 
		goto out;

	}



	/* verify Mailbox is still valid */

	if (!mbx->ops.tx_ready(mbx, FM10K_VFMBX_MSG_MTU))

	/* verify Mailbox is still open */

	if (mbx->state != FM10K_STATE_OPEN)

		goto out;



	/* interface cannot receive traffic without logical ports */

drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c

+2 −2
Original line number Diff line number Diff line
@@ -52,9 +52,9 @@ static void fm10k_dbg_desc_seq_stop(struct seq_file __always_unused *s, 
static void fm10k_dbg_desc_break(struct seq_file *s, int i)

{

	while (i--)

		seq_puts(s, "-");

		seq_putc(s, '-');



	seq_puts(s, "\n");

	seq_putc(s, '\n');

}



static int fm10k_dbg_tx_desc_seq_show(struct seq_file *s, void *v)

drivers/net/ethernet/intel/fm10k/fm10k_iov.c

+19 −16
Original line number Diff line number Diff line 
/* Intel(R) Ethernet Switch Host Interface Driver

 * Copyright(c) 2013 - 2016 Intel Corporation.

 * Copyright(c) 2013 - 2017 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,
@@ -66,11 +66,8 @@ s32 fm10k_iov_event(struct fm10k_intfc *interface) 
		goto read_unlock;



	/* read VFLRE to determine if any VFs have been reset */

	do {

		vflre = fm10k_read_reg(hw, FM10K_PFVFLRE(0));

	vflre = fm10k_read_reg(hw, FM10K_PFVFLRE(1));

	vflre <<= 32;

		vflre |= fm10k_read_reg(hw, FM10K_PFVFLRE(1));

		vflre = (vflre << 32) | (vflre >> 32);

	vflre |= fm10k_read_reg(hw, FM10K_PFVFLRE(0));



	i = iov_data->num_vfs;
@@ -84,7 +81,6 @@ s32 fm10k_iov_event(struct fm10k_intfc *interface) 
		hw->iov.ops.reset_resources(hw, vf_info);

		vf_info->mbx.ops.connect(hw, &vf_info->mbx);

	}

	} while (i != iov_data->num_vfs);



read_unlock:

	rcu_read_unlock();
@@ -126,6 +122,9 @@ s32 fm10k_iov_mbx(struct fm10k_intfc *interface) 
		struct fm10k_mbx_info *mbx = &vf_info->mbx;

		u16 glort = vf_info->glort;



		/* process the SM mailbox first to drain outgoing messages */

		hw->mbx.ops.process(hw, &hw->mbx);



		/* verify port mapping is valid, if not reset port */

		if (vf_info->vf_flags && !fm10k_glort_valid_pf(hw, glort))

			hw->iov.ops.reset_lport(hw, vf_info);
@@ -140,6 +139,10 @@ s32 fm10k_iov_mbx(struct fm10k_intfc *interface) 
		if (!hw->mbx.ops.tx_ready(&hw->mbx, FM10K_VFMBX_MSG_MTU)) {

			/* keep track of how many times this occurs */

			interface->hw_sm_mbx_full++;



			/* make sure we try again momentarily */

			fm10k_service_event_schedule(interface);



			break;

		}

drivers/net/ethernet/intel/fm10k/fm10k_main.c

+1 −0
Original line number Diff line number Diff line
@@ -876,6 +876,7 @@ static void fm10k_tx_csum(struct fm10k_ring *tx_ring, 
	case IPPROTO_GRE:

		if (skb->encapsulation)

			break;

		/* fall through */

	default:

		if (unlikely(net_ratelimit())) {

			dev_warn(tx_ring->dev,

drivers/net/ethernet/intel/fm10k/fm10k_mbx.c

+2 −2
Original line number Diff line number Diff line 
/* Intel(R) Ethernet Switch Host Interface Driver

 * Copyright(c) 2013 - 2016 Intel Corporation.

 * Copyright(c) 2013 - 2017 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,
@@ -1586,7 +1586,7 @@ s32 fm10k_pfvf_mbx_init(struct fm10k_hw *hw, struct fm10k_mbx_info *mbx, 
			mbx->mbmem_reg = FM10K_MBMEM_VF(id, 0);

			break;

		}

		/* fallthough */

		/* fall through */

	default:

		return FM10K_MBX_ERR_NO_MBX;

	}