i40e: Add support to firmware CEE DCBX mode
authorNeerav Parikh <neerav.parikh@intel.com>
Wed, 12 Nov 2014 00:18:25 +0000 (00:18 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Tue, 18 Nov 2014 09:09:02 +0000 (01:09 -0800)
This patch allows i40e driver to query and use DCB configuration from
firmware when firmware DCBX agent is in CEE mode.

Change-ID: I30f92a67eb890f0f024f35339696e6e83d49a274
Signed-off-by: Neerav Parikh <neerav.parikh@intel.com>
Tested-By: Jack Morgan <jack.morgan@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h
drivers/net/ethernet/intel/i40e/i40e_common.c
drivers/net/ethernet/intel/i40e/i40e_dcb.c
drivers/net/ethernet/intel/i40e/i40e_dcb.h
drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c
drivers/net/ethernet/intel/i40e/i40e_debugfs.c
drivers/net/ethernet/intel/i40e/i40e_fcoe.c
drivers/net/ethernet/intel/i40e/i40e_main.c
drivers/net/ethernet/intel/i40e/i40e_prototype.h
drivers/net/ethernet/intel/i40e/i40e_type.h

index a65bc43989715229cef493a624ba409c2dcdbf72..8835aeeff23e13f1d1d0c78f73ed46442b05c40c 100644 (file)
@@ -255,6 +255,7 @@ enum i40e_admin_queue_opc {
        i40e_aqc_opc_lldp_delete_tlv    = 0x0A04,
        i40e_aqc_opc_lldp_stop          = 0x0A05,
        i40e_aqc_opc_lldp_start         = 0x0A06,
+       i40e_aqc_opc_get_cee_dcb_cfg    = 0x0A07,
 
        /* Tunnel commands */
        i40e_aqc_opc_add_udp_tunnel     = 0x0B00,
@@ -1987,10 +1988,50 @@ struct i40e_aqc_lldp_start {
 
 I40E_CHECK_CMD_LENGTH(i40e_aqc_lldp_start);
 
-/* Apply MIB changes (0x0A07)
- * uses the generic struc as it contains no data
+/* Get CEE DCBX Oper Config (0x0A07)
+ * uses the generic descriptor struct
+ * returns below as indirect response
  */
 
+#define I40E_AQC_CEE_APP_FCOE_SHIFT    0x0
+#define I40E_AQC_CEE_APP_FCOE_MASK     (0x7 << I40E_AQC_CEE_APP_FCOE_SHIFT)
+#define I40E_AQC_CEE_APP_ISCSI_SHIFT   0x3
+#define I40E_AQC_CEE_APP_ISCSI_MASK    (0x7 << I40E_AQC_CEE_APP_ISCSI_SHIFT)
+#define I40E_AQC_CEE_APP_FIP_SHIFT     0x8
+#define I40E_AQC_CEE_APP_FIP_MASK      (0x7 << I40E_AQC_CEE_APP_FIP_SHIFT)
+#define I40E_AQC_CEE_PG_STATUS_SHIFT   0x0
+#define I40E_AQC_CEE_PG_STATUS_MASK    (0x7 << I40E_AQC_CEE_PG_STATUS_SHIFT)
+#define I40E_AQC_CEE_PFC_STATUS_SHIFT  0x3
+#define I40E_AQC_CEE_PFC_STATUS_MASK   (0x7 << I40E_AQC_CEE_PFC_STATUS_SHIFT)
+#define I40E_AQC_CEE_APP_STATUS_SHIFT  0x8
+#define I40E_AQC_CEE_APP_STATUS_MASK   (0x7 << I40E_AQC_CEE_APP_STATUS_SHIFT)
+struct i40e_aqc_get_cee_dcb_cfg_v1_resp {
+       u8      reserved1;
+       u8      oper_num_tc;
+       u8      oper_prio_tc[4];
+       u8      reserved2;
+       u8      oper_tc_bw[8];
+       u8      oper_pfc_en;
+       u8      reserved3;
+       __le16  oper_app_prio;
+       u8      reserved4;
+       __le16  tlv_status;
+};
+
+I40E_CHECK_STRUCT_LEN(0x18, i40e_aqc_get_cee_dcb_cfg_v1_resp);
+
+struct i40e_aqc_get_cee_dcb_cfg_resp {
+       u8      oper_num_tc;
+       u8      oper_prio_tc[4];
+       u8      oper_tc_bw[8];
+       u8      oper_pfc_en;
+       __le16  oper_app_prio;
+       __le32  tlv_status;
+       u8      reserved[12];
+};
+
+I40E_CHECK_STRUCT_LEN(0x20, i40e_aqc_get_cee_dcb_cfg_resp);
+
 /* Add Udp Tunnel command and completion (direct 0x0B00) */
 struct i40e_aqc_add_udp_tunnel {
        __le16  udp_port;
index 76735d5f34ebbeaf7f296de9459548a4814c1df3..b601b3cfd92ba1aade7bf7f5b133799541edaa86 100644 (file)
@@ -2659,6 +2659,34 @@ i40e_status i40e_aq_start_lldp(struct i40e_hw *hw,
        return status;
 }
 
+/**
+ * i40e_aq_get_cee_dcb_config
+ * @hw: pointer to the hw struct
+ * @buff: response buffer that stores CEE operational configuration
+ * @buff_size: size of the buffer passed
+ * @cmd_details: pointer to command details structure or NULL
+ *
+ * Get CEE DCBX mode operational configuration from firmware
+ **/
+i40e_status i40e_aq_get_cee_dcb_config(struct i40e_hw *hw,
+                                      void *buff, u16 buff_size,
+                                      struct i40e_asq_cmd_details *cmd_details)
+{
+       struct i40e_aq_desc desc;
+       i40e_status status;
+
+       if (buff_size == 0 || !buff)
+               return I40E_ERR_PARAM;
+
+       i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_get_cee_dcb_cfg);
+
+       desc.flags |= cpu_to_le16((u16)I40E_AQ_FLAG_BUF);
+       status = i40e_asq_send_command(hw, &desc, (void *)buff, buff_size,
+                                      cmd_details);
+
+       return status;
+}
+
 /**
  * i40e_aq_add_udp_tunnel
  * @hw: pointer to the hw struct
index 036570d76176cd211ef2ee22328aeecd96b7174a..1396c70b871cd9cb3ac7742ed4c17fc60341ae28 100644 (file)
@@ -59,7 +59,7 @@ i40e_status i40e_get_dcbx_status(struct i40e_hw *hw, u16 *status)
 static void i40e_parse_ieee_etscfg_tlv(struct i40e_lldp_org_tlv *tlv,
                                       struct i40e_dcbx_config *dcbcfg)
 {
-       struct i40e_ieee_ets_config *etscfg;
+       struct i40e_dcb_ets_config *etscfg;
        u8 *buf = tlv->tlvinfo;
        u16 offset = 0;
        u8 priority;
@@ -406,6 +406,166 @@ free_mem:
        return ret;
 }
 
+/**
+ * i40e_cee_to_dcb_v1_config
+ * @cee_cfg: pointer to CEE v1 response configuration struct
+ * @dcbcfg: DCB configuration struct
+ *
+ * Convert CEE v1 configuration from firmware to DCB configuration
+ **/
+static void i40e_cee_to_dcb_v1_config(
+                       struct i40e_aqc_get_cee_dcb_cfg_v1_resp *cee_cfg,
+                       struct i40e_dcbx_config *dcbcfg)
+{
+       u16 status, tlv_status = le16_to_cpu(cee_cfg->tlv_status);
+       u16 app_prio = le16_to_cpu(cee_cfg->oper_app_prio);
+       u8 i, tc, err, sync, oper;
+
+       /* CEE PG data to ETS config */
+       dcbcfg->etscfg.maxtcs = cee_cfg->oper_num_tc;
+
+       for (i = 0; i < 4; i++) {
+               tc = (u8)((cee_cfg->oper_prio_tc[i] &
+                        I40E_CEE_PGID_PRIO_1_MASK) >>
+                        I40E_CEE_PGID_PRIO_1_SHIFT);
+               dcbcfg->etscfg.prioritytable[i*2] =  tc;
+               tc = (u8)((cee_cfg->oper_prio_tc[i] &
+                        I40E_CEE_PGID_PRIO_0_MASK) >>
+                        I40E_CEE_PGID_PRIO_0_SHIFT);
+               dcbcfg->etscfg.prioritytable[i*2 + 1] = tc;
+       }
+
+       for (i = 0; i < I40E_MAX_TRAFFIC_CLASS; i++)
+               dcbcfg->etscfg.tcbwtable[i] = cee_cfg->oper_tc_bw[i];
+
+       for (i = 0; i < I40E_MAX_TRAFFIC_CLASS; i++) {
+               if (dcbcfg->etscfg.prioritytable[i] == I40E_CEE_PGID_STRICT) {
+                       /* Map it to next empty TC */
+                       dcbcfg->etscfg.prioritytable[i] =
+                                               cee_cfg->oper_num_tc - 1;
+                       dcbcfg->etscfg.tsatable[i] = I40E_IEEE_TSA_STRICT;
+               } else {
+                       dcbcfg->etscfg.tsatable[i] = I40E_IEEE_TSA_ETS;
+               }
+       }
+
+       /* CEE PFC data to ETS config */
+       dcbcfg->pfc.pfcenable = cee_cfg->oper_pfc_en;
+       dcbcfg->pfc.pfccap = I40E_MAX_TRAFFIC_CLASS;
+
+       status = (tlv_status & I40E_AQC_CEE_APP_STATUS_MASK) >>
+                 I40E_AQC_CEE_APP_STATUS_SHIFT;
+       err = (status & I40E_TLV_STATUS_ERR) ? 1 : 0;
+       sync = (status & I40E_TLV_STATUS_SYNC) ? 1 : 0;
+       oper = (status & I40E_TLV_STATUS_OPER) ? 1 : 0;
+       /* Add APPs if Error is False and Oper/Sync is True */
+       if (!err && sync && oper) {
+               /* CEE operating configuration supports FCoE/iSCSI/FIP only */
+               dcbcfg->numapps = I40E_CEE_OPER_MAX_APPS;
+
+               /* FCoE APP */
+               dcbcfg->app[0].priority =
+                       (app_prio & I40E_AQC_CEE_APP_FCOE_MASK) >>
+                        I40E_AQC_CEE_APP_FCOE_SHIFT;
+               dcbcfg->app[0].selector = I40E_APP_SEL_ETHTYPE;
+               dcbcfg->app[0].protocolid = I40E_APP_PROTOID_FCOE;
+
+               /* iSCSI APP */
+               dcbcfg->app[1].priority =
+                       (app_prio & I40E_AQC_CEE_APP_ISCSI_MASK) >>
+                        I40E_AQC_CEE_APP_ISCSI_SHIFT;
+               dcbcfg->app[1].selector = I40E_APP_SEL_TCPIP;
+               dcbcfg->app[1].protocolid = I40E_APP_PROTOID_ISCSI;
+
+               /* FIP APP */
+               dcbcfg->app[2].priority =
+                       (app_prio & I40E_AQC_CEE_APP_FIP_MASK) >>
+                        I40E_AQC_CEE_APP_FIP_SHIFT;
+               dcbcfg->app[2].selector = I40E_APP_SEL_ETHTYPE;
+               dcbcfg->app[2].protocolid = I40E_APP_PROTOID_FIP;
+       }
+}
+
+/**
+ * i40e_cee_to_dcb_config
+ * @cee_cfg: pointer to CEE configuration struct
+ * @dcbcfg: DCB configuration struct
+ *
+ * Convert CEE configuration from firmware to DCB configuration
+ **/
+static void i40e_cee_to_dcb_config(
+                               struct i40e_aqc_get_cee_dcb_cfg_resp *cee_cfg,
+                               struct i40e_dcbx_config *dcbcfg)
+{
+       u32 status, tlv_status = le32_to_cpu(cee_cfg->tlv_status);
+       u16 app_prio = le16_to_cpu(cee_cfg->oper_app_prio);
+       u8 i, tc, err, sync, oper;
+
+       /* CEE PG data to ETS config */
+       dcbcfg->etscfg.maxtcs = cee_cfg->oper_num_tc;
+
+       for (i = 0; i < 4; i++) {
+               tc = (u8)((cee_cfg->oper_prio_tc[i] &
+                        I40E_CEE_PGID_PRIO_1_MASK) >>
+                        I40E_CEE_PGID_PRIO_1_SHIFT);
+               dcbcfg->etscfg.prioritytable[i*2] =  tc;
+               tc = (u8)((cee_cfg->oper_prio_tc[i] &
+                        I40E_CEE_PGID_PRIO_0_MASK) >>
+                        I40E_CEE_PGID_PRIO_0_SHIFT);
+               dcbcfg->etscfg.prioritytable[i*2 + 1] = tc;
+       }
+
+       for (i = 0; i < I40E_MAX_TRAFFIC_CLASS; i++)
+               dcbcfg->etscfg.tcbwtable[i] = cee_cfg->oper_tc_bw[i];
+
+       for (i = 0; i < I40E_MAX_TRAFFIC_CLASS; i++) {
+               if (dcbcfg->etscfg.prioritytable[i] == I40E_CEE_PGID_STRICT) {
+                       /* Map it to next empty TC */
+                       dcbcfg->etscfg.prioritytable[i] =
+                                               cee_cfg->oper_num_tc - 1;
+                       dcbcfg->etscfg.tsatable[i] = I40E_IEEE_TSA_STRICT;
+               } else {
+                       dcbcfg->etscfg.tsatable[i] = I40E_IEEE_TSA_ETS;
+               }
+       }
+
+       /* CEE PFC data to ETS config */
+       dcbcfg->pfc.pfcenable = cee_cfg->oper_pfc_en;
+       dcbcfg->pfc.pfccap = I40E_MAX_TRAFFIC_CLASS;
+
+       status = (tlv_status & I40E_AQC_CEE_APP_STATUS_MASK) >>
+                 I40E_AQC_CEE_APP_STATUS_SHIFT;
+       err = (status & I40E_TLV_STATUS_ERR) ? 1 : 0;
+       sync = (status & I40E_TLV_STATUS_SYNC) ? 1 : 0;
+       oper = (status & I40E_TLV_STATUS_OPER) ? 1 : 0;
+       /* Add APPs if Error is False and Oper/Sync is True */
+       if (!err && sync && oper) {
+               /* CEE operating configuration supports FCoE/iSCSI/FIP only */
+               dcbcfg->numapps = I40E_CEE_OPER_MAX_APPS;
+
+               /* FCoE APP */
+               dcbcfg->app[0].priority =
+                       (app_prio & I40E_AQC_CEE_APP_FCOE_MASK) >>
+                        I40E_AQC_CEE_APP_FCOE_SHIFT;
+               dcbcfg->app[0].selector = I40E_APP_SEL_ETHTYPE;
+               dcbcfg->app[0].protocolid = I40E_APP_PROTOID_FCOE;
+
+               /* iSCSI APP */
+               dcbcfg->app[1].priority =
+                       (app_prio & I40E_AQC_CEE_APP_ISCSI_MASK) >>
+                        I40E_AQC_CEE_APP_ISCSI_SHIFT;
+               dcbcfg->app[1].selector = I40E_APP_SEL_TCPIP;
+               dcbcfg->app[1].protocolid = I40E_APP_PROTOID_ISCSI;
+
+               /* FIP APP */
+               dcbcfg->app[2].priority =
+                       (app_prio & I40E_AQC_CEE_APP_FIP_MASK) >>
+                        I40E_AQC_CEE_APP_FIP_SHIFT;
+               dcbcfg->app[2].selector = I40E_APP_SEL_ETHTYPE;
+               dcbcfg->app[2].protocolid = I40E_APP_PROTOID_FIP;
+       }
+}
+
 /**
  * i40e_get_dcb_config
  * @hw: pointer to the hw struct
@@ -415,7 +575,44 @@ free_mem:
 i40e_status i40e_get_dcb_config(struct i40e_hw *hw)
 {
        i40e_status ret = 0;
+       struct i40e_aqc_get_cee_dcb_cfg_resp cee_cfg;
+       struct i40e_aqc_get_cee_dcb_cfg_v1_resp cee_v1_cfg;
+
+       /* If Firmware version < v4.33 IEEE only */
+       if (((hw->aq.fw_maj_ver == 4) && (hw->aq.fw_min_ver < 33)) ||
+           (hw->aq.fw_maj_ver < 4))
+               goto ieee;
+
+       /* If Firmware version == v4.33 use old CEE struct */
+       if ((hw->aq.fw_maj_ver == 4) && (hw->aq.fw_min_ver == 33)) {
+               ret = i40e_aq_get_cee_dcb_config(hw, &cee_v1_cfg,
+                                                sizeof(cee_v1_cfg), NULL);
+               if (!ret) {
+                       /* CEE mode */
+                       hw->local_dcbx_config.dcbx_mode = I40E_DCBX_MODE_CEE;
+                       i40e_cee_to_dcb_v1_config(&cee_v1_cfg,
+                                                 &hw->local_dcbx_config);
+               }
+       } else {
+               ret = i40e_aq_get_cee_dcb_config(hw, &cee_cfg,
+                                                sizeof(cee_cfg), NULL);
+               if (!ret) {
+                       /* CEE mode */
+                       hw->local_dcbx_config.dcbx_mode = I40E_DCBX_MODE_CEE;
+                       i40e_cee_to_dcb_config(&cee_cfg,
+                                              &hw->local_dcbx_config);
+               }
+       }
+
+       /* CEE mode not enabled try querying IEEE data */
+       if (hw->aq.asq_last_status == I40E_AQ_RC_ENOENT)
+               goto ieee;
+       else
+               goto out;
 
+ieee:
+       /* IEEE mode */
+       hw->local_dcbx_config.dcbx_mode = I40E_DCBX_MODE_IEEE;
        /* Get Local DCB Config */
        ret = i40e_aq_get_dcb_config(hw, I40E_AQ_LLDP_MIB_LOCAL, 0,
                                     &hw->local_dcbx_config);
@@ -426,6 +623,10 @@ i40e_status i40e_get_dcb_config(struct i40e_hw *hw)
        ret = i40e_aq_get_dcb_config(hw, I40E_AQ_LLDP_MIB_REMOTE,
                                     I40E_AQ_LLDP_BRIDGE_TYPE_NEAREST_BRIDGE,
                                     &hw->remote_dcbx_config);
+       /* Don't treat ENOENT as an error for Remote MIBs */
+       if (hw->aq.asq_last_status == I40E_AQ_RC_ENOENT)
+               ret = 0;
+
 out:
        return ret;
 }
index 34cf1c30c7ffdff1210cea04e0c2cbeb160ef399..e137e3fac8ee2fd280ffaac6ac5924365e3abbdc 100644 (file)
 #define I40E_IEEE_ETS_PRIO_0_MASK      (0x7 << I40E_IEEE_ETS_PRIO_0_SHIFT)
 #define I40E_IEEE_ETS_PRIO_1_SHIFT     4
 #define I40E_IEEE_ETS_PRIO_1_MASK      (0x7 << I40E_IEEE_ETS_PRIO_1_SHIFT)
+#define I40E_CEE_PGID_PRIO_0_SHIFT     0
+#define I40E_CEE_PGID_PRIO_0_MASK      (0xF << I40E_CEE_PGID_PRIO_0_SHIFT)
+#define I40E_CEE_PGID_PRIO_1_SHIFT     4
+#define I40E_CEE_PGID_PRIO_1_MASK      (0xF << I40E_CEE_PGID_PRIO_1_SHIFT)
+#define I40E_CEE_PGID_STRICT           15
 
 /* Defines for IEEE TSA types */
 #define I40E_IEEE_TSA_STRICT           0
index 00bc0cdb3a0304b87ec9935b148a81c683927f51..183dcb63ce98e14e5b504bed9874911b35ae18d3 100644 (file)
@@ -207,7 +207,7 @@ void i40e_dcbnl_set_all(struct i40e_vsi *vsi)
  * VSI
  **/
 static int i40e_dcbnl_vsi_del_app(struct i40e_vsi *vsi,
-                                 struct i40e_ieee_app_priority_table *app)
+                                 struct i40e_dcb_app_priority_table *app)
 {
        struct net_device *dev = vsi->netdev;
        struct dcb_app sapp;
@@ -229,7 +229,7 @@ static int i40e_dcbnl_vsi_del_app(struct i40e_vsi *vsi,
  * 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)
+                              struct i40e_dcb_app_priority_table *app)
 {
        int v, err;
        for (v = 0; v < pf->num_alloc_vsi; v++) {
@@ -252,7 +252,7 @@ static void i40e_dcbnl_del_app(struct i40e_pf *pf,
  * 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)
+                               struct i40e_dcb_app_priority_table *app)
 {
        int i;
 
@@ -277,7 +277,7 @@ static bool i40e_dcbnl_find_app(struct i40e_dcbx_config *cfg,
 void i40e_dcbnl_flush_apps(struct i40e_pf *pf,
                           struct i40e_dcbx_config *new_cfg)
 {
-       struct i40e_ieee_app_priority_table app;
+       struct i40e_dcb_app_priority_table app;
        struct i40e_dcbx_config *dcbxcfg;
        struct i40e_hw *hw = &pf->hw;
        int i;
index a03f4590cb0fbac6dc74308ea230dbfb18a95329..3a3c237b76d4c1cfc5089c91216315140dde7892 100644 (file)
@@ -1312,6 +1312,8 @@ static ssize_t i40e_dbg_command_write(struct file *filp,
                        kfree(bw_data);
                        bw_data = NULL;
 
+                       dev_info(&pf->pdev->dev,
+                                "port dcbx_mode=%d\n", cfg->dcbx_mode);
                        dev_info(&pf->pdev->dev,
                                 "port ets_cfg: willing=%d cbs=%d, maxtcs=%d\n",
                                 cfg->etscfg.willing, cfg->etscfg.cbs,
index 5d01db1d789b0c64ddf4871a06fee3a34a19af8f..a8b8bd95108dd587bd961d144af334fb175da7f7 100644 (file)
@@ -343,7 +343,7 @@ int i40e_init_pf_fcoe(struct i40e_pf *pf)
  **/
 u8 i40e_get_fcoe_tc_map(struct i40e_pf *pf)
 {
-       struct i40e_ieee_app_priority_table app;
+       struct i40e_dcb_app_priority_table app;
        struct i40e_hw *hw = &pf->hw;
        u8 enabled_tc = 0;
        u8 tc, i;
index 185f977e8a9841dcbfe84d139ee6acbc314be78f..99b985cb53d528da3e615228e6ac71848a618653 100644 (file)
@@ -4442,6 +4442,8 @@ static int i40e_init_pf_dcb(struct i40e_pf *pf)
                        /* Enable DCB tagging only when more than one TC */
                        if (i40e_dcb_get_num_tc(&hw->local_dcbx_config) > 1)
                                pf->flags |= I40E_FLAG_DCB_ENABLED;
+                       dev_dbg(&pf->pdev->dev,
+                               "DCBX offload is supported for this PF.\n");
                }
        } else {
                dev_info(&pf->pdev->dev, "AQ Querying DCB configuration failed: %d\n",
@@ -5023,6 +5025,8 @@ bool i40e_dcb_need_reconfig(struct i40e_pf *pf,
                dev_dbg(&pf->pdev->dev, "APP Table change detected.\n");
        }
 
+       dev_dbg(&pf->pdev->dev, "%s: need_reconfig=%d\n", __func__,
+               need_reconfig);
        return need_reconfig;
 }
 
@@ -5050,11 +5054,16 @@ static int i40e_handle_lldp_event(struct i40e_pf *pf,
        /* Ignore if event is not for Nearest Bridge */
        type = ((mib->type >> I40E_AQ_LLDP_BRIDGE_TYPE_SHIFT)
                & I40E_AQ_LLDP_BRIDGE_TYPE_MASK);
+       dev_dbg(&pf->pdev->dev,
+               "%s: LLDP event mib bridge type 0x%x\n", __func__, type);
        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;
+       dev_dbg(&pf->pdev->dev,
+               "%s: LLDP event mib type %s\n", __func__,
+               type ? "remote" : "local");
        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,
@@ -5063,12 +5072,14 @@ static int i40e_handle_lldp_event(struct i40e_pf *pf,
                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);
+       /* Store the old configuration */
+       tmp_dcbx_cfg = *dcbx_cfg;
+
+       /* Get updated DCBX data from firmware */
+       ret = i40e_get_dcb_config(&pf->hw);
        if (ret) {
-               /* Error in LLDPDU parsing return */
-               dev_info(&pf->pdev->dev, "Failed parsing LLDPDU from event buffer\n");
+               dev_info(&pf->pdev->dev, "Failed querying DCB configuration data from firmware.\n");
                goto exit;
        }
 
@@ -5078,12 +5089,9 @@ static int i40e_handle_lldp_event(struct i40e_pf *pf,
                goto exit;
        }
 
-       need_reconfig = i40e_dcb_need_reconfig(pf, dcbx_cfg, &tmp_dcbx_cfg);
-
-       i40e_dcbnl_flush_apps(pf, &tmp_dcbx_cfg);
+       need_reconfig = i40e_dcb_need_reconfig(pf, &tmp_dcbx_cfg, dcbx_cfg);
 
-       /* Overwrite the new configuration */
-       *dcbx_cfg = tmp_dcbx_cfg;
+       i40e_dcbnl_flush_apps(pf, dcbx_cfg);
 
        if (!need_reconfig)
                goto exit;
index 98a735cdf03815b21314b9b6a23ab7184bb39ea8..24bdc4333dc644103a7c9a79268c5a23c472a164 100644 (file)
@@ -175,6 +175,9 @@ i40e_status i40e_aq_stop_lldp(struct i40e_hw *hw, bool shutdown_agent,
                                struct i40e_asq_cmd_details *cmd_details);
 i40e_status i40e_aq_start_lldp(struct i40e_hw *hw,
                                struct i40e_asq_cmd_details *cmd_details);
+i40e_status i40e_aq_get_cee_dcb_config(struct i40e_hw *hw,
+                                      void *buff, u16 buff_size,
+                                      struct i40e_asq_cmd_details *cmd_details);
 i40e_status i40e_aq_add_udp_tunnel(struct i40e_hw *hw,
                                u16 udp_port, u8 protocol_index,
                                u8 *filter_index,
index 3a237c3d0dcbe323ace097302a6110e3c939370e..afe2539b49d633de0ce03158312f51ec5ae5fc30 100644 (file)
@@ -381,9 +381,18 @@ struct i40e_fc_info {
 #define I40E_MAX_USER_PRIORITY         8
 #define I40E_DCBX_MAX_APPS             32
 #define I40E_LLDPDU_SIZE               1500
-
-/* IEEE 802.1Qaz ETS Configuration data */
-struct i40e_ieee_ets_config {
+#define I40E_TLV_STATUS_OPER           0x1
+#define I40E_TLV_STATUS_SYNC           0x2
+#define I40E_TLV_STATUS_ERR            0x4
+#define I40E_CEE_OPER_MAX_APPS         3
+#define I40E_APP_PROTOID_FCOE          0x8906
+#define I40E_APP_PROTOID_ISCSI         0x0cbc
+#define I40E_APP_PROTOID_FIP           0x8914
+#define I40E_APP_SEL_ETHTYPE           0x1
+#define I40E_APP_SEL_TCPIP             0x2
+
+/* CEE or IEEE 802.1Qaz ETS Configuration data */
+struct i40e_dcb_ets_config {
        u8 willing;
        u8 cbs;
        u8 maxtcs;
@@ -392,34 +401,30 @@ struct i40e_ieee_ets_config {
        u8 tsatable[I40E_MAX_TRAFFIC_CLASS];
 };
 
-/* IEEE 802.1Qaz ETS Recommendation data */
-struct i40e_ieee_ets_recommend {
-       u8 prioritytable[I40E_MAX_TRAFFIC_CLASS];
-       u8 tcbwtable[I40E_MAX_TRAFFIC_CLASS];
-       u8 tsatable[I40E_MAX_TRAFFIC_CLASS];
-};
-
-/* IEEE 802.1Qaz PFC Configuration data */
-struct i40e_ieee_pfc_config {
+/* CEE or IEEE 802.1Qaz PFC Configuration data */
+struct i40e_dcb_pfc_config {
        u8 willing;
        u8 mbc;
        u8 pfccap;
        u8 pfcenable;
 };
 
-/* IEEE 802.1Qaz Application Priority data */
-struct i40e_ieee_app_priority_table {
+/* CEE or IEEE 802.1Qaz Application Priority data */
+struct i40e_dcb_app_priority_table {
        u8  priority;
        u8  selector;
        u16 protocolid;
 };
 
 struct i40e_dcbx_config {
+       u8  dcbx_mode;
+#define I40E_DCBX_MODE_CEE     0x1
+#define I40E_DCBX_MODE_IEEE    0x2
        u32 numapps;
-       struct i40e_ieee_ets_config etscfg;
-       struct i40e_ieee_ets_recommend etsrec;
-       struct i40e_ieee_pfc_config pfc;
-       struct i40e_ieee_app_priority_table app[I40E_DCBX_MAX_APPS];
+       struct i40e_dcb_ets_config etscfg;
+       struct i40e_dcb_ets_config etsrec;
+       struct i40e_dcb_pfc_config pfc;
+       struct i40e_dcb_app_priority_table app[I40E_DCBX_MAX_APPS];
 };
 
 /* Port hardware description */