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

Commit 41a00f79 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Merge networking fixes from David Miller:

 1) Revert Johannes Berg's genetlink locking fix, because it causes
    regressions.

    Johannes and Pravin Shelar are working on fixing things properly.

 2) Do not drop ipv6 ICMP messages without a redirected header option,
    they are legal.  From Duan Jiong.

 3) Missing error return propagation in probing of via-ircc driver.
    From Alexey Khoroshilov.

 4) Do not clear out broadcast/multicast/unicast/WOL bits in r8169 when
    initializing, from Peter Wu.

 5) realtek phy driver programs wrong interrupt status bit, from
    Giuseppe CAVALLARO.

 6) Fix statistics regression in AF_PACKET code, from Willem de Bruijn.

 7) Bridge code uses wrong bitmap length, from Toshiaki Makita.

 8) SFC driver uses wrong indexes to look up MAC filters, from Ben
    Hutchings.

 9) Don't pass stack buffers into usb control operations in hso driver,
    from Daniel Gimpelevich.

10) Multiple ipv6 fragmentation headers in one packet is illegal and
    such packets should be dropped, from Hannes Frederic Sowa.

11) When TCP sockets are "repaired" as part of checkpoint/restart, the
    timestamp field of SKBs need to be refreshed otherwise RTOs can be
    wildly off.  From Andrey Vagin.

12) Fix memcpy args (uses 'address of pointer' instead of 'pointer') in
    hostp driver.  From Dan Carpenter.

13) nl80211hdr_put() doesn't return an ERR_PTR, but some code believes
    it does.  From Dan Carpenter.

14) Fix regression in wireless SME disconnects, from Johannes Berg.

15) Don't use a stack buffer for DMA in zd1201 USB wireless driver, from
    Jussi Kivilinna.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (33 commits)
  ipv4: expose IPV4_DEVCONF
  ipv6: handle Redirect ICMP Message with no Redirected Header option
  be2net: fix disabling TX in be_close()
  Revert "genetlink: fix family dump race"
  hso: Fix stack corruption on some architectures
  hso: Earlier catch of error condition
  sfc: Fix lookup of default RX MAC filters when steered using ethtool
  bridge: Use the correct bit length for bitmap functions in the VLAN code
  packet: restore packet statistics tp_packets to include drops
  net: phy: rtl8211: fix interrupt on status link change
  r8169: remember WOL preferences on driver load
  via-ircc: don't return zero if via_ircc_open() failed
  macvtap: Ignore tap features when VNET_HDR is off
  macvtap: Correctly set tap features when IFF_VNET_HDR is disabled.
  macvtap: simplify usage of tap_features
  tcp: set timestamps for restored skb-s
  bnx2x: set VF DMAE when first function has 0 supported VFs
  bnx2x: Protect against VFs' ndos when SR-IOV is disabled
  bnx2x: prevent VF benign attentions
  bnx2x: Consider DCBX remote error
  ...
parents 3db0d4de 4a5a8aa6

drivers/net/ethernet/broadcom/bnx2x/bnx2x.h

+2 −0
Original line number Diff line number Diff line
@@ -1333,6 +1333,8 @@ enum { 
	BNX2X_SP_RTNL_VFPF_CHANNEL_DOWN,

	BNX2X_SP_RTNL_VFPF_STORM_RX_MODE,

	BNX2X_SP_RTNL_HYPERVISOR_VLAN,

	BNX2X_SP_RTNL_TX_STOP,

	BNX2X_SP_RTNL_TX_RESUME,

};



struct bnx2x_prev_path_list {

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

+38 −11
Original line number Diff line number Diff line
@@ -30,10 +30,8 @@ 
#include "bnx2x_dcb.h"



/* forward declarations of dcbx related functions */

static int bnx2x_dcbx_stop_hw_tx(struct bnx2x *bp);

static void bnx2x_pfc_set_pfc(struct bnx2x *bp);

static void bnx2x_dcbx_update_ets_params(struct bnx2x *bp);

static int bnx2x_dcbx_resume_hw_tx(struct bnx2x *bp);

static void bnx2x_dcbx_get_ets_pri_pg_tbl(struct bnx2x *bp,

					  u32 *set_configuration_ets_pg,

					  u32 *pri_pg_tbl);
@@ -425,30 +423,52 @@ static void bnx2x_pfc_set_pfc(struct bnx2x *bp) 
		bnx2x_pfc_clear(bp);

}



static int bnx2x_dcbx_stop_hw_tx(struct bnx2x *bp)

int bnx2x_dcbx_stop_hw_tx(struct bnx2x *bp)

