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

Commit 2758b3e3 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) IPv6 gre tunnels end up with different default features enabled
    depending upon whether netlink or ioctls are used to bring them up.
    Fix from Alexey Kodanev.

 2) Fix read past end of user control message in RDS< from Avinash
    Repaka.

 3) Missing RCU barrier in mini qdisc code, from Cong Wang.

 4) Missing policy put when reusing per-cpu route entries, from Florian
    Westphal.

 5) Handle nested PCI errors properly in bnx2x driver, from Guilherme G.
    Piccoli.

 6) Run nested transport mode IPSEC packets via tasklet, from Herbert
    Xu.

 7) Fix handling poll() for stream sockets in tipc, from Parthasarathy
    Bhuvaragan.

 8) Fix two stack-out-of-bounds issues in IPSEC, from Steffen Klassert.

 9) Another zerocopy ubuf handling fix, from Willem de Bruijn.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (33 commits)
  strparser: Call sock_owned_by_user_nocheck
  sock: Add sock_owned_by_user_nocheck
  skbuff: in skb_copy_ubufs unclone before releasing zerocopy
  tipc: fix hanging poll() for stream sockets
  sctp: Replace use of sockets_allocated with specified macro.
  bnx2x: Improve reliability in case of nested PCI errors
  tg3: Enable PHY reset in MTU change path for 5720
  tg3: Add workaround to restrict 5762 MRRS to 2048
  tg3: Update copyright
  net: fec: unmap the xmit buffer that are not transferred by DMA
  tipc: fix tipc_mon_delete() oops in tipc_enable_bearer() error path
  tipc: error path leak fixes in tipc_enable_bearer()
  RDS: Check cmsg_len before dereferencing CMSG_DATA
  tcp: Avoid preprocessor directives in tracepoint macro args
  tipc: fix memory leak of group member when peer node is lost
  net: sched: fix possible null pointer deref in tcf_block_put
  tipc: base group replicast ack counter on number of actual receivers
  net_sched: fix a missing rcu barrier in mini_qdisc_pair_swap()
  net: phy: micrel: ksz9031: reconfigure autoneg after phy autoneg workaround
  ip6_gre: fix device features for ioctl setup
  ...
parents fd84b751 d5902f6d

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

