Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue (fe218823) · Commits · e / devices / android_kernel_sony_msm8998

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

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -442,6 +442,8 @@ struct i40e_veb {
	bool stat_offsets_loaded;		bool stat_offsets_loaded;
	struct i40e_eth_stats stats;		struct i40e_eth_stats stats;
	struct i40e_eth_stats stats_offsets;		struct i40e_eth_stats stats_offsets;
			struct i40e_veb_tc_stats tc_stats;
			struct i40e_veb_tc_stats tc_stats_offsets;
	};		};

	/* struct that defines a VSI, associated with a dev */		/* struct that defines a VSI, associated with a dev */

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

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -588,6 +588,8 @@ i40e_status i40e_get_dcb_config(struct i40e_hw *hw)
	if (!ret) {		if (!ret) {
	/* CEE mode */		/* CEE mode */
	hw->local_dcbx_config.dcbx_mode = I40E_DCBX_MODE_CEE;		hw->local_dcbx_config.dcbx_mode = I40E_DCBX_MODE_CEE;
			hw->local_dcbx_config.tlv_status =
			le16_to_cpu(cee_v1_cfg.tlv_status);
	i40e_cee_to_dcb_v1_config(&cee_v1_cfg,		i40e_cee_to_dcb_v1_config(&cee_v1_cfg,
	&hw->local_dcbx_config);		&hw->local_dcbx_config);
	}		}
	@@ -597,6 +599,8 @@ i40e_status i40e_get_dcb_config(struct i40e_hw *hw)
	if (!ret) {		if (!ret) {
	/* CEE mode */		/* CEE mode */
	hw->local_dcbx_config.dcbx_mode = I40E_DCBX_MODE_CEE;		hw->local_dcbx_config.dcbx_mode = I40E_DCBX_MODE_CEE;
			hw->local_dcbx_config.tlv_status =
			le32_to_cpu(cee_cfg.tlv_status);
	i40e_cee_to_dcb_config(&cee_cfg,		i40e_cee_to_dcb_config(&cee_cfg,
	&hw->local_dcbx_config);		&hw->local_dcbx_config);
	}		}

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

+46 −8