{

	struct bnx2x_func_state_params func_params = {NULL};

	int rc;



	func_params.f_obj = &bp->func_obj;

	func_params.cmd = BNX2X_F_CMD_TX_STOP;



	__set_bit(RAMROD_COMP_WAIT, &func_params.ramrod_flags);

	__set_bit(RAMROD_RETRY, &func_params.ramrod_flags);



	DP(BNX2X_MSG_DCB, "STOP TRAFFIC\n");

	return bnx2x_func_state_change(bp, &func_params);



	rc = bnx2x_func_state_change(bp, &func_params);

	if (rc) {

		BNX2X_ERR("Unable to hold traffic for HW configuration\n");

		bnx2x_panic();

	}



static int bnx2x_dcbx_resume_hw_tx(struct bnx2x *bp)

	return rc;

}



int bnx2x_dcbx_resume_hw_tx(struct bnx2x *bp)

{

	struct bnx2x_func_state_params func_params = {NULL};

	struct bnx2x_func_tx_start_params *tx_params =

		&func_params.params.tx_start;

	int rc;



	func_params.f_obj = &bp->func_obj;

	func_params.cmd = BNX2X_F_CMD_TX_START;



	__set_bit(RAMROD_COMP_WAIT, &func_params.ramrod_flags);

	__set_bit(RAMROD_RETRY, &func_params.ramrod_flags);



	bnx2x_dcbx_fw_struct(bp, tx_params);



	DP(BNX2X_MSG_DCB, "START TRAFFIC\n");

	return bnx2x_func_state_change(bp, &func_params);



	rc = bnx2x_func_state_change(bp, &func_params);

	if (rc) {

		BNX2X_ERR("Unable to resume traffic after HW configuration\n");

		bnx2x_panic();

	}



	return rc;

}



static void bnx2x_dcbx_2cos_limit_update_ets_config(struct bnx2x *bp)
@@ -744,7 +764,9 @@ void bnx2x_dcbx_set_params(struct bnx2x *bp, u32 state) 
			if (IS_MF(bp))

				bnx2x_link_sync_notify(bp);



			bnx2x_dcbx_stop_hw_tx(bp);

			set_bit(BNX2X_SP_RTNL_TX_STOP, &bp->sp_rtnl_state);



			schedule_delayed_work(&bp->sp_rtnl_task, 0);



			return;

		}
@@ -757,7 +779,9 @@ void bnx2x_dcbx_set_params(struct bnx2x *bp, u32 state) 
		/* ets may affect cmng configuration: reinit it in hw */

		bnx2x_set_local_cmng(bp);



		bnx2x_dcbx_resume_hw_tx(bp);

		set_bit(BNX2X_SP_RTNL_TX_RESUME, &bp->sp_rtnl_state);



		schedule_delayed_work(&bp->sp_rtnl_task, 0);



		return;

	case BNX2X_DCBX_STATE_TX_RELEASED:
@@ -2367,21 +2391,24 @@ static u8 bnx2x_dcbnl_get_featcfg(struct net_device *netdev, int featid, 
		case DCB_FEATCFG_ATTR_PG:

			if (bp->dcbx_local_feat.ets.enabled)

				*flags |= DCB_FEATCFG_ENABLE;

			if (bp->dcbx_error & DCBX_LOCAL_ETS_ERROR)

			if (bp->dcbx_error & (DCBX_LOCAL_ETS_ERROR |

					      DCBX_REMOTE_MIB_ERROR))

				*flags |= DCB_FEATCFG_ERROR;

			break;

		case DCB_FEATCFG_ATTR_PFC:

			if (bp->dcbx_local_feat.pfc.enabled)

				*flags |= DCB_FEATCFG_ENABLE;

			if (bp->dcbx_error & (DCBX_LOCAL_PFC_ERROR |

			    DCBX_LOCAL_PFC_MISMATCH))

					      DCBX_LOCAL_PFC_MISMATCH |

					      DCBX_REMOTE_MIB_ERROR))

				*flags |= DCB_FEATCFG_ERROR;

			break;

		case DCB_FEATCFG_ATTR_APP:

			if (bp->dcbx_local_feat.app.enabled)

				*flags |= DCB_FEATCFG_ENABLE;

			if (bp->dcbx_error & (DCBX_LOCAL_APP_ERROR |

			    DCBX_LOCAL_APP_MISMATCH))

					      DCBX_LOCAL_APP_MISMATCH |

					      DCBX_REMOTE_MIB_ERROR))

				*flags |= DCB_FEATCFG_ERROR;

			break;

		default:

drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h

+3 −0
Original line number Diff line number Diff line
@@ -199,4 +199,7 @@ extern const struct dcbnl_rtnl_ops bnx2x_dcbnl_ops; 
int bnx2x_dcbnl_update_applist(struct bnx2x *bp, bool delall);