+2 −2
Original line number Diff line number Diff line
@@ -3030,7 +3030,7 @@ int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode, bool keep_link) 


	del_timer_sync(&bp->timer);



	if (IS_PF(bp)) {

	if (IS_PF(bp) && !BP_NOMCP(bp)) {

		/* Set ALWAYS_ALIVE bit in shmem */

		bp->fw_drv_pulse_wr_seq |= DRV_PULSE_ALWAYS_ALIVE;

		bnx2x_drv_pulse(bp);
@@ -3116,7 +3116,7 @@ int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode, bool keep_link) 
	bp->cnic_loaded = false;



	/* Clear driver version indication in shmem */

	if (IS_PF(bp))

	if (IS_PF(bp) && !BP_NOMCP(bp))

		bnx2x_update_mng_version(bp);



	/* Check if there are pending parity attentions. If there are - set

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

+13 −1
Original line number Diff line number Diff line
@@ -9578,6 +9578,15 @@ static int bnx2x_init_shmem(struct bnx2x *bp) 


	do {

		bp->common.shmem_base = REG_RD(bp, MISC_REG_SHARED_MEM_ADDR);



		/* If we read all 0xFFs, means we are in PCI error state and

		 * should bail out to avoid crashes on adapter's FW reads.

		 */

		if (bp->common.shmem_base == 0xFFFFFFFF) {

			bp->flags |= NO_MCP_FLAG;

			return -ENODEV;

		}



		if (bp->common.shmem_base) {

			val = SHMEM_RD(bp, validity_map[BP_PORT(bp)]);

			if (val & SHR_MEM_VALIDITY_MB)
@@ -14320,7 +14329,10 @@ static pci_ers_result_t bnx2x_io_slot_reset(struct pci_dev *pdev) 
		BNX2X_ERR("IO slot reset --> driver unload\n");



		/* MCP should have been reset; Need to wait for validity */

		bnx2x_init_shmem(bp);

		if (bnx2x_init_shmem(bp)) {

			rtnl_unlock();

			return PCI_ERS_RESULT_DISCONNECT;

		}



		if (IS_PF(bp) && SHMEM2_HAS(bp, drv_capabilities_flag)) {

			u32 v;

drivers/net/ethernet/broadcom/tg3.c

+16 −3
Original line number Diff line number Diff line
@@ -4,11 +4,13 @@ 
 * Copyright (C) 2001, 2002, 2003, 2004 David S. Miller (davem@redhat.com)

 * Copyright (C) 2001, 2002, 2003 Jeff Garzik (jgarzik@pobox.com)

 * Copyright (C) 2004 Sun Microsystems Inc.

 * Copyright (C) 2005-2014 Broadcom Corporation.

 * Copyright (C) 2005-2016 Broadcom Corporation.

 * Copyright (C) 2016-2017 Broadcom Limited.

 *

 * Firmware is:

 *	Derived from proprietary unpublished source code,

 *	Copyright (C) 2000-2003 Broadcom Corporation.

 *	Copyright (C) 2000-2016 Broadcom Corporation.

 *	Copyright (C) 2016-2017 Broadcom Ltd.

 *

 *	Permission is hereby granted for the distribution of this firmware

 *	data in hexadecimal or equivalent format, provided this copyright
@@ -10052,6 +10054,16 @@ static int tg3_reset_hw(struct tg3 *tp, bool reset_phy) 


	tw32(GRC_MODE, tp->grc_mode | val);



	/* On one of the AMD platform, MRRS is restricted to 4000 because of

	 * south bridge limitation. As a workaround, Driver is setting MRRS

	 * to 2048 instead of default 4096.

	 */

	if (tp->pdev->subsystem_vendor == PCI_VENDOR_ID_DELL &&

	    tp->pdev->subsystem_device == TG3PCI_SUBDEVICE_ID_DELL_5762) {

		val = tr32(TG3PCI_DEV_STATUS_CTRL) & ~MAX_READ_REQ_MASK;

		tw32(TG3PCI_DEV_STATUS_CTRL, val | MAX_READ_REQ_SIZE_2048);

	}



	/* Setup the timer prescalar register.  Clock is always 66Mhz. */

	val = tr32(GRC_MISC_CFG);

	val &= ~0xff;
@@ -14227,7 +14239,8 @@ static int tg3_change_mtu(struct net_device *dev, int new_mtu) 
	 */

	if (tg3_asic_rev(tp) == ASIC_REV_57766 ||

	    tg3_asic_rev(tp) == ASIC_REV_5717 ||

	    tg3_asic_rev(tp) == ASIC_REV_5719)

	    tg3_asic_rev(tp) == ASIC_REV_5719 ||

	    tg3_asic_rev(tp) == ASIC_REV_5720)

		reset_phy = true;



	err = tg3_restart_hw(tp, reset_phy);

drivers/net/ethernet/broadcom/tg3.h

+6 −1
Original line number Diff line number Diff line
@@ -5,7 +5,8 @@ 
 * Copyright (C) 2001, 2002, 2003, 2004 David S. Miller (davem@redhat.com)

 * Copyright (C) 2001 Jeff Garzik (jgarzik@pobox.com)

 * Copyright (C) 2004 Sun Microsystems Inc.

 * Copyright (C) 2007-2014 Broadcom Corporation.

 * Copyright (C) 2007-2016 Broadcom Corporation.

 * Copyright (C) 2016-2017 Broadcom Limited.

 */



#ifndef _T3_H
@@ -96,6 +97,7 @@ 
#define TG3PCI_SUBDEVICE_ID_DELL_JAGUAR		0x0106

#define TG3PCI_SUBDEVICE_ID_DELL_MERLOT		0x0109

#define TG3PCI_SUBDEVICE_ID_DELL_SLIM_MERLOT	0x010a

#define TG3PCI_SUBDEVICE_ID_DELL_5762		0x07f0

#define TG3PCI_SUBVENDOR_ID_COMPAQ		PCI_VENDOR_ID_COMPAQ

#define TG3PCI_SUBDEVICE_ID_COMPAQ_BANSHEE	0x007c

#define TG3PCI_SUBDEVICE_ID_COMPAQ_BANSHEE_2	0x009a
@@ -281,6 +283,9 @@ 
#define TG3PCI_STD_RING_PROD_IDX	0x00000098 /* 64-bit */

#define TG3PCI_RCV_RET_RING_CON_IDX	0x000000a0 /* 64-bit */

/* 0xa8 --> 0xb8 unused */

#define TG3PCI_DEV_STATUS_CTRL		0x000000b4

#define  MAX_READ_REQ_SIZE_2048		 0x00004000

#define  MAX_READ_REQ_MASK		 0x00007000

#define TG3PCI_DUAL_MAC_CTRL		0x000000b8

#define  DUAL_MAC_CTRL_CH_MASK		 0x00000003

#define  DUAL_MAC_CTRL_ID		 0x00000004

drivers/net/ethernet/freescale/fec_main.c

+6 −0
Original line number Diff line number Diff line
@@ -818,6 +818,12 @@ static void fec_enet_bd_init(struct net_device *dev) 
		for (i = 0; i < txq->bd.ring_size; i++) {

			/* Initialize the BD for every fragment in the page. */

			bdp->cbd_sc = cpu_to_fec16(0);

			if (bdp->cbd_bufaddr &&

			    !IS_TSO_HEADER(txq, fec32_to_cpu(bdp->cbd_bufaddr)))

				dma_unmap_single(&fep->pdev->dev,

						 fec32_to_cpu(bdp->cbd_bufaddr),

						 fec16_to_cpu(bdp->cbd_datlen),

						 DMA_TO_DEVICE);

			if (txq->tx_skbuff[i]) {

				dev_kfree_skb_any(txq->tx_skbuff[i]);

				txq->tx_skbuff[i] = NULL;