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

Commit 5d136594 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) In ip_gre tunnel, handle the conflict between TUNNEL_{SEQ,CSUM} and
    GSO/LLTX properly. From Sabrina Dubroca.

 2) Stop properly on error in lan78xx_read_otp(), from Phil Elwell.

 3) Don't uncompress in slip before rstate is initialized, from Tejaswi
    Tanikella.

 4) When using 1.x firmware on aquantia, issue a deinit before we
    hardware reset the chip, otherwise we break dirty wake WOL. From
    Igor Russkikh.

 5) Correct log check in vhost_vq_access_ok(), from Stefan Hajnoczi.

 6) Fix ethtool -x crashes in bnxt_en, from Michael Chan.

 7) Fix races in l2tp tunnel creation and duplicate tunnel detection,
    from Guillaume Nault.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (22 commits)
  l2tp: fix race in duplicate tunnel detection
  l2tp: fix races in tunnel creation
  tun: send netlink notification when the device is modified
  tun: set the flags before registering the netdevice
  lan78xx: Don't reset the interface on open
  bnxt_en: Fix NULL pointer dereference at bnxt_free_irq().
  bnxt_en: Need to include RDMA rings in bnxt_check_rings().
  bnxt_en: Support max-mtu with VF-reps
  bnxt_en: Ignore src port field in decap filter nodes
  bnxt_en: do not allow wildcard matches for L2 flows
  bnxt_en: Fix ethtool -x crash when device is down.
  vhost: return bool from *_access_ok() functions
  vhost: fix vhost_vq_access_ok() log check
  vhost: Fix vhost_copy_to_user()
  net: aquantia: oops when shutdown on already stopped device
  net: aquantia: Regression on reset with 1.x firmware
  cdc_ether: flag the Cinterion AHS8 modem by gemalto as WWAN
  slip: Check if rstate is initialized before uncompressing
  lan78xx: Avoid spurious kevent 4 "error"
  lan78xx: Correctly indicate invalid OTP
  ...
parents 67a7a8ff 0c84cee8

drivers/net/ethernet/aquantia/atlantic/aq_nic.c

+5 −3
Original line number Diff line number Diff line
@@ -951,9 +951,11 @@ void aq_nic_shutdown(struct aq_nic_s *self) 


	netif_device_detach(self->ndev);



	if (netif_running(self->ndev)) {

		err = aq_nic_stop(self);

		if (err < 0)

			goto err_exit;

	}

	aq_nic_deinit(self);



err_exit:

drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c

+16 −0
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ 
#define FORCE_FLASHLESS 0



static int hw_atl_utils_ver_match(u32 ver_expected, u32 ver_actual);

static int hw_atl_utils_mpi_set_state(struct aq_hw_s *self,

				      enum hal_atl_utils_fw_state_e state);



int hw_atl_utils_initfw(struct aq_hw_s *self, const struct aq_fw_ops **fw_ops)