#endif /* BCM_DCBNL */



int bnx2x_dcbx_stop_hw_tx(struct bnx2x *bp);

int bnx2x_dcbx_resume_hw_tx(struct bnx2x *bp);



#endif /* BNX2X_DCB_H */

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

+32 −13
Original line number Diff line number Diff line
@@ -2261,6 +2261,23 @@ static void bnx2x_set_requested_fc(struct bnx2x *bp) 
		bp->link_params.req_fc_auto_adv = BNX2X_FLOW_CTRL_BOTH;

}



static void bnx2x_init_dropless_fc(struct bnx2x *bp)

{

	u32 pause_enabled = 0;



	if (!CHIP_IS_E1(bp) && bp->dropless_fc && bp->link_vars.link_up) {

		if (bp->link_vars.flow_ctrl & BNX2X_FLOW_CTRL_TX)

			pause_enabled = 1;



		REG_WR(bp, BAR_USTRORM_INTMEM +

			   USTORM_ETH_PAUSE_ENABLED_OFFSET(BP_PORT(bp)),

		       pause_enabled);

	}



	DP(NETIF_MSG_IFUP | NETIF_MSG_LINK, "dropless_fc is %s\n",

	   pause_enabled ? "enabled" : "disabled");

}



int bnx2x_initial_phy_init(struct bnx2x *bp, int load_mode)