Original line number	Original line	Diff line number	Diff line
	@@ -114,7 +114,7 @@ static struct i40e_stats i40e_gstrings_stats[] = {
	I40E_PF_STAT("tx_errors", stats.eth.tx_errors),		I40E_PF_STAT("tx_errors", stats.eth.tx_errors),
	I40E_PF_STAT("rx_dropped", stats.eth.rx_discards),		I40E_PF_STAT("rx_dropped", stats.eth.rx_discards),
	I40E_PF_STAT("tx_dropped_link_down", stats.tx_dropped_link_down),		I40E_PF_STAT("tx_dropped_link_down", stats.tx_dropped_link_down),
	I40E_PF_STAT("crc_errors", stats.crc_errors),		I40E_PF_STAT("rx_crc_errors", stats.crc_errors),
	I40E_PF_STAT("illegal_bytes", stats.illegal_bytes),		I40E_PF_STAT("illegal_bytes", stats.illegal_bytes),
	I40E_PF_STAT("mac_local_faults", stats.mac_local_faults),		I40E_PF_STAT("mac_local_faults", stats.mac_local_faults),
	I40E_PF_STAT("mac_remote_faults", stats.mac_remote_faults),		I40E_PF_STAT("mac_remote_faults", stats.mac_remote_faults),
	@@ -197,7 +197,14 @@ static const struct i40e_stats i40e_gstrings_fcoe_stats[] = {
	FIELD_SIZEOF(struct i40e_pf, stats.priority_xon_tx) + \		FIELD_SIZEOF(struct i40e_pf, stats.priority_xon_tx) + \
	FIELD_SIZEOF(struct i40e_pf, stats.priority_xon_2_xoff)) \		FIELD_SIZEOF(struct i40e_pf, stats.priority_xon_2_xoff)) \
	/ sizeof(u64))		/ sizeof(u64))
			#define I40E_VEB_TC_STATS_LEN ( \
			(FIELD_SIZEOF(struct i40e_veb, tc_stats.tc_rx_packets) + \
			FIELD_SIZEOF(struct i40e_veb, tc_stats.tc_rx_bytes) + \
			FIELD_SIZEOF(struct i40e_veb, tc_stats.tc_tx_packets) + \
			FIELD_SIZEOF(struct i40e_veb, tc_stats.tc_tx_bytes)) \
			/ sizeof(u64))
	#define I40E_VEB_STATS_LEN ARRAY_SIZE(i40e_gstrings_veb_stats)		#define I40E_VEB_STATS_LEN ARRAY_SIZE(i40e_gstrings_veb_stats)
			#define I40E_VEB_STATS_TOTAL (I40E_VEB_STATS_LEN + I40E_VEB_TC_STATS_LEN)
	#define I40E_PF_STATS_LEN(n) (I40E_GLOBAL_STATS_LEN + \		#define I40E_PF_STATS_LEN(n) (I40E_GLOBAL_STATS_LEN + \
	I40E_PFC_STATS_LEN + \		I40E_PFC_STATS_LEN + \
	I40E_VSI_STATS_LEN((n)))		I40E_VSI_STATS_LEN((n)))
	@@ -1257,7 +1264,7 @@ static int i40e_get_sset_count(struct net_device *netdev, int sset)
	int len = I40E_PF_STATS_LEN(netdev);		int len = I40E_PF_STATS_LEN(netdev);

	if (pf->lan_veb != I40E_NO_VEB)		if (pf->lan_veb != I40E_NO_VEB)
	len += I40E_VEB_STATS_LEN;		len += I40E_VEB_STATS_TOTAL;
	return len;		return len;
	} else {		} else {
	return I40E_VSI_STATS_LEN(netdev);		return I40E_VSI_STATS_LEN(netdev);
	@@ -1408,6 +1415,20 @@ static void i40e_get_strings(struct net_device *netdev, u32 stringset,
	i40e_gstrings_veb_stats[i].stat_string);		i40e_gstrings_veb_stats[i].stat_string);
	p += ETH_GSTRING_LEN;		p += ETH_GSTRING_LEN;
	}		}
			for (i = 0; i < I40E_MAX_TRAFFIC_CLASS; i++) {
			snprintf(p, ETH_GSTRING_LEN,
			"veb.tc_%u_tx_packets", i);
			p += ETH_GSTRING_LEN;
			snprintf(p, ETH_GSTRING_LEN,
			"veb.tc_%u_tx_bytes", i);
			p += ETH_GSTRING_LEN;
			snprintf(p, ETH_GSTRING_LEN,
			"veb.tc_%u_rx_packets", i);
			p += ETH_GSTRING_LEN;
			snprintf(p, ETH_GSTRING_LEN,
			"veb.tc_%u_rx_bytes", i);
			p += ETH_GSTRING_LEN;
			}
	}		}
	for (i = 0; i < I40E_GLOBAL_STATS_LEN; i++) {		for (i = 0; i < I40E_GLOBAL_STATS_LEN; i++) {
	snprintf(p, ETH_GSTRING_LEN, "port.%s",		snprintf(p, ETH_GSTRING_LEN, "port.%s",
	@@ -1559,6 +1580,21 @@ static inline bool i40e_active_vfs(struct i40e_pf *pf)
	return false;		return false;
	}		}

			static inline bool i40e_active_vmdqs(struct i40e_pf *pf)
			{
			struct i40e_vsi **vsi = pf->vsi;
			int i;

			for (i = 0; i < pf->num_alloc_vsi; i++) {
			if (!vsi[i])
			continue;
			if (vsi[i]->type == I40E_VSI_VMDQ2)
			return true;
			}

			return false;
			}

	static void i40e_diag_test(struct net_device *netdev,		static void i40e_diag_test(struct net_device *netdev,
	struct ethtool_test eth_test, u64 data)		struct ethtool_test eth_test, u64 data)
	{		{
	@@ -1572,9 +1608,9 @@ static void i40e_diag_test(struct net_device *netdev,

	set_bit(__I40E_TESTING, &pf->state);		set_bit(__I40E_TESTING, &pf->state);

	if (i40e_active_vfs(pf)) {		if (i40e_active_vfs(pf) \|\| i40e_active_vmdqs(pf)) {
	dev_warn(&pf->pdev->dev,		dev_warn(&pf->pdev->dev,
	"Please take active VFS offline and restart the adapter before running NIC diagnostics\n");		"Please take active VFs and Netqueues offline and restart the adapter before running NIC diagnostics\n");
	data[I40E_ETH_TEST_REG] = 1;		data[I40E_ETH_TEST_REG] = 1;
	data[I40E_ETH_TEST_EEPROM] = 1;		data[I40E_ETH_TEST_EEPROM] = 1;
	data[I40E_ETH_TEST_INTR] = 1;		data[I40E_ETH_TEST_INTR] = 1;
	@@ -1590,11 +1626,13 @@ static void i40e_diag_test(struct net_device *netdev,
	/* indicate we're in test mode */		/* indicate we're in test mode */
	dev_close(netdev);		dev_close(netdev);
	else		else
			/* This reset does not affect link - if it is
			* changed to a type of reset that does affect
			* link then the following link test would have
			* to be moved to before the reset
			*/
	i40e_do_reset(pf, BIT(__I40E_PF_RESET_REQUESTED));		i40e_do_reset(pf, BIT(__I40E_PF_RESET_REQUESTED));

	/* Link test performed before hardware reset
	* so autoneg doesn't interfere with test result
	*/
	if (i40e_link_test(netdev, &data[I40E_ETH_TEST_LINK]))		if (i40e_link_test(netdev, &data[I40E_ETH_TEST_LINK]))
	eth_test->flags \|= ETH_TEST_FL_FAILED;		eth_test->flags \|= ETH_TEST_FL_FAILED;

	@@ -2508,7 +2546,7 @@ static int i40e_get_rxfh(struct net_device netdev, u32 indir, u8 *key,
	* @indir: indirection table		* @indir: indirection table
	* @key: hash key		* @key: hash key
	*		*
	* Returns -EINVAL if the table specifies an inavlid queue id, otherwise		* Returns -EINVAL if the table specifies an invalid queue id, otherwise
	* returns 0 after programming the table.		* returns 0 after programming the table.
	**/		**/
	static int i40e_set_rxfh(struct net_device netdev, const u32 indir,		static int i40e_set_rxfh(struct net_device netdev, const u32 indir,

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

+55 −11

Original line number	Original line	Diff line number	Diff line
	@@ -39,7 +39,7 @@ static const char i40e_driver_string[] =

	#define DRV_VERSION_MAJOR 1		#define DRV_VERSION_MAJOR 1
	#define DRV_VERSION_MINOR 3		#define DRV_VERSION_MINOR 3
	#define DRV_VERSION_BUILD 6		#define DRV_VERSION_BUILD 9
	#define DRV_VERSION __stringify(DRV_VERSION_MAJOR) "." \		#define DRV_VERSION __stringify(DRV_VERSION_MAJOR) "." \
	__stringify(DRV_VERSION_MINOR) "." \		__stringify(DRV_VERSION_MINOR) "." \
	__stringify(DRV_VERSION_BUILD) DRV_KERN		__stringify(DRV_VERSION_BUILD) DRV_KERN
	@@ -624,11 +624,15 @@ static void i40e_update_veb_stats(struct i40e_veb *veb)
	struct i40e_hw *hw = &pf->hw;		struct i40e_hw *hw = &pf->hw;
	struct i40e_eth_stats *oes;		struct i40e_eth_stats *oes;
	struct i40e_eth_stats es; / device's eth stats */		struct i40e_eth_stats es; / device's eth stats */
	int idx = 0;		struct i40e_veb_tc_stats *veb_oes;
			struct i40e_veb_tc_stats *veb_es;
			int i, idx = 0;

	idx = veb->stats_idx;		idx = veb->stats_idx;
	es = &veb->stats;		es = &veb->stats;
	oes = &veb->stats_offsets;		oes = &veb->stats_offsets;
			veb_es = &veb->tc_stats;
			veb_oes = &veb->tc_stats_offsets;

	/* Gather up the stats that the hw collects */		/* Gather up the stats that the hw collects */
	i40e_stat_update32(hw, I40E_GLSW_TDPC(idx),		i40e_stat_update32(hw, I40E_GLSW_TDPC(idx),
	@@ -664,6 +668,28 @@ static void i40e_update_veb_stats(struct i40e_veb *veb)
	i40e_stat_update48(hw, I40E_GLSW_BPTCH(idx), I40E_GLSW_BPTCL(idx),		i40e_stat_update48(hw, I40E_GLSW_BPTCH(idx), I40E_GLSW_BPTCL(idx),
	veb->stat_offsets_loaded,		veb->stat_offsets_loaded,
	&oes->tx_broadcast, &es->tx_broadcast);		&oes->tx_broadcast, &es->tx_broadcast);
			for (i = 0; i < I40E_MAX_TRAFFIC_CLASS; i++) {
			i40e_stat_update48(hw, I40E_GLVEBTC_RPCH(i, idx),
			I40E_GLVEBTC_RPCL(i, idx),
			veb->stat_offsets_loaded,
			&veb_oes->tc_rx_packets[i],
			&veb_es->tc_rx_packets[i]);
			i40e_stat_update48(hw, I40E_GLVEBTC_RBCH(i, idx),
			I40E_GLVEBTC_RBCL(i, idx),
			veb->stat_offsets_loaded,
			&veb_oes->tc_rx_bytes[i],
			&veb_es->tc_rx_bytes[i]);
			i40e_stat_update48(hw, I40E_GLVEBTC_TPCH(i, idx),
			I40E_GLVEBTC_TPCL(i, idx),
			veb->stat_offsets_loaded,
			&veb_oes->tc_tx_packets[i],
			&veb_es->tc_tx_packets[i]);
			i40e_stat_update48(hw, I40E_GLVEBTC_TBCH(i, idx),
			I40E_GLVEBTC_TBCL(i, idx),
			veb->stat_offsets_loaded,
			&veb_oes->tc_tx_bytes[i],
			&veb_es->tc_tx_bytes[i]);
			}
	veb->stat_offsets_loaded = true;		veb->stat_offsets_loaded = true;
	}		}

	@@ -1255,6 +1281,8 @@ struct i40e_mac_filter i40e_put_mac_in_vlan(struct i40e_vsi vsi, u8 *macaddr,
	struct i40e_mac_filter *f;		struct i40e_mac_filter *f;

	list_for_each_entry(f, &vsi->mac_filter_list, list) {		list_for_each_entry(f, &vsi->mac_filter_list, list) {
			if (vsi->info.pvid)
			f->vlan = le16_to_cpu(vsi->info.pvid);
	if (!i40e_find_filter(vsi, macaddr, f->vlan,		if (!i40e_find_filter(vsi, macaddr, f->vlan,
	is_vf, is_netdev)) {		is_vf, is_netdev)) {
	if (!i40e_add_filter(vsi, macaddr, f->vlan,		if (!i40e_add_filter(vsi, macaddr, f->vlan,
	@@ -1548,7 +1576,10 @@ static void i40e_vsi_setup_queue_map(struct i40e_vsi *vsi,
	* vectors available and so we need to lower the used		* vectors available and so we need to lower the used
	* q count.		* q count.
	*/		*/
			if (pf->flags & I40E_FLAG_MSIX_ENABLED)
	qcount = min_t(int, vsi->alloc_queue_pairs, pf->num_lan_msix);		qcount = min_t(int, vsi->alloc_queue_pairs, pf->num_lan_msix);
			else
			qcount = vsi->alloc_queue_pairs;
	num_tc_qps = qcount / numtc;		num_tc_qps = qcount / numtc;
	num_tc_qps = min_t(int, num_tc_qps, i40e_pf_get_max_q_per_tc(pf));		num_tc_qps = min_t(int, num_tc_qps, i40e_pf_get_max_q_per_tc(pf));

	@@ -1612,7 +1643,7 @@ static void i40e_vsi_setup_queue_map(struct i40e_vsi *vsi,
	if ((vsi->type == I40E_VSI_MAIN) && (numtc == 1)) {		if ((vsi->type == I40E_VSI_MAIN) && (numtc == 1)) {
	if (vsi->req_queue_pairs > 0)		if (vsi->req_queue_pairs > 0)
	vsi->num_queue_pairs = vsi->req_queue_pairs;		vsi->num_queue_pairs = vsi->req_queue_pairs;
	else		else if (pf->flags & I40E_FLAG_MSIX_ENABLED)
	vsi->num_queue_pairs = pf->num_lan_msix;		vsi->num_queue_pairs = pf->num_lan_msix;
	}		}

	@@ -3414,7 +3445,7 @@ static irqreturn_t i40e_fdir_clean_ring(int irq, void *data)
	* @v_idx: vector index		* @v_idx: vector index
	* @qp_idx: queue pair index		* @qp_idx: queue pair index
	**/		**/
	static void map_vector_to_qp(struct i40e_vsi *vsi, int v_idx, int qp_idx)		static void i40e_map_vector_to_qp(struct i40e_vsi *vsi, int v_idx, int qp_idx)
	{		{
	struct i40e_q_vector *q_vector = vsi->q_vectors[v_idx];		struct i40e_q_vector *q_vector = vsi->q_vectors[v_idx];
	struct i40e_ring *tx_ring = vsi->tx_rings[qp_idx];		struct i40e_ring *tx_ring = vsi->tx_rings[qp_idx];
	@@ -3468,7 +3499,7 @@ static void i40e_vsi_map_rings_to_vectors(struct i40e_vsi *vsi)
	q_vector->tx.ring = NULL;		q_vector->tx.ring = NULL;

	while (num_ringpairs--) {		while (num_ringpairs--) {
	map_vector_to_qp(vsi, v_start, qp_idx);		i40e_map_vector_to_qp(vsi, v_start, qp_idx);
	qp_idx++;		qp_idx++;
	qp_remaining--;		qp_remaining--;
	}		}
	@@ -8037,8 +8068,6 @@ static void i40e_add_vxlan_port(struct net_device *netdev,
	pf->vxlan_ports[next_idx] = port;		pf->vxlan_ports[next_idx] = port;
	pf->pending_vxlan_bitmap \|= BIT_ULL(next_idx);		pf->pending_vxlan_bitmap \|= BIT_ULL(next_idx);
	pf->flags \|= I40E_FLAG_VXLAN_FILTER_SYNC;		pf->flags \|= I40E_FLAG_VXLAN_FILTER_SYNC;

	dev_info(&pf->pdev->dev, "adding vxlan port %d\n", ntohs(port));
	}		}

	/**		/**
	@@ -8796,6 +8825,11 @@ static int i40e_vsi_setup_vectors(struct i40e_vsi *vsi)
	goto vector_setup_out;		goto vector_setup_out;
	}		}

			/* In Legacy mode, we do not have to get any other vector since we
			* piggyback on the misc/ICR0 for queue interrupts.
			*/
			if (!(pf->flags & I40E_FLAG_MSIX_ENABLED))
			return ret;
	if (vsi->num_q_vectors)		if (vsi->num_q_vectors)
	vsi->base_vector = i40e_get_lump(pf, pf->irq_pile,		vsi->base_vector = i40e_get_lump(pf, pf->irq_pile,
	vsi->num_q_vectors, vsi->idx);		vsi->num_q_vectors, vsi->idx);
	@@ -10448,6 +10482,19 @@ static void i40e_shutdown(struct pci_dev *pdev)
	wr32(hw, I40E_PFPM_APM, (pf->wol_en ? I40E_PFPM_APM_APME_MASK : 0));		wr32(hw, I40E_PFPM_APM, (pf->wol_en ? I40E_PFPM_APM_APME_MASK : 0));
	wr32(hw, I40E_PFPM_WUFC, (pf->wol_en ? I40E_PFPM_WUFC_MAG_MASK : 0));		wr32(hw, I40E_PFPM_WUFC, (pf->wol_en ? I40E_PFPM_WUFC_MAG_MASK : 0));

			del_timer_sync(&pf->service_timer);
			cancel_work_sync(&pf->service_task);
			i40e_fdir_teardown(pf);

			rtnl_lock();
			i40e_prep_for_reset(pf);
			rtnl_unlock();

			wr32(hw, I40E_PFPM_APM,
			(pf->wol_en ? I40E_PFPM_APM_APME_MASK : 0));
			wr32(hw, I40E_PFPM_WUFC,
			(pf->wol_en ? I40E_PFPM_WUFC_MAG_MASK : 0));

	i40e_clear_interrupt_scheme(pf);		i40e_clear_interrupt_scheme(pf);

	if (system_state == SYSTEM_POWER_OFF) {		if (system_state == SYSTEM_POWER_OFF) {
	@@ -10468,9 +10515,6 @@ static int i40e_suspend(struct pci_dev *pdev, pm_message_t state)

	set_bit(__I40E_SUSPENDED, &pf->state);		set_bit(__I40E_SUSPENDED, &pf->state);
	set_bit(__I40E_DOWN, &pf->state);		set_bit(__I40E_DOWN, &pf->state);
	del_timer_sync(&pf->service_timer);
	cancel_work_sync(&pf->service_task);
	i40e_fdir_teardown(pf);

	rtnl_lock();		rtnl_lock();
	i40e_prep_for_reset(pf);		i40e_prep_for_reset(pf);

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

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -873,6 +873,13 @@
	#define I40E_PFINT_CEQCTL_CAUSE_ENA_MASK I40E_MASK(0x1, I40E_PFINT_CEQCTL_CAUSE_ENA_SHIFT)		#define I40E_PFINT_CEQCTL_CAUSE_ENA_MASK I40E_MASK(0x1, I40E_PFINT_CEQCTL_CAUSE_ENA_SHIFT)
	#define I40E_PFINT_CEQCTL_INTEVENT_SHIFT 31		#define I40E_PFINT_CEQCTL_INTEVENT_SHIFT 31
	#define I40E_PFINT_CEQCTL_INTEVENT_MASK I40E_MASK(0x1, I40E_PFINT_CEQCTL_INTEVENT_SHIFT)		#define I40E_PFINT_CEQCTL_INTEVENT_MASK I40E_MASK(0x1, I40E_PFINT_CEQCTL_INTEVENT_SHIFT)
			#define I40E_GLINT_CTL 0x0003F800 /* Reset: CORER */
			#define I40E_GLINT_CTL_DIS_AUTOMASK_PF0_SHIFT 0
			#define I40E_GLINT_CTL_DIS_AUTOMASK_PF0_MASK I40E_MASK(0x1, I40E_GLINT_CTL_DIS_AUTOMASK_PF0_SHIFT)
			#define I40E_GLINT_CTL_DIS_AUTOMASK_VF0_SHIFT 1
			#define I40E_GLINT_CTL_DIS_AUTOMASK_VF0_MASK I40E_MASK(0x1, I40E_GLINT_CTL_DIS_AUTOMASK_VF0_SHIFT)
			#define I40E_GLINT_CTL_DIS_AUTOMASK_N_SHIFT 2
			#define I40E_GLINT_CTL_DIS_AUTOMASK_N_MASK I40E_MASK(0x1, I40E_GLINT_CTL_DIS_AUTOMASK_N_SHIFT)
	#define I40E_PFINT_DYN_CTL0 0x00038480 /* Reset: PFR */		#define I40E_PFINT_DYN_CTL0 0x00038480 /* Reset: PFR */
	#define I40E_PFINT_DYN_CTL0_INTENA_SHIFT 0		#define I40E_PFINT_DYN_CTL0_INTENA_SHIFT 0
	#define I40E_PFINT_DYN_CTL0_INTENA_MASK I40E_MASK(0x1, I40E_PFINT_DYN_CTL0_INTENA_SHIFT)		#define I40E_PFINT_DYN_CTL0_INTENA_MASK I40E_MASK(0x1, I40E_PFINT_DYN_CTL0_INTENA_SHIFT)