{
@@ -247,6 +249,20 @@ int hw_atl_utils_soft_reset(struct aq_hw_s *self) 


	self->rbl_enabled = (boot_exit_code != 0);



	/* FW 1.x may bootup in an invalid POWER state (WOL feature).

	 * We should work around this by forcing its state back to DEINIT

	 */

	if (!hw_atl_utils_ver_match(HW_ATL_FW_VER_1X,

				    aq_hw_read_reg(self,

						   HW_ATL_MPI_FW_VERSION))) {

		int err = 0;



		hw_atl_utils_mpi_set_state(self, MPI_DEINIT);

		AQ_HW_WAIT_FOR((aq_hw_read_reg(self, HW_ATL_MPI_STATE_ADR) &

			       HW_ATL_MPI_STATE_MSK) == MPI_DEINIT,

			       10, 1000U);

	}



	if (self->rbl_enabled)

		return hw_atl_utils_soft_reset_rbl(self);

	else

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+3 −1
Original line number Diff line number Diff line
@@ -6090,7 +6090,7 @@ static void bnxt_free_irq(struct bnxt *bp) 
	free_irq_cpu_rmap(bp->dev->rx_cpu_rmap);

	bp->dev->rx_cpu_rmap = NULL;

#endif

	if (!bp->irq_tbl)

	if (!bp->irq_tbl || !bp->bnapi)

		return;



	for (i = 0; i < bp->cp_nr_rings; i++) {
@@ -7686,6 +7686,8 @@ int bnxt_check_rings(struct bnxt *bp, int tx, int rx, bool sh, int tcs, 
	if (bp->flags & BNXT_FLAG_AGG_RINGS)

		rx_rings <<= 1;

	cp = sh ? max_t(int, tx_rings_needed, rx) : tx_rings_needed + rx;

	if (bp->flags & BNXT_FLAG_NEW_RM)

		cp += bnxt_get_ulp_msix_num(bp);

	return bnxt_hwrm_check_rings(bp, tx_rings_needed, rx_rings, rx, cp,

				     vnics);

}

drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c

+8 −3
Original line number Diff line number Diff line
@@ -870,17 +870,22 @@ static int bnxt_get_rxfh(struct net_device *dev, u32 *indir, u8 *key, 
			 u8 *hfunc)

{

	struct bnxt *bp = netdev_priv(dev);

	struct bnxt_vnic_info *vnic = &bp->vnic_info[0];

	struct bnxt_vnic_info *vnic;

	int i = 0;



	if (hfunc)

		*hfunc = ETH_RSS_HASH_TOP;



	if (indir)

	if (!bp->vnic_info)

		return 0;



	vnic = &bp->vnic_info[0];

	if (indir && vnic->rss_table) {

		for (i = 0; i < HW_HASH_INDEX_SIZE; i++)

			indir[i] = le16_to_cpu(vnic->rss_table[i]);

	}



	if (key)

	if (key && vnic->rss_hash_key)

		memcpy(key, vnic->rss_hash_key, HW_HASH_KEY_SIZE);



	return 0;

drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c

+62 −1
Original line number Diff line number Diff line
@@ -377,6 +377,30 @@ static bool is_wildcard(void *mask, int len) 
	return true;

}



static bool is_exactmatch(void *mask, int len)

{

	const u8 *p = mask;

	int i;



	for (i = 0; i < len; i++)

		if (p[i] != 0xff)

			return false;



	return true;

}



static bool bits_set(void *key, int len)

{

	const u8 *p = key;

	int i;



	for (i = 0; i < len; i++)

		if (p[i] != 0)

			return true;



	return false;

}



static int bnxt_hwrm_cfa_flow_alloc(struct bnxt *bp, struct bnxt_tc_flow *flow,

				    __le16 ref_flow_handle,

				    __le32 tunnel_handle, __le16 *flow_handle)
@@ -764,6 +788,41 @@ static bool bnxt_tc_can_offload(struct bnxt *bp, struct bnxt_tc_flow *flow) 
		return false;

	}



	/* Currently source/dest MAC cannot be partial wildcard  */

	if (bits_set(&flow->l2_key.smac, sizeof(flow->l2_key.smac)) &&

	    !is_exactmatch(flow->l2_mask.smac, sizeof(flow->l2_mask.smac))) {

		netdev_info(bp->dev, "Wildcard match unsupported for Source MAC\n");

		return false;

	}

	if (bits_set(&flow->l2_key.dmac, sizeof(flow->l2_key.dmac)) &&

	    !is_exactmatch(&flow->l2_mask.dmac, sizeof(flow->l2_mask.dmac))) {

		netdev_info(bp->dev, "Wildcard match unsupported for Dest MAC\n");

		return false;

	}



	/* Currently VLAN fields cannot be partial wildcard */

	if (bits_set(&flow->l2_key.inner_vlan_tci,

		     sizeof(flow->l2_key.inner_vlan_tci)) &&

	    !is_exactmatch(&flow->l2_mask.inner_vlan_tci,

			   sizeof(flow->l2_mask.inner_vlan_tci))) {

		netdev_info(bp->dev, "Wildcard match unsupported for VLAN TCI\n");

		return false;

	}

	if (bits_set(&flow->l2_key.inner_vlan_tpid,

		     sizeof(flow->l2_key.inner_vlan_tpid)) &&

	    !is_exactmatch(&flow->l2_mask.inner_vlan_tpid,

			   sizeof(flow->l2_mask.inner_vlan_tpid))) {

		netdev_info(bp->dev, "Wildcard match unsupported for VLAN TPID\n");

		return false;

	}



	/* Currently Ethertype must be set */

	if (!is_exactmatch(&flow->l2_mask.ether_type,

			   sizeof(flow->l2_mask.ether_type))) {

		netdev_info(bp->dev, "Wildcard match unsupported for Ethertype\n");

		return false;

	}



	return true;

}
@@ -992,8 +1051,10 @@ static int bnxt_tc_get_decap_handle(struct bnxt *bp, struct bnxt_tc_flow *flow, 


	/* Check if there's another flow using the same tunnel decap.

	 * If not, add this tunnel to the table and resolve the other

	 * tunnel header fileds

	 * tunnel header fileds. Ignore src_port in the tunnel_key,

	 * since it is not required for decap filters.

	 */

	decap_key->tp_src = 0;

	decap_node = bnxt_tc_get_tunnel_node(bp, &tc_info->decap_table,

					     &tc_info->decap_ht_params,

					     decap_key);