{

	int rc, cfx_idx = bnx2x_get_link_cfg_idx(bp);
@@ -2294,6 +2311,8 @@ int bnx2x_initial_phy_init(struct bnx2x *bp, int load_mode) 


		bnx2x_release_phy_lock(bp);



		bnx2x_init_dropless_fc(bp);



		bnx2x_calc_fc_adv(bp);



		if (bp->link_vars.link_up) {
@@ -2315,6 +2334,8 @@ void bnx2x_link_set(struct bnx2x *bp) 
		bnx2x_phy_init(&bp->link_params, &bp->link_vars);

		bnx2x_release_phy_lock(bp);



		bnx2x_init_dropless_fc(bp);



		bnx2x_calc_fc_adv(bp);

	} else

		BNX2X_ERR("Bootcode is missing - can not set link\n");
@@ -2556,20 +2577,9 @@ static void bnx2x_link_attn(struct bnx2x *bp) 


	bnx2x_link_update(&bp->link_params, &bp->link_vars);



	if (bp->link_vars.link_up) {



		/* dropless flow control */

		if (!CHIP_IS_E1(bp) && bp->dropless_fc) {

			int port = BP_PORT(bp);

			u32 pause_enabled = 0;



			if (bp->link_vars.flow_ctrl & BNX2X_FLOW_CTRL_TX)

				pause_enabled = 1;

	bnx2x_init_dropless_fc(bp);



			REG_WR(bp, BAR_USTRORM_INTMEM +

			       USTORM_ETH_PAUSE_ENABLED_OFFSET(port),

			       pause_enabled);

		}

	if (bp->link_vars.link_up) {



		if (bp->link_vars.mac_type != MAC_TYPE_EMAC) {

			struct host_port_stats *pstats;
@@ -9645,6 +9655,12 @@ sp_rtnl_not_reset: 
			       &bp->sp_rtnl_state))

		bnx2x_pf_set_vfs_vlan(bp);



	if (test_and_clear_bit(BNX2X_SP_RTNL_TX_STOP, &bp->sp_rtnl_state))

		bnx2x_dcbx_stop_hw_tx(bp);



	if (test_and_clear_bit(BNX2X_SP_RTNL_TX_RESUME, &bp->sp_rtnl_state))

		bnx2x_dcbx_resume_hw_tx(bp);



	/* work which needs rtnl lock not-taken (as it takes the lock itself and

	 * can be called from other contexts as well)

	 */
@@ -11147,6 +11163,9 @@ static bool bnx2x_get_dropless_info(struct bnx2x *bp) 
	int tmp;

	u32 cfg;



	if (IS_VF(bp))

		return 0;



	if (IS_MF(bp) && !CHIP_IS_E1x(bp)) {

		/* Take function: tmp = func */

		tmp = BP_ABS_FUNC(bp);

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

+33 −23
Original line number Diff line number Diff line
@@ -1747,10 +1747,7 @@ void bnx2x_iov_init_dq(struct bnx2x *bp) 


void bnx2x_iov_init_dmae(struct bnx2x *bp)

{

	DP(BNX2X_MSG_IOV, "SRIOV is %s\n", IS_SRIOV(bp) ? "ON" : "OFF");

	if (!IS_SRIOV(bp))

		return;



	if (pci_find_ext_capability(bp->pdev, PCI_EXT_CAP_ID_SRIOV))

		REG_WR(bp, DMAE_REG_BACKWARD_COMP_EN, 0);

}
@@ -3084,8 +3081,9 @@ void bnx2x_disable_sriov(struct bnx2x *bp) 
	pci_disable_sriov(bp->pdev);

}



static int bnx2x_vf_ndo_sanity(struct bnx2x *bp, int vfidx,

			       struct bnx2x_virtf *vf)

static int bnx2x_vf_ndo_prep(struct bnx2x *bp, int vfidx,

			     struct bnx2x_virtf **vf,

			     struct pf_vf_bulletin_content **bulletin)

{

	if (bp->state != BNX2X_STATE_OPEN) {

		BNX2X_ERR("vf ndo called though PF is down\n");
@@ -3103,12 +3101,22 @@ static int bnx2x_vf_ndo_sanity(struct bnx2x *bp, int vfidx, 
		return -EINVAL;

	}



	if (!vf) {

	/* init members */

	*vf = BP_VF(bp, vfidx);

	*bulletin = BP_VF_BULLETIN(bp, vfidx);



	if (!*vf) {

		BNX2X_ERR("vf ndo called but vf was null. vfidx was %d\n",

			  vfidx);

		return -EINVAL;

	}



	if (!*bulletin) {

		BNX2X_ERR("vf ndo called but Bulletin Board struct is null. vfidx was %d\n",

			  vfidx);

		return -EINVAL;

	}



	return 0;

}
@@ -3116,17 +3124,19 @@ int bnx2x_get_vf_config(struct net_device *dev, int vfidx, 
			struct ifla_vf_info *ivi)

{

	struct bnx2x *bp = netdev_priv(dev);

	struct bnx2x_virtf *vf = BP_VF(bp, vfidx);

	struct bnx2x_vlan_mac_obj *mac_obj = &bnx2x_vfq(vf, 0, mac_obj);

	struct bnx2x_vlan_mac_obj *vlan_obj = &bnx2x_vfq(vf, 0, vlan_obj);

	struct pf_vf_bulletin_content *bulletin = BP_VF_BULLETIN(bp, vfidx);

	struct bnx2x_virtf *vf = NULL;

	struct pf_vf_bulletin_content *bulletin = NULL;

	struct bnx2x_vlan_mac_obj *mac_obj;

	struct bnx2x_vlan_mac_obj *vlan_obj;

	int rc;



	/* sanity */

	rc = bnx2x_vf_ndo_sanity(bp, vfidx, vf);

	/* sanity and init */

	rc = bnx2x_vf_ndo_prep(bp, vfidx, &vf, &bulletin);

	if (rc)

		return rc;

	if (!mac_obj || !vlan_obj || !bulletin) {

	mac_obj = &bnx2x_vfq(vf, 0, mac_obj);

	vlan_obj = &bnx2x_vfq(vf, 0, vlan_obj);

	if (!mac_obj || !vlan_obj) {

		BNX2X_ERR("VF partially initialized\n");

		return -EINVAL;

	}
@@ -3183,11 +3193,11 @@ int bnx2x_set_vf_mac(struct net_device *dev, int vfidx, u8 *mac) 
{

	struct bnx2x *bp = netdev_priv(dev);

	int rc, q_logical_state;

	struct bnx2x_virtf *vf = BP_VF(bp, vfidx);

	struct pf_vf_bulletin_content *bulletin = BP_VF_BULLETIN(bp, vfidx);

	struct bnx2x_virtf *vf = NULL;

	struct pf_vf_bulletin_content *bulletin = NULL;



	/* sanity */

	rc = bnx2x_vf_ndo_sanity(bp, vfidx, vf);

	/* sanity and init */

	rc = bnx2x_vf_ndo_prep(bp, vfidx, &vf, &bulletin);

	if (rc)

		return rc;

	if (!is_valid_ether_addr(mac)) {
@@ -3249,11 +3259,11 @@ int bnx2x_set_vf_vlan(struct net_device *dev, int vfidx, u16 vlan, u8 qos) 
{

	struct bnx2x *bp = netdev_priv(dev);

	int rc, q_logical_state;

	struct bnx2x_virtf *vf = BP_VF(bp, vfidx);

	struct pf_vf_bulletin_content *bulletin = BP_VF_BULLETIN(bp, vfidx);

	struct bnx2x_virtf *vf = NULL;

	struct pf_vf_bulletin_content *bulletin = NULL;



	/* sanity */

	rc = bnx2x_vf_ndo_sanity(bp, vfidx, vf);

	/* sanity and init */

	rc = bnx2x_vf_ndo_prep(bp, vfidx, &vf, &bulletin);

	if (rc)

		return rc;