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

Commit 1d3b78bb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 

Pull networking fixes from David Miller:

 1) Fix PCI IDs of 9000 series iwlwifi devices, from Luca Coelho.

 2) bpf offload bug fixes from Jakub Kicinski.

 3) Fix bpf verifier to NOP out code which is dead at run time because
    due to branch pruning the verifier will not explore such
    instructions. From Alexei Starovoitov.

 4) Fix crash when deleting secondary chains in packet scheduler
    classifier. From Roman Kapl.

 5) Fix buffer management bugs in smc, from Ursula Braun.

 6) Fix regression in anycast route handling, from David Ahern.

 7) Fix link settings regression in r8169, from Tobias Jakobi.

 8) Add back enough UFO support so that live migration still works, from
    Willem de Bruijn.

 9) Linearize enough packet data for the full extent to which the ipvlan
    code will inspect the packet headers, from Gao Feng.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (46 commits)
  ipvlan: Fix insufficient skb linear check for ipv6 icmp
  ipvlan: Fix insufficient skb linear check for arp
  geneve: only configure or fill UDP_ZERO_CSUM6_RX/TX info when CONFIG_IPV6
  net: dsa: bcm_sf2: Clear IDDQ_GLOBAL_PWR bit for PHY
  net: accept UFO datagrams from tuntap and packet
  net: realtek: r8169: implement set_link_ksettings()
  net: ipv6: Fixup device for anycast routes during copy
  net/smc: Fix preinitialization of buf_desc in __smc_buf_create()
  net/smc: use sk_rcvbuf as start for rmb creation
  ipv6: Do not consider linkdown nexthops during multipath
  net: sched: fix crash when deleting secondary chains
  net: phy: cortina: add missing MODULE_DESCRIPTION/AUTHOR/LICENSE
  bpf: fix branch pruning logic
  bpf: change bpf_perf_event_output arg5 type to ARG_CONST_SIZE_OR_ZERO
  bpf: change bpf_probe_read_str arg2 type to ARG_CONST_SIZE_OR_ZERO
  bpf: remove explicit handling of 0 for arg2 in bpf_probe_read
  bpf: introduce ARG_PTR_TO_MEM_OR_NULL
  i40evf: Use smp_rmb rather than read_barrier_depends
  fm10k: Use smp_rmb rather than read_barrier_depends
  igb: Use smp_rmb rather than read_barrier_depends
  ...
parents 36f20ee2 9ed33805

drivers/net/dsa/bcm_sf2.c

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static void bcm_sf2_gphy_enable_set(struct dsa_switch *ds, bool enable) 
	reg = reg_readl(priv, REG_SPHY_CNTRL);

	if (enable) {

		reg |= PHY_RESET;

		reg &= ~(EXT_PWR_DOWN | IDDQ_BIAS | CK25_DIS);

		reg &= ~(EXT_PWR_DOWN | IDDQ_BIAS | IDDQ_GLOBAL_PWR | CK25_DIS);

		reg_writel(priv, reg, REG_SPHY_CNTRL);

		udelay(21);

		reg = reg_readl(priv, REG_SPHY_CNTRL);

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

+1 −1
Original line number Diff line number Diff line
@@ -1231,7 +1231,7 @@ static bool fm10k_clean_tx_irq(struct fm10k_q_vector *q_vector, 
			break;



		/* prevent any other reads prior to eop_desc */

		read_barrier_depends();

		smp_rmb();



		/* if DD is not set pending work has not been completed */

		if (!(eop_desc->flags & FM10K_TXD_FLAG_DONE))

drivers/net/ethernet/intel/i40e/i40e.h

+0 −1
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ 
#define I40E_AQ_LEN			256

#define I40E_AQ_WORK_LIMIT		66 /* max number of VFs + a little */

#define I40E_MAX_USER_PRIORITY		8

#define I40E_MAX_QUEUES_PER_CH		64

#define I40E_DEFAULT_TRAFFIC_CLASS	BIT(0)

#define I40E_DEFAULT_MSG_ENABLE		4

#define I40E_QUEUE_WAIT_RETRY_LIMIT	10

drivers/net/ethernet/intel/i40e/i40e_adminq.c

+6 −0
Original line number Diff line number Diff line
@@ -613,6 +613,12 @@ i40e_status i40e_init_adminq(struct i40e_hw *hw) 
		hw->flags |= I40E_HW_FLAG_AQ_PHY_ACCESS_CAPABLE;

	}



	/* Newer versions of firmware require lock when reading the NVM */

	if (hw->aq.api_maj_ver > 1 ||

	    (hw->aq.api_maj_ver == 1 &&

	     hw->aq.api_min_ver >= 5))

		hw->flags |= I40E_HW_FLAG_NVM_READ_REQUIRES_LOCK;



	/* The ability to RX (not drop) 802.1ad frames was added in API 1.7 */

	if (hw->aq.api_maj_ver > 1 ||

	    (hw->aq.api_maj_ver == 1 &&

drivers/net/ethernet/intel/i40e/i40e_common.c

+9 −1
Original line number Diff line number Diff line
@@ -948,7 +948,8 @@ i40e_status i40e_init_shared_code(struct i40e_hw *hw) 
		hw->pf_id = (u8)(func_rid & 0x7);



	if (hw->mac.type == I40E_MAC_X722)

		hw->flags |= I40E_HW_FLAG_AQ_SRCTL_ACCESS_ENABLE;

		hw->flags |= I40E_HW_FLAG_AQ_SRCTL_ACCESS_ENABLE |

			     I40E_HW_FLAG_NVM_READ_REQUIRES_LOCK;



	status = i40e_init_nvm(hw);

	return status;
@@ -1268,6 +1269,7 @@ i40e_status i40e_pf_reset(struct i40e_hw *hw) 
	 * we don't need to do the PF Reset

	 */

	if (!cnt) {

		u32 reg2 = 0;

		if (hw->revision_id == 0)

			cnt = I40E_PF_RESET_WAIT_COUNT_A0;

		else
@@ -1279,6 +1281,12 @@ i40e_status i40e_pf_reset(struct i40e_hw *hw) 
			reg = rd32(hw, I40E_PFGEN_CTRL);

			if (!(reg & I40E_PFGEN_CTRL_PFSWR_MASK))

				break;

			reg2 = rd32(hw, I40E_GLGEN_RSTAT);

			if (reg2 & I40E_GLGEN_RSTAT_DEVSTATE_MASK) {

				hw_dbg(hw, "Core reset upcoming. Skipping PF reset request.\n");

				hw_dbg(hw, "I40E_GLGEN_RSTAT = 0x%x\n", reg2);

				return I40E_ERR_NOT_READY;

			}

			usleep_range(1000, 2000);

		}

		if (reg & I40E_PFGEN_CTRL_PFSWR_MASK) {