aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/ice/ice_main.c
diff options
context:
space:
mode:
authorAnirudh Venkataramanan <anirudh.venkataramanan@intel.com>2019-02-28 18:24:22 -0500
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2019-04-18 11:38:47 -0400
commit37b6f6469f75070e4fb2e32995eb858e79b8860a (patch)
treec382e12efce222342d5f55407007c7da332f7da7 /drivers/net/ethernet/intel/ice/ice_main.c
parent802abbb44a251a753ad56fcda1e35daf0138ab29 (diff)
ice: Add code for DCB initialization part 1/4
This patch introduces a skeleton for ice_init_pf_dcb, the top level function for DCB initialization. Subsequent patches will add to this DCB init flow. In this patch, ice_init_pf_dcb checks if DCB is a supported capability. If so, an admin queue call to start the LLDP and DCBx in firmware is issued. If not, an error is reported. Note that we don't fail the driver init if DCB init fails. Reviewed-by: Bruce Allan <bruce.w.allan@intel.com> Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com> Tested-by: Andrew Bowers <andrewx.bowers@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_main.c')
-rw-r--r--drivers/net/ethernet/intel/ice/ice_main.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index d58887a1cc36..22fe0605aa9f 100644
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -7,6 +7,7 @@
7 7
8#include "ice.h" 8#include "ice.h"
9#include "ice_lib.h" 9#include "ice_lib.h"
10#include "ice_dcb_lib.h"
10 11
11#define DRV_VERSION "0.7.3-k" 12#define DRV_VERSION "0.7.3-k"
12#define DRV_SUMMARY "Intel(R) Ethernet Connection E800 Series Linux Driver" 13#define DRV_SUMMARY "Intel(R) Ethernet Connection E800 Series Linux Driver"
@@ -2285,6 +2286,15 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent)
2285 2286
2286 ice_init_pf(pf); 2287 ice_init_pf(pf);
2287 2288
2289 err = ice_init_pf_dcb(pf);
2290 if (err) {
2291 clear_bit(ICE_FLAG_DCB_CAPABLE, pf->flags);
2292 clear_bit(ICE_FLAG_DCB_ENA, pf->flags);
2293
2294 /* do not fail overall init if DCB init fails */
2295 err = 0;
2296 }
2297
2288 ice_determine_q_usage(pf); 2298 ice_determine_q_usage(pf);
2289 2299
2290 pf->num_alloc_vsi = hw->func_caps.guar_num_vsi; 2300 pf->num_alloc_vsi = hw->func_caps.guar_num_vsi;