i40e: add DCB and DCBNL support (4e3b35b0) · Commits · 戴 / test

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

+14 −2

Original line number	Diff line number	Diff line
		@@ -57,6 +57,7 @@
		#include "i40e_virtchnl.h"
		#include "i40e_virtchnl_pf.h"
		#include "i40e_txrx.h"
		#include "i40e_dcb.h"

		/* Useful i40e defaults */
		#define I40E_BASE_PF_SEID 16
		@@ -74,6 +75,7 @@
		#define I40E_DEFAULT_QUEUES_PER_VMDQ 2 /* max 16 qps */
		#define I40E_DEFAULT_QUEUES_PER_VF 4
		#define I40E_DEFAULT_QUEUES_PER_TC 1 /* should be a power of 2 */
		#define I40E_MAX_QUEUES_PER_TC 64 /* should be a power of 2 */
		#define I40E_FDIR_RING 0
		#define I40E_FDIR_RING_COUNT 32
		#define I40E_MAX_AQ_BUF_SIZE 4096
		@@ -163,6 +165,8 @@ struct i40e_fdir_data {
		u8 *raw_packet;
		};

		#define I40E_ETH_P_LLDP 0x88cc

		#define I40E_DCB_PRIO_TYPE_STRICT 0
		#define I40E_DCB_PRIO_TYPE_ETS 1
		#define I40E_DCB_STRICT_PRIO_CREDITS 127
		@@ -197,7 +201,6 @@ struct i40e_pf {
		u16 num_vmdq_msix; /* num queue vectors per vmdq pool */
		u16 num_req_vfs; /* num vfs requested for this vf */
		u16 num_vf_qps; /* num queue pairs per vf */
		u16 num_tc_qps; /* num queue pairs per TC */
		u16 num_lan_qps; /* num lan queues this pf has set up */
		u16 num_lan_msix; /* num queue vectors for the base pf vsi */
		int queues_left; /* queues left unclaimed */
		@@ -552,6 +555,7 @@ struct i40e_veb i40e_veb_setup(struct i40e_pf pf, u16 flags, u16 uplink_seid,
		u16 downlink_seid, u8 enabled_tc);
		void i40e_veb_release(struct i40e_veb *veb);

		int i40e_veb_config_tc(struct i40e_veb *veb, u8 enabled_tc);
		i40e_status i40e_vsi_add_pvid(struct i40e_vsi *vsi, u16 vid);
		void i40e_vsi_remove_pvid(struct i40e_vsi *vsi);
		void i40e_vsi_reset_stats(struct i40e_vsi *vsi);
		@@ -580,7 +584,15 @@ bool i40e_is_vsi_in_vlan(struct i40e_vsi *vsi);
		struct i40e_mac_filter i40e_find_mac(struct i40e_vsi vsi, u8 *macaddr,
		bool is_vf, bool is_netdev);
		void i40e_vlan_stripping_enable(struct i40e_vsi *vsi);

		#ifdef CONFIG_I40E_DCB
		void i40e_dcbnl_flush_apps(struct i40e_pf *pf,
		struct i40e_dcbx_config *new_cfg);
		void i40e_dcbnl_set_all(struct i40e_vsi *vsi);
		void i40e_dcbnl_setup(struct i40e_vsi *vsi);
		bool i40e_dcb_need_reconfig(struct i40e_pf *pf,
		struct i40e_dcbx_config *old_cfg,
		struct i40e_dcbx_config *new_cfg);
		#endif /* CONFIG_I40E_DCB */
		void i40e_ptp_rx_hang(struct i40e_vsi *vsi);
		void i40e_ptp_tx_hwtstamp(struct i40e_pf *pf);
		void i40e_ptp_rx_hwtstamp(struct i40e_pf pf, struct sk_buff skb, u8 index);

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

0 → 100644

+316 −0

Original line number	Diff line number	Diff line
		/*******************************************************************************
		*
		* Intel Ethernet Controller XL710 Family Linux Driver
		* Copyright(c) 2013 - 2014 Intel Corporation.
		*
		* This program is free software; you can redistribute it and/or modify it
		* under the terms and conditions of the GNU General Public License,
		* version 2, as published by the Free Software Foundation.
		*
		* This program is distributed in the hope it will be useful, but WITHOUT
		* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
		* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
		* more details.
		*
		* You should have received a copy of the GNU General Public License along
		* with this program. If not, see <http://www.gnu.org/licenses/>.
		*
		* The full GNU General Public License is included in this distribution in
		* the file called "COPYING".
		*
		* Contact Information:
		* e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
		* Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
		*
		******************************************************************************/

		#ifdef CONFIG_I40E_DCB
		#include "i40e.h"
		#include <net/dcbnl.h>

		/**
		* i40e_get_pfc_delay - retrieve PFC Link Delay
		* @hw: pointer to hardware struct
		* @delay: holds the PFC Link delay value
		*
		* Returns PFC Link Delay from the PRTDCB_GENC.PFCLDA
		**/
		static void i40e_get_pfc_delay(struct i40e_hw hw, u16 delay)
		{
		u32 val;

		val = rd32(hw, I40E_PRTDCB_GENC);
		*delay = (u16)(val & I40E_PRTDCB_GENC_PFCLDA_MASK >>
		I40E_PRTDCB_GENC_PFCLDA_SHIFT);
		}

		/**
		* i40e_dcbnl_ieee_getets - retrieve local IEEE ETS configuration
		* @netdev: the corresponding netdev
		* @ets: structure to hold the ETS information
		*
		* Returns local IEEE ETS configuration
		**/
		static int i40e_dcbnl_ieee_getets(struct net_device *dev,
		struct ieee_ets *ets)
		{
		struct i40e_pf *pf = i40e_netdev_to_pf(dev);
		struct i40e_dcbx_config *dcbxcfg;
		struct i40e_hw *hw = &pf->hw;

		if (!(pf->dcbx_cap & DCB_CAP_DCBX_VER_IEEE))
		return -EINVAL;

		dcbxcfg = &hw->local_dcbx_config;
		ets->willing = dcbxcfg->etscfg.willing;
		ets->ets_cap = dcbxcfg->etscfg.maxtcs;
		ets->cbs = dcbxcfg->etscfg.cbs;
		memcpy(ets->tc_tx_bw, dcbxcfg->etscfg.tcbwtable,
		sizeof(ets->tc_tx_bw));
		memcpy(ets->tc_rx_bw, dcbxcfg->etscfg.tcbwtable,
		sizeof(ets->tc_rx_bw));
		memcpy(ets->tc_tsa, dcbxcfg->etscfg.tsatable,
		sizeof(ets->tc_tsa));
		memcpy(ets->prio_tc, dcbxcfg->etscfg.prioritytable,
		sizeof(ets->prio_tc));
		memcpy(ets->tc_reco_bw, dcbxcfg->etsrec.tcbwtable,
		sizeof(ets->tc_reco_bw));
		memcpy(ets->tc_reco_tsa, dcbxcfg->etsrec.tsatable,
		sizeof(ets->tc_reco_tsa));
		memcpy(ets->reco_prio_tc, dcbxcfg->etscfg.prioritytable,
		sizeof(ets->reco_prio_tc));

		return 0;
		}

		/**
		* i40e_dcbnl_ieee_getpfc - retrieve local IEEE PFC configuration
		* @netdev: the corresponding netdev
		* @ets: structure to hold the PFC information
		*
		* Returns local IEEE PFC configuration
		**/
		static int i40e_dcbnl_ieee_getpfc(struct net_device *dev,
		struct ieee_pfc *pfc)
		{
		struct i40e_pf *pf = i40e_netdev_to_pf(dev);
		struct i40e_dcbx_config *dcbxcfg;
		struct i40e_hw *hw = &pf->hw;
		int i;

		if (!(pf->dcbx_cap & DCB_CAP_DCBX_VER_IEEE))
		return -EINVAL;

		dcbxcfg = &hw->local_dcbx_config;
		pfc->pfc_cap = dcbxcfg->pfc.pfccap;
		pfc->pfc_en = dcbxcfg->pfc.pfcenable;
		pfc->mbc = dcbxcfg->pfc.mbc;
		i40e_get_pfc_delay(hw, &pfc->delay);

		/* Get Requests/Indicatiosn */
		for (i = 0; i < I40E_MAX_TRAFFIC_CLASS; i++) {
		pfc->requests[i] = pf->stats.priority_xoff_tx[i];
		pfc->indications[i] = pf->stats.priority_xoff_rx[i];
		}

		return 0;
		}

		/**
		* i40e_dcbnl_getdcbx - retrieve current DCBx capability
		* @netdev: the corresponding netdev
		*
		* Returns DCBx capability features
		**/
		static u8 i40e_dcbnl_getdcbx(struct net_device *dev)
		{
		struct i40e_pf *pf = i40e_netdev_to_pf(dev);

		return pf->dcbx_cap;
		}

		/**
		* i40e_dcbnl_get_perm_hw_addr - MAC address used by DCBx
		* @netdev: the corresponding netdev
		*
		* Returns the SAN MAC address used for LLDP exchange
		**/
		static void i40e_dcbnl_get_perm_hw_addr(struct net_device *dev,
		u8 *perm_addr)
		{
		struct i40e_pf *pf = i40e_netdev_to_pf(dev);
		int i, j;

		memset(perm_addr, 0xff, MAX_ADDR_LEN);

		for (i = 0; i < dev->addr_len; i++)
		perm_addr[i] = pf->hw.mac.perm_addr[i];

		for (j = 0; j < dev->addr_len; j++, i++)
		perm_addr[i] = pf->hw.mac.san_addr[j];
		}

		static const struct dcbnl_rtnl_ops dcbnl_ops = {
		.ieee_getets = i40e_dcbnl_ieee_getets,
		.ieee_getpfc = i40e_dcbnl_ieee_getpfc,
		.getdcbx = i40e_dcbnl_getdcbx,
		.getpermhwaddr = i40e_dcbnl_get_perm_hw_addr,
		};

		/**
		* i40e_dcbnl_set_all - set all the apps and ieee data from DCBx config
		* @vsi: the corresponding vsi
		*
		* Set up all the IEEE APPs in the DCBNL App Table and generate event for
		* other settings
		**/
		void i40e_dcbnl_set_all(struct i40e_vsi *vsi)
		{
		struct net_device *dev = vsi->netdev;
		struct i40e_pf *pf = i40e_netdev_to_pf(dev);
		struct i40e_dcbx_config *dcbxcfg;
		struct i40e_hw *hw = &pf->hw;
		struct dcb_app sapp;
		u8 prio, tc_map;
		int i;

		/* DCB not enabled */
		if (!(pf->flags & I40E_FLAG_DCB_ENABLED))
		return;

		dcbxcfg = &hw->local_dcbx_config;

		/* Set up all the App TLVs if DCBx is negotiated */
		for (i = 0; i < dcbxcfg->numapps; i++) {
		prio = dcbxcfg->app[i].priority;
		tc_map = (1 << dcbxcfg->etscfg.prioritytable[prio]);

		/* Add APP only if the TC is enabled for this VSI */
		if (tc_map & vsi->tc_config.enabled_tc) {
		sapp.selector = dcbxcfg->app[i].selector;
		sapp.protocol = dcbxcfg->app[i].protocolid;
		sapp.priority = prio;
		dcb_ieee_setapp(dev, &sapp);
		}
		}

		/* Notify user-space of the changes */
		dcbnl_ieee_notify(dev, RTM_SETDCB, DCB_CMD_IEEE_SET, 0, 0);
		}

		/**
		* i40e_dcbnl_vsi_del_app - Delete APP for given VSI
		* @vsi: the corresponding vsi
		* @app: APP to delete
		*
		* Delete given APP from the DCBNL APP table for given
		* VSI
		**/
		static int i40e_dcbnl_vsi_del_app(struct i40e_vsi *vsi,
		struct i40e_ieee_app_priority_table *app)
		{
		struct net_device *dev = vsi->netdev;
		struct dcb_app sapp;

		if (!dev)
		return -EINVAL;

		sapp.selector = app->selector;
		sapp.protocol = app->protocolid;
		sapp.priority = app->priority;
		return dcb_ieee_delapp(dev, &sapp);
		}

		/**
		* i40e_dcbnl_del_app - Delete APP on all VSIs
		* @pf: the corresponding pf
		* @app: APP to delete
		*
		* Delete given APP from all the VSIs for given PF
		**/
		static void i40e_dcbnl_del_app(struct i40e_pf *pf,
		struct i40e_ieee_app_priority_table *app)
		{
		int v, err;
		for (v = 0; v < pf->hw.func_caps.num_vsis; v++) {
		if (pf->vsi[v] && pf->vsi[v]->netdev) {
		err = i40e_dcbnl_vsi_del_app(pf->vsi[v], app);
		if (err)
		dev_info(&pf->pdev->dev, "%s: Failed deleting app for VSI seid=%d err=%d sel=%d proto=0x%x prio=%d\n",
		__func__, pf->vsi[v]->seid,
		err, app->selector,
		app->protocolid, app->priority);
		}
		}
		}

		/**
		* i40e_dcbnl_find_app - Search APP in given DCB config
		* @cfg: DCBX configuration data
		* @app: APP to search for
		*
		* Find given APP in the DCB configuration
		**/
		static bool i40e_dcbnl_find_app(struct i40e_dcbx_config *cfg,
		struct i40e_ieee_app_priority_table *app)
		{
		int i;

		for (i = 0; i < cfg->numapps; i++) {
		if (app->selector == cfg->app[i].selector &&
		app->protocolid == cfg->app[i].protocolid &&
		app->priority == cfg->app[i].priority)
		return true;
		}

		return false;
		}

		/**
		* i40e_dcbnl_flush_apps - Delete all removed APPs
		* @pf: the corresponding pf
		* @new_cfg: new DCBX configuration data
		*
		* Find and delete all APPs that are not present in the passed
		* DCB configuration
		**/
		void i40e_dcbnl_flush_apps(struct i40e_pf *pf,
		struct i40e_dcbx_config *new_cfg)
		{
		struct i40e_ieee_app_priority_table app;
		struct i40e_dcbx_config *dcbxcfg;
		struct i40e_hw *hw = &pf->hw;
		int i;

		dcbxcfg = &hw->local_dcbx_config;
		for (i = 0; i < dcbxcfg->numapps; i++) {
		app = dcbxcfg->app[i];
		/* The APP is not available anymore delete it */
		if (!i40e_dcbnl_find_app(new_cfg, &app))
		i40e_dcbnl_del_app(pf, &app);
		}
		}

		/**
		* i40e_dcbnl_setup - DCBNL setup
		* @vsi: the corresponding vsi
		*
		* Set up DCBNL ops and initial APP TLVs
		**/
		void i40e_dcbnl_setup(struct i40e_vsi *vsi)
		{
		struct net_device *dev = vsi->netdev;
		struct i40e_pf *pf = i40e_netdev_to_pf(dev);

		/* DCB not enabled */
		if (!(pf->flags & I40E_FLAG_DCB_ENABLED))
		return;

		/* Do not setup DCB NL ops for MFP mode */
		if (!(pf->flags & I40E_FLAG_MFP_ENABLED))
		dev->dcbnl_ops = &dcbnl_ops;

		/* Set initial IEEE DCB settings */
		i40e_dcbnl_set_all(vsi);
		}
		#endif /* CONFIG_I40E_DCB */

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

+31 −0

Original line number	Diff line number	Diff line
		@@ -1748,8 +1748,35 @@ static ssize_t i40e_dbg_command_write(struct file *filp,
		pf->hw.aq.asq_last_status);
		goto command_write_done;
		}
		ret = i40e_aq_add_rem_control_packet_filter(&pf->hw,
		pf->hw.mac.addr,
		I40E_ETH_P_LLDP, 0,
		pf->vsi[pf->lan_vsi]->seid,
		0, true, NULL, NULL);
		if (ret) {
		dev_info(&pf->pdev->dev,
		"%s: Add Control Packet Filter AQ command failed =0x%x\n",
		__func__, pf->hw.aq.asq_last_status);
		goto command_write_done;
		}
		#ifdef CONFIG_I40E_DCB
		pf->dcbx_cap = DCB_CAP_DCBX_HOST \|
		DCB_CAP_DCBX_VER_IEEE;
		#endif /* CONFIG_I40E_DCB */
		} else if (strncmp(&cmd_buf[5], "start", 5) == 0) {
		int ret;
		ret = i40e_aq_add_rem_control_packet_filter(&pf->hw,
		pf->hw.mac.addr,
		I40E_ETH_P_LLDP, 0,
		pf->vsi[pf->lan_vsi]->seid,
		0, false, NULL, NULL);
		if (ret) {
		dev_info(&pf->pdev->dev,
		"%s: Remove Control Packet Filter AQ command failed =0x%x\n",
		__func__, pf->hw.aq.asq_last_status);
		/* Continue and start FW LLDP anyways */
		}

		ret = i40e_aq_start_lldp(&pf->hw, NULL);
		if (ret) {
		dev_info(&pf->pdev->dev,
		@@ -1757,6 +1784,10 @@ static ssize_t i40e_dbg_command_write(struct file *filp,
		pf->hw.aq.asq_last_status);
		goto command_write_done;
		}
		#ifdef CONFIG_I40E_DCB
		pf->dcbx_cap = DCB_CAP_DCBX_LLD_MANAGED \|
		DCB_CAP_DCBX_VER_IEEE;
		#endif /* CONFIG_I40E_DCB */
		} else if (strncmp(&cmd_buf[5],
		"get local", 9) == 0) {
		u16 llen, rlen;

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

+308 −18

Original line number	Diff line number	Diff line
		@@ -55,6 +55,7 @@ static int i40e_setup_misc_vector(struct i40e_pf *pf);
		static void i40e_determine_queue_usage(struct i40e_pf *pf);
		static int i40e_setup_pf_filter_control(struct i40e_pf *pf);
		static void i40e_fdir_sb_setup(struct i40e_pf *pf);
		static int i40e_veb_get_bw_info(struct i40e_veb *veb);

		/* i40e_pci_tbl - PCI Device ID Table
		*
		@@ -1272,6 +1273,7 @@ static void i40e_vsi_setup_queue_map(struct i40e_vsi *vsi,
		u8 offset;
		u16 qmap;
		int i;
		u16 num_tc_qps = 0;

		sections = I40E_AQ_VSI_PROP_QUEUE_MAP_VALID;
		offset = 0;
		@@ -1293,6 +1295,9 @@ static void i40e_vsi_setup_queue_map(struct i40e_vsi *vsi,

		vsi->tc_config.numtc = numtc;
		vsi->tc_config.enabled_tc = enabled_tc ? enabled_tc : 1;
		/* Number of queues per enabled TC */
		num_tc_qps = rounddown_pow_of_two(vsi->alloc_queue_pairs/numtc);
		num_tc_qps = min_t(int, num_tc_qps, I40E_MAX_QUEUES_PER_TC);

		/* Setup queue offset/count for all TCs for given VSI */
		for (i = 0; i < I40E_MAX_TRAFFIC_CLASS; i++) {
		@@ -1300,30 +1305,25 @@ static void i40e_vsi_setup_queue_map(struct i40e_vsi *vsi,
		if (vsi->tc_config.enabled_tc & (1 << i)) { /* TC is enabled */
		int pow, num_qps;

		vsi->tc_config.tc_info[i].qoffset = offset;
		switch (vsi->type) {
		case I40E_VSI_MAIN:
		if (i == 0)
		qcount = pf->rss_size;
		else
		qcount = pf->num_tc_qps;
		vsi->tc_config.tc_info[i].qcount = qcount;
		qcount = min_t(int, pf->rss_size, num_tc_qps);
		break;
		case I40E_VSI_FDIR:
		case I40E_VSI_SRIOV:
		case I40E_VSI_VMDQ2:
		default:
		qcount = vsi->alloc_queue_pairs;
		vsi->tc_config.tc_info[i].qcount = qcount;
		qcount = num_tc_qps;
		WARN_ON(i != 0);
		break;
		}
		vsi->tc_config.tc_info[i].qoffset = offset;
		vsi->tc_config.tc_info[i].qcount = qcount;

		/* find the power-of-2 of the number of queue pairs */
		num_qps = vsi->tc_config.tc_info[i].qcount;
		num_qps = qcount;
		pow = 0;
		while (num_qps &&
		((1 << pow) < vsi->tc_config.tc_info[i].qcount)) {
		while (num_qps && ((1 << pow) < qcount)) {
		pow++;
		num_qps >>= 1;
		}
		@@ -1333,7 +1333,7 @@ static void i40e_vsi_setup_queue_map(struct i40e_vsi *vsi,
		(offset << I40E_AQ_VSI_TC_QUE_OFFSET_SHIFT) \|
		(pow << I40E_AQ_VSI_TC_QUE_NUMBER_SHIFT);

		offset += vsi->tc_config.tc_info[i].qcount;
		offset += qcount;
		} else {
		/* TC is not enabled so set the offset to
		* default queue and allocate one queue
		@@ -2162,6 +2162,7 @@ static int i40e_configure_tx_ring(struct i40e_ring *ring)

		/* initialize XPS */
		if (ring->q_vector && ring->netdev &&
		vsi->tc_config.numtc <= 1 &&
		!test_and_set_bit(__I40E_TX_XPS_INIT_DONE, &ring->state))
		netif_set_xps_queue(ring->netdev,
		&ring->q_vector->affinity_mask,
		@@ -3887,6 +3888,149 @@ out:
		return ret;
		}

		/**
		* i40e_veb_config_tc - Configure TCs for given VEB
		* @veb: given VEB
		* @enabled_tc: TC bitmap
		*
		* Configures given TC bitmap for VEB (switching) element
		**/
		int i40e_veb_config_tc(struct i40e_veb *veb, u8 enabled_tc)
		{
		struct i40e_aqc_configure_switching_comp_bw_config_data bw_data = {0};
		struct i40e_pf *pf = veb->pf;
		int ret = 0;
		int i;

		/* No TCs or already enabled TCs just return */
		if (!enabled_tc \|\| veb->enabled_tc == enabled_tc)
		return ret;

		bw_data.tc_valid_bits = enabled_tc;
		/* bw_data.absolute_credits is not set (relative) */

		/* Enable ETS TCs with equal BW Share for now */
		for (i = 0; i < I40E_MAX_TRAFFIC_CLASS; i++) {
		if (enabled_tc & (1 << i))
		bw_data.tc_bw_share_credits[i] = 1;
		}

		ret = i40e_aq_config_switch_comp_bw_config(&pf->hw, veb->seid,
		&bw_data, NULL);
		if (ret) {
		dev_info(&pf->pdev->dev,
		"veb bw config failed, aq_err=%d\n",
		pf->hw.aq.asq_last_status);
		goto out;
		}

		/* Update the BW information */
		ret = i40e_veb_get_bw_info(veb);
		if (ret) {
		dev_info(&pf->pdev->dev,
		"Failed getting veb bw config, aq_err=%d\n",
		pf->hw.aq.asq_last_status);
		}

		out:
		return ret;
		}

		#ifdef CONFIG_I40E_DCB
		/**
		* i40e_dcb_reconfigure - Reconfigure all VEBs and VSIs
		* @pf: PF struct
		*
		* Reconfigure VEB/VSIs on a given PF; it is assumed that
		* the caller would've quiesce all the VSIs before calling
		* this function
		**/
		static void i40e_dcb_reconfigure(struct i40e_pf *pf)
		{
		u8 tc_map = 0;
		int ret;
		u8 v;

		/* Enable the TCs available on PF to all VEBs */
		tc_map = i40e_pf_get_tc_map(pf);
		for (v = 0; v < I40E_MAX_VEB; v++) {
		if (!pf->veb[v])
		continue;
		ret = i40e_veb_config_tc(pf->veb[v], tc_map);
		if (ret) {
		dev_info(&pf->pdev->dev,
		"Failed configuring TC for VEB seid=%d\n",
		pf->veb[v]->seid);
		/* Will try to configure as many components */
		}
		}

		/* Update each VSI */
		for (v = 0; v < pf->hw.func_caps.num_vsis; v++) {
		if (!pf->vsi[v])
		continue;

		/* - Enable all TCs for the LAN VSI
		* - For all others keep them at TC0 for now
		*/
		if (v == pf->lan_vsi)
		tc_map = i40e_pf_get_tc_map(pf);
		else
		tc_map = i40e_pf_get_default_tc(pf);

		ret = i40e_vsi_config_tc(pf->vsi[v], tc_map);
		if (ret) {
		dev_info(&pf->pdev->dev,
		"Failed configuring TC for VSI seid=%d\n",
		pf->vsi[v]->seid);
		/* Will try to configure as many components */
		} else {
		if (pf->vsi[v]->netdev)
		i40e_dcbnl_set_all(pf->vsi[v]);
		}
		}
		}

		/**
		* i40e_init_pf_dcb - Initialize DCB configuration
		* @pf: PF being configured
		*
		* Query the current DCB configuration and cache it
		* in the hardware structure
		**/
		static int i40e_init_pf_dcb(struct i40e_pf *pf)
		{
		struct i40e_hw *hw = &pf->hw;
		int err = 0;

		if (pf->hw.func_caps.npar_enable)
		goto out;

		/* Get the initial DCB configuration */
		err = i40e_init_dcb(hw);
		if (!err) {
		/* Device/Function is not DCBX capable */
		if ((!hw->func_caps.dcb) \|\|
		(hw->dcbx_status == I40E_DCBX_STATUS_DISABLED)) {
		dev_info(&pf->pdev->dev,
		"DCBX offload is not supported or is disabled for this PF.\n");

		if (pf->flags & I40E_FLAG_MFP_ENABLED)
		goto out;

		} else {
		/* When status is not DISABLED then DCBX in FW */
		pf->dcbx_cap = DCB_CAP_DCBX_LLD_MANAGED \|
		DCB_CAP_DCBX_VER_IEEE;
		pf->flags \|= I40E_FLAG_DCB_ENABLED;
		}
		}

		out:
		return err;
		}
		#endif /* CONFIG_I40E_DCB */

		/**
		* i40e_up_complete - Finish the last steps of bringing up a connection
		* @vsi: the VSI being configured
		@@ -4249,6 +4393,130 @@ void i40e_do_reset(struct i40e_pf *pf, u32 reset_flags)
		}
		}

		#ifdef CONFIG_I40E_DCB
		/**
		* i40e_dcb_need_reconfig - Check if DCB needs reconfig
		* @pf: board private structure
		* @old_cfg: current DCB config
		* @new_cfg: new DCB config
		**/
		bool i40e_dcb_need_reconfig(struct i40e_pf *pf,
		struct i40e_dcbx_config *old_cfg,
		struct i40e_dcbx_config *new_cfg)
		{
		bool need_reconfig = false;

		/* Check if ETS configuration has changed */
		if (memcmp(&new_cfg->etscfg,
		&old_cfg->etscfg,
		sizeof(new_cfg->etscfg))) {
		/* If Priority Table has changed reconfig is needed */
		if (memcmp(&new_cfg->etscfg.prioritytable,
		&old_cfg->etscfg.prioritytable,
		sizeof(new_cfg->etscfg.prioritytable))) {
		need_reconfig = true;
		dev_info(&pf->pdev->dev, "ETS UP2TC changed.\n");
		}

		if (memcmp(&new_cfg->etscfg.tcbwtable,
		&old_cfg->etscfg.tcbwtable,
		sizeof(new_cfg->etscfg.tcbwtable)))
		dev_info(&pf->pdev->dev, "ETS TC BW Table changed.\n");

		if (memcmp(&new_cfg->etscfg.tsatable,
		&old_cfg->etscfg.tsatable,
		sizeof(new_cfg->etscfg.tsatable)))
		dev_info(&pf->pdev->dev, "ETS TSA Table changed.\n");
		}

		/* Check if PFC configuration has changed */
		if (memcmp(&new_cfg->pfc,
		&old_cfg->pfc,
		sizeof(new_cfg->pfc))) {
		need_reconfig = true;
		dev_info(&pf->pdev->dev, "PFC config change detected.\n");
		}

		/* Check if APP Table has changed */
		if (memcmp(&new_cfg->app,
		&old_cfg->app,
		sizeof(new_cfg->app)))
		need_reconfig = true;
		dev_info(&pf->pdev->dev, "APP Table change detected.\n");

		return need_reconfig;
		}

		/**
		* i40e_handle_lldp_event - Handle LLDP Change MIB event
		* @pf: board private structure
		* @e: event info posted on ARQ
		**/
		static int i40e_handle_lldp_event(struct i40e_pf *pf,
		struct i40e_arq_event_info *e)
		{
		struct i40e_aqc_lldp_get_mib *mib =
		(struct i40e_aqc_lldp_get_mib *)&e->desc.params.raw;
		struct i40e_hw *hw = &pf->hw;
		struct i40e_dcbx_config *dcbx_cfg = &hw->local_dcbx_config;
		struct i40e_dcbx_config tmp_dcbx_cfg;
		bool need_reconfig = false;
		int ret = 0;
		u8 type;

		/* Ignore if event is not for Nearest Bridge */
		type = ((mib->type >> I40E_AQ_LLDP_BRIDGE_TYPE_SHIFT)
		& I40E_AQ_LLDP_BRIDGE_TYPE_MASK);
		if (type != I40E_AQ_LLDP_BRIDGE_TYPE_NEAREST_BRIDGE)
		return ret;

		/* Check MIB Type and return if event for Remote MIB update */
		type = mib->type & I40E_AQ_LLDP_MIB_TYPE_MASK;
		if (type == I40E_AQ_LLDP_MIB_REMOTE) {
		/* Update the remote cached instance and return */
		ret = i40e_aq_get_dcb_config(hw, I40E_AQ_LLDP_MIB_REMOTE,
		I40E_AQ_LLDP_BRIDGE_TYPE_NEAREST_BRIDGE,
		&hw->remote_dcbx_config);
		goto exit;
		}

		/* Convert/store the DCBX data from LLDPDU temporarily */
		memset(&tmp_dcbx_cfg, 0, sizeof(tmp_dcbx_cfg));
		ret = i40e_lldp_to_dcb_config(e->msg_buf, &tmp_dcbx_cfg);
		if (ret) {
		/* Error in LLDPDU parsing return */
		dev_info(&pf->pdev->dev, "Failed parsing LLDPDU from event buffer\n");
		goto exit;
		}

		/* No change detected in DCBX configs */
		if (!memcmp(&tmp_dcbx_cfg, dcbx_cfg, sizeof(tmp_dcbx_cfg))) {
		dev_info(&pf->pdev->dev, "No change detected in DCBX configuration.\n");
		goto exit;
		}

		need_reconfig = i40e_dcb_need_reconfig(pf, dcbx_cfg, &tmp_dcbx_cfg);

		i40e_dcbnl_flush_apps(pf, &tmp_dcbx_cfg);

		/* Overwrite the new configuration */
		*dcbx_cfg = tmp_dcbx_cfg;

		if (!need_reconfig)
		goto exit;

		/* Reconfiguration needed quiesce all VSIs */
		i40e_pf_quiesce_all_vsi(pf);

		/* Changes in configuration update VEB/VSI */
		i40e_dcb_reconfigure(pf);

		i40e_pf_unquiesce_all_vsi(pf);
		exit:
		return ret;
		}
		#endif /* CONFIG_I40E_DCB */

		/**
		* i40e_do_reset_safe - Protected reset path for userland calls.
		* @pf: board private structure
		@@ -4635,6 +4903,11 @@ static void i40e_clean_adminq_subtask(struct i40e_pf *pf)
		break;
		case i40e_aqc_opc_lldp_update_mib:
		dev_info(&pf->pdev->dev, "ARQ: Update LLDP MIB event received\n");
		#ifdef CONFIG_I40E_DCB
		rtnl_lock();
		ret = i40e_handle_lldp_event(pf, &event);
		rtnl_unlock();
		#endif /* CONFIG_I40E_DCB */
		break;
		case i40e_aqc_opc_event_lan_overflow:
		dev_info(&pf->pdev->dev, "ARQ LAN queue overflow event received\n");
		@@ -4983,6 +5256,14 @@ static void i40e_reset_and_rebuild(struct i40e_pf *pf, bool reinit)
		goto end_core_reset;
		}

		#ifdef CONFIG_I40E_DCB
		ret = i40e_init_pf_dcb(pf);
		if (ret) {
		dev_info(&pf->pdev->dev, "init_pf_dcb failed: %d\n", ret);
		goto end_core_reset;
		}
		#endif /* CONFIG_I40E_DCB */

		/* do basic switch setup */
		ret = i40e_setup_pf_switch(pf, reinit);
		if (ret)
		@@ -5971,11 +6252,6 @@ static int i40e_sw_init(struct i40e_pf *pf)
		dev_info(&pf->pdev->dev, "MFP mode Enabled\n");
		}

		if (pf->hw.func_caps.dcb)
		pf->num_tc_qps = I40E_DEFAULT_QUEUES_PER_TC;
		else
		pf->num_tc_qps = 0;

		/* FW/NVM is not yet fixed in this regard */
		if ((pf->hw.func_caps.fd_filters_guaranteed > 0) \|\|
		(pf->hw.func_caps.fd_filters_best_effort > 0)) {
		@@ -6779,6 +7055,10 @@ struct i40e_vsi i40e_vsi_setup(struct i40e_pf pf, u8 type,
		goto err_netdev;
		vsi->netdev_registered = true;
		netif_carrier_off(vsi->netdev);
		#ifdef CONFIG_I40E_DCB
		/* Setup DCB netlink interface */
		i40e_dcbnl_setup(vsi);
		#endif /* CONFIG_I40E_DCB */
		/* fall through */

		case I40E_VSI_FDIR:
		@@ -7450,7 +7730,6 @@ static void i40e_determine_queue_usage(struct i40e_pf *pf)
		int queues_left;

		pf->num_lan_qps = 0;
		pf->num_tc_qps = rounddown_pow_of_two(pf->num_tc_qps);

		/* Find the max queues to be put into basic use. We'll always be
		* using TC0, whether or not DCB is running, and TC0 will get the
		@@ -7718,6 +7997,14 @@ static int i40e_probe(struct pci_dev pdev, const struct pci_device_id ent)

		pci_set_drvdata(pdev, pf);
		pci_save_state(pdev);
		#ifdef CONFIG_I40E_DCB
		err = i40e_init_pf_dcb(pf);
		if (err) {
		dev_info(&pdev->dev, "init_pf_dcb failed: %d\n", err);
		pf->flags &= ~I40E_FLAG_DCB_ENABLED;
		goto err_init_dcb;
		}
		#endif /* CONFIG_I40E_DCB */

		/* set up periodic task facility */
		setup_timer(&pf->service_timer, i40e_service_timer, (unsigned long)pf);
		@@ -7831,6 +8118,9 @@ err_vsis:
		err_switch_setup:
		i40e_reset_interrupt_capability(pf);
		del_timer_sync(&pf->service_timer);
		#ifdef CONFIG_I40E_DCB
		err_init_dcb:
		#endif /* CONFIG_I40E_DCB */
		err_mac_addr:
		err_configure_lan_hmc:
		(void)i40e_shutdown_lan_hmc(hw);

Admin message