net/ice/base: support DCB
authorQi Zhang <qi.z.zhang@intel.com>
Mon, 25 Mar 2019 05:44:45 +0000 (13:44 +0800)
committerFerruh Yigit <ferruh.yigit@intel.com>
Fri, 29 Mar 2019 16:25:31 +0000 (17:25 +0100)
Add module to support DCB related features.

Signed-off-by: Paul M Stillwell Jr <paul.m.stillwell.jr@intel.com>
Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
Reviewed-by: Qiming Yang <qiming.yang@intel.com>
Reviewed-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
drivers/net/ice/Makefile
drivers/net/ice/base/ice_adminq_cmd.h
drivers/net/ice/base/ice_common.c
drivers/net/ice/base/ice_dcb.c [new file with mode: 0644]
drivers/net/ice/base/ice_dcb.h [new file with mode: 0644]
drivers/net/ice/base/ice_status.h
drivers/net/ice/base/ice_type.h
drivers/net/ice/base/meson.build

index 5ba59f4..854e40e 100644 (file)
@@ -51,6 +51,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_switch.c
 SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_nvm.c
 SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_flex_pipe.c
 SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_flow.c
+SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_dcb.c
 
 SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_ethdev.c
 SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_rxtx.c
index 81a331b..4c5cf54 100644 (file)
@@ -100,6 +100,7 @@ struct ice_aqc_list_caps_elem {
        __le16 cap;
 #define ICE_AQC_CAPS_VALID_FUNCTIONS                   0x0005
 #define ICE_AQC_CAPS_VSI                               0x0017
+#define ICE_AQC_CAPS_DCB                               0x0018
 #define ICE_AQC_CAPS_RSS                               0x0040
 #define ICE_AQC_CAPS_RXQS                              0x0041
 #define ICE_AQC_CAPS_TXQS                              0x0042
@@ -894,6 +895,40 @@ struct ice_aqc_sw_rules_elem {
 #pragma pack()
 
 
+/* PFC Ignore (direct 0x0301)
+ * The command and response use the same descriptor structure
+ */
+struct ice_aqc_pfc_ignore {
+       u8      tc_bitmap;
+       u8      cmd_flags; /* unused in response */
+#define ICE_AQC_PFC_IGNORE_SET         BIT(7)
+#define ICE_AQC_PFC_IGNORE_CLEAR       0
+       u8      reserved[14];
+};
+
+/* Set PFC Mode (direct 0x0303)
+ * Query PFC Mode (direct 0x0302)
+ */
+struct ice_aqc_set_query_pfc_mode {
+       u8      pfc_mode;
+/* For Set Command response, reserved in all other cases */
+#define ICE_AQC_PFC_NOT_CONFIGURED     0
+/* For Query Command response, reserved in all other cases */
+#define ICE_AQC_DCB_DIS                0
+#define ICE_AQC_PFC_VLAN_BASED_PFC     1
+#define ICE_AQC_PFC_DSCP_BASED_PFC     2
+       u8      rsvd[15];
+};
+
+/* Set DCB Parameters (direct 0x0306) */
+struct ice_aqc_set_dcb_params {
+       u8 cmd_flags; /* unused in response */
+#define ICE_AQC_LINK_UP_DCB_CFG    BIT(0)
+       u8 valid_flags; /* unused in response */
+#define ICE_AQC_LINK_UP_DCB_CFG_VALID    BIT(0)
+       u8 rsvd[14];
+};
+
 
 /* Get Default Topology (indirect 0x0400) */
 struct ice_aqc_get_topo {
@@ -1027,6 +1062,32 @@ struct ice_aqc_delete_elem {
 };
 
 
+/* Query Port ETS (indirect 0x040E)
+ *
+ * This indirect command is used to query port TC node configuration.
+ */
+struct ice_aqc_query_port_ets {
+       __le32 port_teid;
+       __le32 reserved;
+       __le32 addr_high;
+       __le32 addr_low;
+};
+
+struct ice_aqc_port_ets_elem {
+       u8 tc_valid_bits;
+       u8 reserved[3];
+       /* 3 bits for UP per TC 0-7, 4th byte reserved */
+       __le32 up2tc;
+       u8 tc_bw_share[8];
+       __le32 port_eir_prof_id;
+       __le32 port_cir_prof_id;
+       /* 3 bits per Node priority to TC 0-7, 4th byte reserved */
+       __le32 tc_node_prio;
+#define ICE_TC_NODE_PRIO_S     0x4
+       u8 reserved1[4];
+       __le32 tc_node_teid[8]; /* Used for response, reserved in command */
+};
+
 
 /* Rate limiting profile for
  * Add RL profile (indirect 0x0410)
@@ -1578,6 +1639,157 @@ struct ice_aqc_nvm_checksum {
 
 
 
+/* Get LLDP MIB (indirect 0x0A00)
+ * Note: This is also used by the LLDP MIB Change Event (0x0A01)
+ * as the format is the same.
+ */
+struct ice_aqc_lldp_get_mib {
+       u8 type;
+#define ICE_AQ_LLDP_MIB_TYPE_S                 0
+#define ICE_AQ_LLDP_MIB_TYPE_M                 (0x3 << ICE_AQ_LLDP_MIB_TYPE_S)
+#define ICE_AQ_LLDP_MIB_LOCAL                  0
+#define ICE_AQ_LLDP_MIB_REMOTE                 1
+#define ICE_AQ_LLDP_MIB_LOCAL_AND_REMOTE       2
+#define ICE_AQ_LLDP_BRID_TYPE_S                        2
+#define ICE_AQ_LLDP_BRID_TYPE_M                        (0x3 << ICE_AQ_LLDP_BRID_TYPE_S)
+#define ICE_AQ_LLDP_BRID_TYPE_NEAREST_BRID     0
+#define ICE_AQ_LLDP_BRID_TYPE_NON_TPMR         1
+/* Tx pause flags in the 0xA01 event use ICE_AQ_LLDP_TX_* */
+#define ICE_AQ_LLDP_TX_S                       0x4
+#define ICE_AQ_LLDP_TX_M                       (0x03 << ICE_AQ_LLDP_TX_S)
+#define ICE_AQ_LLDP_TX_ACTIVE                  0
+#define ICE_AQ_LLDP_TX_SUSPENDED               1
+#define ICE_AQ_LLDP_TX_FLUSHED                 3
+/* The following bytes are reserved for the Get LLDP MIB command (0x0A00)
+ * and in the LLDP MIB Change Event (0x0A01). They are valid for the
+ * Get LLDP MIB (0x0A00) response only.
+ */
+       u8 reserved1;
+       __le16 local_len;
+       __le16 remote_len;
+       u8 reserved2[2];
+       __le32 addr_high;
+       __le32 addr_low;
+};
+
+/* Configure LLDP MIB Change Event (direct 0x0A01) */
+/* For MIB Change Event use ice_aqc_lldp_get_mib structure above */
+struct ice_aqc_lldp_set_mib_change {
+       u8 command;
+#define ICE_AQ_LLDP_MIB_UPDATE_ENABLE          0x0
+#define ICE_AQ_LLDP_MIB_UPDATE_DIS             0x1
+       u8 reserved[15];
+};
+
+/* Add LLDP TLV (indirect 0x0A02)
+ * Delete LLDP TLV (indirect 0x0A04)
+ */
+struct ice_aqc_lldp_add_delete_tlv {
+       u8 type; /* only nearest bridge and non-TPMR from 0x0A00 */
+       u8 reserved1[1];
+       __le16 len;
+       u8 reserved2[4];
+       __le32 addr_high;
+       __le32 addr_low;
+};
+
+/* Update LLDP TLV (indirect 0x0A03) */
+struct ice_aqc_lldp_update_tlv {
+       u8 type; /* only nearest bridge and non-TPMR from 0x0A00 */
+       u8 reserved;
+       __le16 old_len;
+       __le16 new_offset;
+       __le16 new_len;
+       __le32 addr_high;
+       __le32 addr_low;
+};
+
+/* Stop LLDP (direct 0x0A05) */
+struct ice_aqc_lldp_stop {
+       u8 command;
+#define ICE_AQ_LLDP_AGENT_STATE_MASK   BIT(0)
+#define ICE_AQ_LLDP_AGENT_STOP         0x0
+#define ICE_AQ_LLDP_AGENT_SHUTDOWN     ICE_AQ_LLDP_AGENT_STATE_MASK
+#define ICE_AQ_LLDP_AGENT_PERSIST_DIS  BIT(1)
+       u8 reserved[15];
+};
+
+/* Start LLDP (direct 0x0A06) */
+struct ice_aqc_lldp_start {
+       u8 command;
+#define ICE_AQ_LLDP_AGENT_START                BIT(0)
+#define ICE_AQ_LLDP_AGENT_PERSIST_ENA  BIT(1)
+       u8 reserved[15];
+};
+
+/* Get CEE DCBX Oper Config (0x0A07)
+ * The command uses the generic descriptor struct and
+ * returns the struct below as an indirect response.
+ */
+struct ice_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;
+#define ICE_AQC_CEE_APP_FCOE_S         0
+#define ICE_AQC_CEE_APP_FCOE_M         (0x7 << ICE_AQC_CEE_APP_FCOE_S)
+#define ICE_AQC_CEE_APP_ISCSI_S                3
+#define ICE_AQC_CEE_APP_ISCSI_M                (0x7 << ICE_AQC_CEE_APP_ISCSI_S)
+#define ICE_AQC_CEE_APP_FIP_S          8
+#define ICE_AQC_CEE_APP_FIP_M          (0x7 << ICE_AQC_CEE_APP_FIP_S)
+       __le32 tlv_status;
+#define ICE_AQC_CEE_PG_STATUS_S                0
+#define ICE_AQC_CEE_PG_STATUS_M                (0x7 << ICE_AQC_CEE_PG_STATUS_S)
+#define ICE_AQC_CEE_PFC_STATUS_S       3
+#define ICE_AQC_CEE_PFC_STATUS_M       (0x7 << ICE_AQC_CEE_PFC_STATUS_S)
+#define ICE_AQC_CEE_FCOE_STATUS_S      8
+#define ICE_AQC_CEE_FCOE_STATUS_M      (0x7 << ICE_AQC_CEE_FCOE_STATUS_S)
+#define ICE_AQC_CEE_ISCSI_STATUS_S     11
+#define ICE_AQC_CEE_ISCSI_STATUS_M     (0x7 << ICE_AQC_CEE_ISCSI_STATUS_S)
+#define ICE_AQC_CEE_FIP_STATUS_S       16
+#define ICE_AQC_CEE_FIP_STATUS_M       (0x7 << ICE_AQC_CEE_FIP_STATUS_S)
+       u8 reserved[12];
+};
+
+/* Set Local LLDP MIB (indirect 0x0A08)
+ * Used to replace the local MIB of a given LLDP agent. e.g. DCBx
+ */
+struct ice_aqc_lldp_set_local_mib {
+       u8 type;
+#define SET_LOCAL_MIB_TYPE_DCBX_M              BIT(0)
+#define SET_LOCAL_MIB_TYPE_LOCAL_MIB           0
+#define SET_LOCAL_MIB_TYPE_CEE_M               BIT(1)
+#define SET_LOCAL_MIB_TYPE_CEE_WILLING         0
+#define SET_LOCAL_MIB_TYPE_CEE_NON_WILLING     SET_LOCAL_MIB_TYPE_CEE_M
+       u8 reserved0;
+       __le16 length;
+       u8 reserved1[4];
+       __le32 addr_high;
+       __le32 addr_low;
+};
+
+struct ice_aqc_lldp_set_local_mib_resp {
+       u8 status;
+#define SET_LOCAL_MIB_RESP_EVENT_M             BIT(0)
+#define SET_LOCAL_MIB_RESP_MIB_CHANGE_SILENT   0
+#define SET_LOCAL_MIB_RESP_MIB_CHANGE_EVENT    SET_LOCAL_MIB_RESP_EVENT_M
+       u8 reserved[15];
+};
+
+/* Stop/Start LLDP Agent (direct 0x0A09)
+ * Used for stopping/starting specific LLDP agent. e.g. DCBx.
+ * The same structure is used for the response, with the command field
+ * being used as the status field.
+ */
+struct ice_aqc_lldp_stop_start_specific_agent {
+       u8 command;
+#define ICE_AQC_START_STOP_AGENT_M             BIT(0)
+#define ICE_AQC_START_STOP_AGENT_STOP_DCBX     0
+#define ICE_AQC_START_STOP_AGENT_START_DCBX    ICE_AQC_START_STOP_AGENT_M
+       u8 reserved[15];
+};
+
 
 /* Get/Set RSS key (indirect 0x0B04/0x0B02) */
 struct ice_aqc_get_set_rss_key {
@@ -1980,10 +2192,22 @@ struct ice_aq_desc {
                struct ice_aqc_query_txsched_res query_sched_res;
                struct ice_aqc_query_node_to_root query_node_to_root;
                struct ice_aqc_cfg_l2_node_cgd cfg_l2_node_cgd;
+               struct ice_aqc_query_port_ets port_ets;
                struct ice_aqc_rl_profile rl_profile;
                struct ice_aqc_nvm nvm;
                struct ice_aqc_nvm_cfg nvm_cfg;
                struct ice_aqc_nvm_checksum nvm_checksum;
+               struct ice_aqc_pfc_ignore pfc_ignore;
+               struct ice_aqc_set_query_pfc_mode set_query_pfc_mode;
+               struct ice_aqc_set_dcb_params set_dcb_params;
+               struct ice_aqc_lldp_get_mib lldp_get_mib;
+               struct ice_aqc_lldp_set_mib_change lldp_set_event;
+               struct ice_aqc_lldp_add_delete_tlv lldp_add_delete_tlv;
+               struct ice_aqc_lldp_update_tlv lldp_update_tlv;
+               struct ice_aqc_lldp_stop lldp_stop;
+               struct ice_aqc_lldp_start lldp_start;
+               struct ice_aqc_lldp_set_local_mib lldp_set_mib;
+               struct ice_aqc_lldp_stop_start_specific_agent lldp_agent_ctrl;
                struct ice_aqc_get_set_rss_lut get_set_rss_lut;
                struct ice_aqc_get_set_rss_key get_set_rss_key;
                struct ice_aqc_add_txqs add_txqs;
@@ -2096,6 +2320,8 @@ enum ice_adminq_opc {
        /* PXE */
        ice_aqc_opc_clear_pxe_mode                      = 0x0110,
 
+       ice_aqc_opc_config_no_drop_policy               = 0x0112,
+
        /* internal switch commands */
        ice_aqc_opc_get_sw_cfg                          = 0x0200,
 
@@ -2127,6 +2353,11 @@ enum ice_adminq_opc {
        ice_aqc_opc_get_sw_rules                        = 0x02A3,
        ice_aqc_opc_clear_pf_cfg                        = 0x02A4,
 
+       /* DCB commands */
+       ice_aqc_opc_pfc_ignore                          = 0x0301,
+       ice_aqc_opc_query_pfc_mode                      = 0x0302,
+       ice_aqc_opc_set_pfc_mode                        = 0x0303,
+       ice_aqc_opc_set_dcb_params                      = 0x0306,
 
        /* transmit scheduler commands */
        ice_aqc_opc_get_dflt_topo                       = 0x0400,
@@ -2136,6 +2367,7 @@ enum ice_adminq_opc {
        ice_aqc_opc_move_sched_elems                    = 0x0408,
        ice_aqc_opc_suspend_sched_elems                 = 0x0409,
        ice_aqc_opc_resume_sched_elems                  = 0x040A,
+       ice_aqc_opc_query_port_ets                      = 0x040E,
        ice_aqc_opc_delete_sched_elems                  = 0x040F,
        ice_aqc_opc_add_rl_profiles                     = 0x0410,
        ice_aqc_opc_query_rl_profiles                   = 0x0411,
@@ -2166,6 +2398,17 @@ enum ice_adminq_opc {
        ice_aqc_opc_nvm_cfg_write                       = 0x0705,
        ice_aqc_opc_nvm_checksum                        = 0x0706,
 
+       /* LLDP commands */
+       ice_aqc_opc_lldp_get_mib                        = 0x0A00,
+       ice_aqc_opc_lldp_set_mib_change                 = 0x0A01,
+       ice_aqc_opc_lldp_add_tlv                        = 0x0A02,
+       ice_aqc_opc_lldp_update_tlv                     = 0x0A03,
+       ice_aqc_opc_lldp_delete_tlv                     = 0x0A04,
+       ice_aqc_opc_lldp_stop                           = 0x0A05,
+       ice_aqc_opc_lldp_start                          = 0x0A06,
+       ice_aqc_opc_get_cee_dcb_cfg                     = 0x0A07,
+       ice_aqc_opc_lldp_set_local_mib                  = 0x0A08,
+       ice_aqc_opc_lldp_stop_start_specific_agent      = 0x0A09,
 
        /* RSS commands */
        ice_aqc_opc_set_rss_key                         = 0x0B02,
index 2ebf95e..2025927 100644 (file)
@@ -1930,6 +1930,18 @@ ice_parse_caps(struct ice_hw *hw, void *buf, u32 cap_count,
                                          number);
                        }
                        break;
+               case ICE_AQC_CAPS_DCB:
+                       caps->dcb = (number == 1);
+                       caps->active_tc_bitmap = logical_id;
+                       caps->maxtc = phys_id;
+                       ice_debug(hw, ICE_DBG_INIT,
+                                 "HW caps: DCB = %d\n", caps->dcb);
+                       ice_debug(hw, ICE_DBG_INIT,
+                                 "HW caps: Active TC bitmap = %d\n",
+                                 caps->active_tc_bitmap);
+                       ice_debug(hw, ICE_DBG_INIT,
+                                 "HW caps: TC Max = %d\n", caps->maxtc);
+                       break;
                case ICE_AQC_CAPS_RSS:
                        caps->rss_table_size = number;
                        caps->rss_table_entry_width = logical_id;
diff --git a/drivers/net/ice/base/ice_dcb.c b/drivers/net/ice/base/ice_dcb.c
new file mode 100644 (file)
index 0000000..a781057
--- /dev/null
@@ -0,0 +1,1393 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2001-2019
+ */
+
+#include "ice_common.h"
+#include "ice_sched.h"
+#include "ice_dcb.h"
+
+/**
+ * ice_aq_get_lldp_mib
+ * @hw: pointer to the HW struct
+ * @bridge_type: type of bridge requested
+ * @mib_type: Local, Remote or both Local and Remote MIBs
+ * @buf: pointer to the caller-supplied buffer to store the MIB block
+ * @buf_size: size of the buffer (in bytes)
+ * @local_len: length of the returned Local LLDP MIB
+ * @remote_len: length of the returned Remote LLDP MIB
+ * @cd: pointer to command details structure or NULL
+ *
+ * Requests the complete LLDP MIB (entire packet). (0x0A00)
+ */
+enum ice_status
+ice_aq_get_lldp_mib(struct ice_hw *hw, u8 bridge_type, u8 mib_type, void *buf,
+                   u16 buf_size, u16 *local_len, u16 *remote_len,
+                   struct ice_sq_cd *cd)
+{
+       struct ice_aqc_lldp_get_mib *cmd;
+       struct ice_aq_desc desc;
+       enum ice_status status;
+
+       cmd = &desc.params.lldp_get_mib;
+
+       if (buf_size == 0 || !buf)
+               return ICE_ERR_PARAM;
+
+       ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_lldp_get_mib);
+
+       cmd->type = mib_type & ICE_AQ_LLDP_MIB_TYPE_M;
+       cmd->type |= (bridge_type << ICE_AQ_LLDP_BRID_TYPE_S) &
+               ICE_AQ_LLDP_BRID_TYPE_M;
+
+       desc.datalen = CPU_TO_LE16(buf_size);
+
+       status = ice_aq_send_cmd(hw, &desc, buf, buf_size, cd);
+       if (!status) {
+               if (local_len)
+                       *local_len = LE16_TO_CPU(cmd->local_len);
+               if (remote_len)
+                       *remote_len = LE16_TO_CPU(cmd->remote_len);
+       }
+
+       return status;
+}
+
+/**
+ * ice_aq_cfg_lldp_mib_change
+ * @hw: pointer to the HW struct
+ * @ena_update: Enable or Disable event posting
+ * @cd: pointer to command details structure or NULL
+ *
+ * Enable or Disable posting of an event on ARQ when LLDP MIB
+ * associated with the interface changes (0x0A01)
+ */
+enum ice_status
+ice_aq_cfg_lldp_mib_change(struct ice_hw *hw, bool ena_update,
+                          struct ice_sq_cd *cd)
+{
+       struct ice_aqc_lldp_set_mib_change *cmd;
+       struct ice_aq_desc desc;
+
+       cmd = &desc.params.lldp_set_event;
+
+       ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_lldp_set_mib_change);
+
+       if (!ena_update)
+               cmd->command |= ICE_AQ_LLDP_MIB_UPDATE_DIS;
+
+       return ice_aq_send_cmd(hw, &desc, NULL, 0, cd);
+}
+
+/**
+ * ice_aq_stop_lldp
+ * @hw: pointer to the HW struct
+ * @shutdown_lldp_agent: True if LLDP Agent needs to be Shutdown
+ *                      False if LLDP Agent needs to be Stopped
+ * @cd: pointer to command details structure or NULL
+ *
+ * Stop or Shutdown the embedded LLDP Agent (0x0A05)
+ */
+enum ice_status
+ice_aq_stop_lldp(struct ice_hw *hw, bool shutdown_lldp_agent,
+                struct ice_sq_cd *cd)
+{
+       struct ice_aqc_lldp_stop *cmd;
+       struct ice_aq_desc desc;
+
+       cmd = &desc.params.lldp_stop;
+
+       ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_lldp_stop);
+
+       if (shutdown_lldp_agent)
+               cmd->command |= ICE_AQ_LLDP_AGENT_SHUTDOWN;
+
+       return ice_aq_send_cmd(hw, &desc, NULL, 0, cd);
+}
+
+/**
+ * ice_aq_start_lldp
+ * @hw: pointer to the HW struct
+ * @cd: pointer to command details structure or NULL
+ *
+ * Start the embedded LLDP Agent on all ports. (0x0A06)
+ */
+enum ice_status ice_aq_start_lldp(struct ice_hw *hw, struct ice_sq_cd *cd)
+{
+       struct ice_aqc_lldp_start *cmd;
+       struct ice_aq_desc desc;
+
+       cmd = &desc.params.lldp_start;
+
+       ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_lldp_start);
+
+       cmd->command = ICE_AQ_LLDP_AGENT_START;
+
+       return ice_aq_send_cmd(hw, &desc, NULL, 0, cd);
+}
+
+/**
+ * ice_aq_set_lldp_mib - Set the LLDP MIB
+ * @hw: pointer to the HW struct
+ * @mib_type: Local, Remote or both Local and Remote MIBs
+ * @buf: pointer to the caller-supplied buffer to store the MIB block
+ * @buf_size: size of the buffer (in bytes)
+ * @cd: pointer to command details structure or NULL
+ *
+ * Set the LLDP MIB. (0x0A08)
+ */
+enum ice_status
+ice_aq_set_lldp_mib(struct ice_hw *hw, u8 mib_type, void *buf, u16 buf_size,
+                   struct ice_sq_cd *cd)
+{
+       struct ice_aqc_lldp_set_local_mib *cmd;
+       struct ice_aq_desc desc;
+
+       cmd = &desc.params.lldp_set_mib;
+
+       if (buf_size == 0 || !buf)
+               return ICE_ERR_PARAM;
+
+       ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_lldp_set_local_mib);
+
+       desc.flags |= CPU_TO_LE16((u16)ICE_AQ_FLAG_RD);
+       desc.datalen = CPU_TO_LE16(buf_size);
+
+       cmd->type = mib_type;
+       cmd->length = CPU_TO_LE16(buf_size);
+
+       return ice_aq_send_cmd(hw, &desc, buf, buf_size, cd);
+}
+
+/**
+ * ice_get_dcbx_status
+ * @hw: pointer to the HW struct
+ *
+ * Get the DCBX status from the Firmware
+ */
+u8 ice_get_dcbx_status(struct ice_hw *hw)
+{
+       u32 reg;
+
+       reg = rd32(hw, PRTDCB_GENS);
+       return (u8)((reg & PRTDCB_GENS_DCBX_STATUS_M) >>
+                   PRTDCB_GENS_DCBX_STATUS_S);
+}
+
+/**
+ * ice_parse_ieee_ets_common_tlv
+ * @buf: Data buffer to be parsed for ETS CFG/REC data
+ * @ets_cfg: Container to store parsed data
+ *
+ * Parses the common data of IEEE 802.1Qaz ETS CFG/REC TLV
+ */
+static void
+ice_parse_ieee_ets_common_tlv(u8 *buf, struct ice_dcb_ets_cfg *ets_cfg)
+{
+       u8 offset = 0;
+       int i;
+
+       /* Priority Assignment Table (4 octets)
+        * Octets:|    1    |    2    |    3    |    4    |
+        *        -----------------------------------------
+        *        |pri0|pri1|pri2|pri3|pri4|pri5|pri6|pri7|
+        *        -----------------------------------------
+        *   Bits:|7  4|3  0|7  4|3  0|7  4|3  0|7  4|3  0|
+        *        -----------------------------------------
+        */
+       for (i = 0; i < 4; i++) {
+               ets_cfg->prio_table[i * 2] =
+                       ((buf[offset] & ICE_IEEE_ETS_PRIO_1_M) >>
+                        ICE_IEEE_ETS_PRIO_1_S);
+               ets_cfg->prio_table[i * 2 + 1] =
+                       ((buf[offset] & ICE_IEEE_ETS_PRIO_0_M) >>
+                        ICE_IEEE_ETS_PRIO_0_S);
+               offset++;
+       }
+
+       /* TC Bandwidth Table (8 octets)
+        * Octets:| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 |
+        *        ---------------------------------
+        *        |tc0|tc1|tc2|tc3|tc4|tc5|tc6|tc7|
+        *        ---------------------------------
+        *
+        * TSA Assignment Table (8 octets)
+        * Octets:| 9 | 10| 11| 12| 13| 14| 15| 16|
+        *        ---------------------------------
+        *        |tc0|tc1|tc2|tc3|tc4|tc5|tc6|tc7|
+        *        ---------------------------------
+        */
+       ice_for_each_traffic_class(i) {
+               ets_cfg->tcbwtable[i] = buf[offset];
+               ets_cfg->tsatable[i] = buf[ICE_MAX_TRAFFIC_CLASS + offset++];
+       }
+}
+
+/**
+ * ice_parse_ieee_etscfg_tlv
+ * @tlv: IEEE 802.1Qaz ETS CFG TLV
+ * @dcbcfg: Local store to update ETS CFG data
+ *
+ * Parses IEEE 802.1Qaz ETS CFG TLV
+ */
+static void
+ice_parse_ieee_etscfg_tlv(struct ice_lldp_org_tlv *tlv,
+                         struct ice_dcbx_cfg *dcbcfg)
+{
+       struct ice_dcb_ets_cfg *etscfg;
+       u8 *buf = tlv->tlvinfo;
+
+       /* First Octet post subtype
+        * --------------------------
+        * |will-|CBS  | Re-  | Max |
+        * |ing  |     |served| TCs |
+        * --------------------------
+        * |1bit | 1bit|3 bits|3bits|
+        */
+       etscfg = &dcbcfg->etscfg;
+       etscfg->willing = ((buf[0] & ICE_IEEE_ETS_WILLING_M) >>
+                          ICE_IEEE_ETS_WILLING_S);
+       etscfg->cbs = ((buf[0] & ICE_IEEE_ETS_CBS_M) >> ICE_IEEE_ETS_CBS_S);
+       etscfg->maxtcs = ((buf[0] & ICE_IEEE_ETS_MAXTC_M) >>
+                         ICE_IEEE_ETS_MAXTC_S);
+
+       /* Begin parsing at Priority Assignment Table (offset 1 in buf) */
+       ice_parse_ieee_ets_common_tlv(&buf[1], etscfg);
+}
+
+/**
+ * ice_parse_ieee_etsrec_tlv
+ * @tlv: IEEE 802.1Qaz ETS REC TLV
+ * @dcbcfg: Local store to update ETS REC data
+ *
+ * Parses IEEE 802.1Qaz ETS REC TLV
+ */
+static void
+ice_parse_ieee_etsrec_tlv(struct ice_lldp_org_tlv *tlv,
+                         struct ice_dcbx_cfg *dcbcfg)
+{
+       u8 *buf = tlv->tlvinfo;
+
+       /* Begin parsing at Priority Assignment Table (offset 1 in buf) */
+       ice_parse_ieee_ets_common_tlv(&buf[1], &dcbcfg->etsrec);
+}
+
+/**
+ * ice_parse_ieee_pfccfg_tlv
+ * @tlv: IEEE 802.1Qaz PFC CFG TLV
+ * @dcbcfg: Local store to update PFC CFG data
+ *
+ * Parses IEEE 802.1Qaz PFC CFG TLV
+ */
+static void
+ice_parse_ieee_pfccfg_tlv(struct ice_lldp_org_tlv *tlv,
+                         struct ice_dcbx_cfg *dcbcfg)
+{
+       u8 *buf = tlv->tlvinfo;
+
+       /* ----------------------------------------
+        * |will-|MBC  | Re-  | PFC |  PFC Enable  |
+        * |ing  |     |served| cap |              |
+        * -----------------------------------------
+        * |1bit | 1bit|2 bits|4bits| 1 octet      |
+        */
+       dcbcfg->pfc.willing = ((buf[0] & ICE_IEEE_PFC_WILLING_M) >>
+                              ICE_IEEE_PFC_WILLING_S);
+       dcbcfg->pfc.mbc = ((buf[0] & ICE_IEEE_PFC_MBC_M) >> ICE_IEEE_PFC_MBC_S);
+       dcbcfg->pfc.pfccap = ((buf[0] & ICE_IEEE_PFC_CAP_M) >>
+                             ICE_IEEE_PFC_CAP_S);
+       dcbcfg->pfc.pfcena = buf[1];
+}
+
+/**
+ * ice_parse_ieee_app_tlv
+ * @tlv: IEEE 802.1Qaz APP TLV
+ * @dcbcfg: Local store to update APP PRIO data
+ *
+ * Parses IEEE 802.1Qaz APP PRIO TLV
+ */
+static void
+ice_parse_ieee_app_tlv(struct ice_lldp_org_tlv *tlv,
+                      struct ice_dcbx_cfg *dcbcfg)
+{
+       u16 offset = 0;
+       u16 typelen;
+       int i = 0;
+       u16 len;
+       u8 *buf;
+
+       typelen = NTOHS(tlv->typelen);
+       len = ((typelen & ICE_LLDP_TLV_LEN_M) >> ICE_LLDP_TLV_LEN_S);
+       buf = tlv->tlvinfo;
+
+       /* Removing sizeof(ouisubtype) and reserved byte from len.
+        * Remaining len div 3 is number of APP TLVs.
+        */
+       len -= (sizeof(tlv->ouisubtype) + 1);
+
+       /* Move offset to App Priority Table */
+       offset++;
+
+       /* Application Priority Table (3 octets)
+        * Octets:|         1          |    2    |    3    |
+        *        -----------------------------------------
+        *        |Priority|Rsrvd| Sel |    Protocol ID    |
+        *        -----------------------------------------
+        *   Bits:|23    21|20 19|18 16|15                0|
+        *        -----------------------------------------
+        */
+       while (offset < len) {
+               dcbcfg->app[i].priority = ((buf[offset] &
+                                           ICE_IEEE_APP_PRIO_M) >>
+                                          ICE_IEEE_APP_PRIO_S);
+               dcbcfg->app[i].selector = ((buf[offset] &
+                                           ICE_IEEE_APP_SEL_M) >>
+                                          ICE_IEEE_APP_SEL_S);
+               dcbcfg->app[i].prot_id = (buf[offset + 1] << 0x8) |
+                       buf[offset + 2];
+               /* Move to next app */
+               offset += 3;
+               i++;
+               if (i >= ICE_DCBX_MAX_APPS)
+                       break;
+       }
+
+       dcbcfg->numapps = i;
+}
+
+/**
+ * ice_parse_ieee_tlv
+ * @tlv: IEEE 802.1Qaz TLV
+ * @dcbcfg: Local store to update ETS REC data
+ *
+ * Get the TLV subtype and send it to parsing function
+ * based on the subtype value
+ */
+static void
+ice_parse_ieee_tlv(struct ice_lldp_org_tlv *tlv, struct ice_dcbx_cfg *dcbcfg)
+{
+       u32 ouisubtype;
+       u8 subtype;
+
+       ouisubtype = NTOHL(tlv->ouisubtype);
+       subtype = (u8)((ouisubtype & ICE_LLDP_TLV_SUBTYPE_M) >>
+                      ICE_LLDP_TLV_SUBTYPE_S);
+       switch (subtype) {
+       case ICE_IEEE_SUBTYPE_ETS_CFG:
+               ice_parse_ieee_etscfg_tlv(tlv, dcbcfg);
+               break;
+       case ICE_IEEE_SUBTYPE_ETS_REC:
+               ice_parse_ieee_etsrec_tlv(tlv, dcbcfg);
+               break;
+       case ICE_IEEE_SUBTYPE_PFC_CFG:
+               ice_parse_ieee_pfccfg_tlv(tlv, dcbcfg);
+               break;
+       case ICE_IEEE_SUBTYPE_APP_PRI:
+               ice_parse_ieee_app_tlv(tlv, dcbcfg);
+               break;
+       default:
+               break;
+       }
+}
+
+/**
+ * ice_parse_cee_pgcfg_tlv
+ * @tlv: CEE DCBX PG CFG TLV
+ * @dcbcfg: Local store to update ETS CFG data
+ *
+ * Parses CEE DCBX PG CFG TLV
+ */
+static void
+ice_parse_cee_pgcfg_tlv(struct ice_cee_feat_tlv *tlv,
+                       struct ice_dcbx_cfg *dcbcfg)
+{
+       struct ice_dcb_ets_cfg *etscfg;
+       u8 *buf = tlv->tlvinfo;
+       u16 offset = 0;
+       int i;
+
+       etscfg = &dcbcfg->etscfg;
+
+       if (tlv->en_will_err & ICE_CEE_FEAT_TLV_WILLING_M)
+               etscfg->willing = 1;
+
+       etscfg->cbs = 0;
+       /* Priority Group Table (4 octets)
+        * Octets:|    1    |    2    |    3    |    4    |
+        *        -----------------------------------------
+        *        |pri0|pri1|pri2|pri3|pri4|pri5|pri6|pri7|
+        *        -----------------------------------------
+        *   Bits:|7  4|3  0|7  4|3  0|7  4|3  0|7  4|3  0|
+        *        -----------------------------------------
+        */
+       for (i = 0; i < 4; i++) {
+               etscfg->prio_table[i * 2] =
+                       ((buf[offset] & ICE_CEE_PGID_PRIO_1_M) >>
+                        ICE_CEE_PGID_PRIO_1_S);
+               etscfg->prio_table[i * 2 + 1] =
+                       ((buf[offset] & ICE_CEE_PGID_PRIO_0_M) >>
+                        ICE_CEE_PGID_PRIO_0_S);
+               offset++;
+       }
+
+       /* PG Percentage Table (8 octets)
+        * Octets:| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 |
+        *        ---------------------------------
+        *        |pg0|pg1|pg2|pg3|pg4|pg5|pg6|pg7|
+        *        ---------------------------------
+        */
+       ice_for_each_traffic_class(i)
+               etscfg->tcbwtable[i] = buf[offset++];
+
+       /* Number of TCs supported (1 octet) */
+       etscfg->maxtcs = buf[offset];
+}
+
+/**
+ * ice_parse_cee_pfccfg_tlv
+ * @tlv: CEE DCBX PFC CFG TLV
+ * @dcbcfg: Local store to update PFC CFG data
+ *
+ * Parses CEE DCBX PFC CFG TLV
+ */
+static void
+ice_parse_cee_pfccfg_tlv(struct ice_cee_feat_tlv *tlv,
+                        struct ice_dcbx_cfg *dcbcfg)
+{
+       u8 *buf = tlv->tlvinfo;
+
+       if (tlv->en_will_err & ICE_CEE_FEAT_TLV_WILLING_M)
+               dcbcfg->pfc.willing = 1;
+
+       /* ------------------------
+        * | PFC Enable | PFC TCs |
+        * ------------------------
+        * | 1 octet    | 1 octet |
+        */
+       dcbcfg->pfc.pfcena = buf[0];
+       dcbcfg->pfc.pfccap = buf[1];
+}
+
+/**
+ * ice_parse_cee_app_tlv
+ * @tlv: CEE DCBX APP TLV
+ * @dcbcfg: Local store to update APP PRIO data
+ *
+ * Parses CEE DCBX APP PRIO TLV
+ */
+static void
+ice_parse_cee_app_tlv(struct ice_cee_feat_tlv *tlv, struct ice_dcbx_cfg *dcbcfg)
+{
+       u16 len, typelen, offset = 0;
+       struct ice_cee_app_prio *app;
+       u8 i;
+
+       typelen = NTOHS(tlv->hdr.typelen);
+       len = ((typelen & ICE_LLDP_TLV_LEN_M) >> ICE_LLDP_TLV_LEN_S);
+
+       dcbcfg->numapps = len / sizeof(*app);
+       if (!dcbcfg->numapps)
+               return;
+       if (dcbcfg->numapps > ICE_DCBX_MAX_APPS)
+               dcbcfg->numapps = ICE_DCBX_MAX_APPS;
+
+       for (i = 0; i < dcbcfg->numapps; i++) {
+               u8 up, selector;
+
+               app = (struct ice_cee_app_prio *)(tlv->tlvinfo + offset);
+               for (up = 0; up < ICE_MAX_USER_PRIORITY; up++)
+                       if (app->prio_map & BIT(up))
+                               break;
+
+               dcbcfg->app[i].priority = up;
+
+               /* Get Selector from lower 2 bits, and convert to IEEE */
+               selector = (app->upper_oui_sel & ICE_CEE_APP_SELECTOR_M);
+               switch (selector) {
+               case ICE_CEE_APP_SEL_ETHTYPE:
+                       dcbcfg->app[i].selector = ICE_APP_SEL_ETHTYPE;
+                       break;
+               case ICE_CEE_APP_SEL_TCPIP:
+                       dcbcfg->app[i].selector = ICE_APP_SEL_TCPIP;
+                       break;
+               default:
+                       /* Keep selector as it is for unknown types */
+                       dcbcfg->app[i].selector = selector;
+               }
+
+               dcbcfg->app[i].prot_id = NTOHS(app->protocol);
+               /* Move to next app */
+               offset += sizeof(*app);
+       }
+}
+
+/**
+ * ice_parse_cee_tlv
+ * @tlv: CEE DCBX TLV
+ * @dcbcfg: Local store to update DCBX config data
+ *
+ * Get the TLV subtype and send it to parsing function
+ * based on the subtype value
+ */
+static void
+ice_parse_cee_tlv(struct ice_lldp_org_tlv *tlv, struct ice_dcbx_cfg *dcbcfg)
+{
+       struct ice_cee_feat_tlv *sub_tlv;
+       u8 subtype, feat_tlv_count = 0;
+       u16 len, tlvlen, typelen;
+       u32 ouisubtype;
+
+       ouisubtype = NTOHL(tlv->ouisubtype);
+       subtype = (u8)((ouisubtype & ICE_LLDP_TLV_SUBTYPE_M) >>
+                      ICE_LLDP_TLV_SUBTYPE_S);
+       /* Return if not CEE DCBX */
+       if (subtype != ICE_CEE_DCBX_TYPE)
+               return;
+
+       typelen = NTOHS(tlv->typelen);
+       tlvlen = ((typelen & ICE_LLDP_TLV_LEN_M) >> ICE_LLDP_TLV_LEN_S);
+       len = sizeof(tlv->typelen) + sizeof(ouisubtype) +
+               sizeof(struct ice_cee_ctrl_tlv);
+       /* Return if no CEE DCBX Feature TLVs */
+       if (tlvlen <= len)
+               return;
+
+       sub_tlv = (struct ice_cee_feat_tlv *)((char *)tlv + len);
+       while (feat_tlv_count < ICE_CEE_MAX_FEAT_TYPE) {
+               u16 sublen;
+
+               typelen = NTOHS(sub_tlv->hdr.typelen);
+               sublen = ((typelen & ICE_LLDP_TLV_LEN_M) >> ICE_LLDP_TLV_LEN_S);
+               subtype = (u8)((typelen & ICE_LLDP_TLV_TYPE_M) >>
+                              ICE_LLDP_TLV_TYPE_S);
+               switch (subtype) {
+               case ICE_CEE_SUBTYPE_PG_CFG:
+                       ice_parse_cee_pgcfg_tlv(sub_tlv, dcbcfg);
+                       break;
+               case ICE_CEE_SUBTYPE_PFC_CFG:
+                       ice_parse_cee_pfccfg_tlv(sub_tlv, dcbcfg);
+                       break;
+               case ICE_CEE_SUBTYPE_APP_PRI:
+                       ice_parse_cee_app_tlv(sub_tlv, dcbcfg);
+                       break;
+               default:
+                       return; /* Invalid Sub-type return */
+               }
+               feat_tlv_count++;
+               /* Move to next sub TLV */
+               sub_tlv = (struct ice_cee_feat_tlv *)
+                         ((char *)sub_tlv + sizeof(sub_tlv->hdr.typelen) +
+                          sublen);
+       }
+}
+
+/**
+ * ice_parse_org_tlv
+ * @tlv: Organization specific TLV
+ * @dcbcfg: Local store to update ETS REC data
+ *
+ * Currently only IEEE 802.1Qaz TLV is supported, all others
+ * will be returned
+ */
+static void
+ice_parse_org_tlv(struct ice_lldp_org_tlv *tlv, struct ice_dcbx_cfg *dcbcfg)
+{
+       u32 ouisubtype;
+       u32 oui;
+
+       ouisubtype = NTOHL(tlv->ouisubtype);
+       oui = ((ouisubtype & ICE_LLDP_TLV_OUI_M) >> ICE_LLDP_TLV_OUI_S);
+       switch (oui) {
+       case ICE_IEEE_8021QAZ_OUI:
+               ice_parse_ieee_tlv(tlv, dcbcfg);
+               break;
+       case ICE_CEE_DCBX_OUI:
+               ice_parse_cee_tlv(tlv, dcbcfg);
+               break;
+       default:
+               break;
+       }
+}
+
+/**
+ * ice_lldp_to_dcb_cfg
+ * @lldpmib: LLDPDU to be parsed
+ * @dcbcfg: store for LLDPDU data
+ *
+ * Parse DCB configuration from the LLDPDU
+ */
+enum ice_status ice_lldp_to_dcb_cfg(u8 *lldpmib, struct ice_dcbx_cfg *dcbcfg)
+{
+       struct ice_lldp_org_tlv *tlv;
+       enum ice_status ret = ICE_SUCCESS;
+       u16 offset = 0;
+       u16 typelen;
+       u16 type;
+       u16 len;
+
+       if (!lldpmib || !dcbcfg)
+               return ICE_ERR_PARAM;
+
+       /* set to the start of LLDPDU */
+       lldpmib += ETH_HEADER_LEN;
+       tlv = (struct ice_lldp_org_tlv *)lldpmib;
+       while (1) {
+               typelen = NTOHS(tlv->typelen);
+               type = ((typelen & ICE_LLDP_TLV_TYPE_M) >> ICE_LLDP_TLV_TYPE_S);
+               len = ((typelen & ICE_LLDP_TLV_LEN_M) >> ICE_LLDP_TLV_LEN_S);
+               offset += sizeof(typelen) + len;
+
+               /* END TLV or beyond LLDPDU size */
+               if (type == ICE_TLV_TYPE_END || offset > ICE_LLDPDU_SIZE)
+                       break;
+
+               switch (type) {
+               case ICE_TLV_TYPE_ORG:
+                       ice_parse_org_tlv(tlv, dcbcfg);
+                       break;
+               default:
+                       break;
+               }
+
+               /* Move to next TLV */
+               tlv = (struct ice_lldp_org_tlv *)
+                     ((char *)tlv + sizeof(tlv->typelen) + len);
+       }
+
+       return ret;
+}
+
+/**
+ * ice_aq_get_dcb_cfg
+ * @hw: pointer to the HW struct
+ * @mib_type: mib type for the query
+ * @bridgetype: bridge type for the query (remote)
+ * @dcbcfg: store for LLDPDU data
+ *
+ * Query DCB configuration from the firmware
+ */
+enum ice_status
+ice_aq_get_dcb_cfg(struct ice_hw *hw, u8 mib_type, u8 bridgetype,
+                  struct ice_dcbx_cfg *dcbcfg)
+{
+       enum ice_status ret;
+       u8 *lldpmib;
+
+       /* Allocate the LLDPDU */
+       lldpmib = (u8 *)ice_malloc(hw, ICE_LLDPDU_SIZE);
+       if (!lldpmib)
+               return ICE_ERR_NO_MEMORY;
+
+       ret = ice_aq_get_lldp_mib(hw, bridgetype, mib_type, (void *)lldpmib,
+                                 ICE_LLDPDU_SIZE, NULL, NULL, NULL);
+
+       if (ret == ICE_SUCCESS)
+               /* Parse LLDP MIB to get DCB configuration */
+               ret = ice_lldp_to_dcb_cfg(lldpmib, dcbcfg);
+
+       ice_free(hw, lldpmib);
+
+       return ret;
+}
+
+/**
+ * ice_aq_start_stop_dcbx - Start/Stop DCBx service in FW
+ * @hw: pointer to the HW struct
+ * @start_dcbx_agent: True if DCBx Agent needs to be started
+ *                   False if DCBx Agent needs to be stopped
+ * @dcbx_agent_status: FW indicates back the DCBx agent status
+ *                    True if DCBx Agent is active
+ *                    False if DCBx Agent is stopped
+ * @cd: pointer to command details structure or NULL
+ *
+ * Start/Stop the embedded dcbx Agent. In case that this wrapper function
+ * returns ICE_SUCCESS, caller will need to check if FW returns back the same
+ * value as stated in dcbx_agent_status, and react accordingly. (0x0A09)
+ */
+enum ice_status
+ice_aq_start_stop_dcbx(struct ice_hw *hw, bool start_dcbx_agent,
+                      bool *dcbx_agent_status, struct ice_sq_cd *cd)
+{
+       struct ice_aqc_lldp_stop_start_specific_agent *cmd;
+       enum ice_status status;
+       struct ice_aq_desc desc;
+       u16 opcode;
+
+       cmd = &desc.params.lldp_agent_ctrl;
+
+       opcode = ice_aqc_opc_lldp_stop_start_specific_agent;
+
+       ice_fill_dflt_direct_cmd_desc(&desc, opcode);
+
+       if (start_dcbx_agent)
+               cmd->command = ICE_AQC_START_STOP_AGENT_START_DCBX;
+
+       status = ice_aq_send_cmd(hw, &desc, NULL, 0, cd);
+
+       *dcbx_agent_status = false;
+
+       if (status == ICE_SUCCESS &&
+           cmd->command == ICE_AQC_START_STOP_AGENT_START_DCBX)
+               *dcbx_agent_status = true;
+
+       return status;
+}
+
+/**
+ * ice_aq_get_cee_dcb_cfg
+ * @hw: pointer to the HW struct
+ * @buff: response buffer that stores CEE operational configuration
+ * @cd: pointer to command details structure or NULL
+ *
+ * Get CEE DCBX mode operational configuration from firmware (0x0A07)
+ */
+enum ice_status
+ice_aq_get_cee_dcb_cfg(struct ice_hw *hw,
+                      struct ice_aqc_get_cee_dcb_cfg_resp *buff,
+                      struct ice_sq_cd *cd)
+{
+       struct ice_aq_desc desc;
+
+       ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_get_cee_dcb_cfg);
+
+       return ice_aq_send_cmd(hw, &desc, (void *)buff, sizeof(*buff), cd);
+}
+
+/**
+ * ice_cee_to_dcb_cfg
+ * @cee_cfg: pointer to CEE configuration struct
+ * @dcbcfg: DCB configuration struct
+ *
+ * Convert CEE configuration from firmware to DCB configuration
+ */
+static void
+ice_cee_to_dcb_cfg(struct ice_aqc_get_cee_dcb_cfg_resp *cee_cfg,
+                  struct ice_dcbx_cfg *dcbcfg)
+{
+       u32 status, tlv_status = LE32_TO_CPU(cee_cfg->tlv_status);
+       u32 ice_aqc_cee_status_mask, ice_aqc_cee_status_shift;
+       u16 app_prio = LE16_TO_CPU(cee_cfg->oper_app_prio);
+       u8 i, err, sync, oper, app_index, ice_app_sel_type;
+       u16 ice_aqc_cee_app_mask, ice_aqc_cee_app_shift;
+       u16 ice_app_prot_id_type;
+
+       /* CEE PG data to ETS config */
+       dcbcfg->etscfg.maxtcs = cee_cfg->oper_num_tc;
+
+       /* Note that the FW creates the oper_prio_tc nibbles reversed
+        * from those in the CEE Priority Group sub-TLV.
+        */
+       for (i = 0; i < ICE_MAX_TRAFFIC_CLASS / 2; i++) {
+               dcbcfg->etscfg.prio_table[i * 2] =
+                       ((cee_cfg->oper_prio_tc[i] & ICE_CEE_PGID_PRIO_0_M) >>
+                        ICE_CEE_PGID_PRIO_0_S);
+               dcbcfg->etscfg.prio_table[i * 2 + 1] =
+                       ((cee_cfg->oper_prio_tc[i] & ICE_CEE_PGID_PRIO_1_M) >>
+                        ICE_CEE_PGID_PRIO_1_S);
+       }
+
+       ice_for_each_traffic_class(i) {
+               dcbcfg->etscfg.tcbwtable[i] = cee_cfg->oper_tc_bw[i];
+
+               if (dcbcfg->etscfg.prio_table[i] == ICE_CEE_PGID_STRICT) {
+                       /* Map it to next empty TC */
+                       dcbcfg->etscfg.prio_table[i] = cee_cfg->oper_num_tc - 1;
+                       dcbcfg->etscfg.tsatable[i] = ICE_IEEE_TSA_STRICT;
+               } else {
+                       dcbcfg->etscfg.tsatable[i] = ICE_IEEE_TSA_ETS;
+               }
+       }
+
+       /* CEE PFC data to ETS config */
+       dcbcfg->pfc.pfcena = cee_cfg->oper_pfc_en;
+       dcbcfg->pfc.pfccap = ICE_MAX_TRAFFIC_CLASS;
+
+       app_index = 0;
+       for (i = 0; i < 3; i++) {
+               if (i == 0) {
+                       /* FCoE APP */
+                       ice_aqc_cee_status_mask = ICE_AQC_CEE_FCOE_STATUS_M;
+                       ice_aqc_cee_status_shift = ICE_AQC_CEE_FCOE_STATUS_S;
+                       ice_aqc_cee_app_mask = ICE_AQC_CEE_APP_FCOE_M;
+                       ice_aqc_cee_app_shift = ICE_AQC_CEE_APP_FCOE_S;
+                       ice_app_sel_type = ICE_APP_SEL_ETHTYPE;
+                       ice_app_prot_id_type = ICE_APP_PROT_ID_FCOE;
+               } else if (i == 1) {
+                       /* iSCSI APP */
+                       ice_aqc_cee_status_mask = ICE_AQC_CEE_ISCSI_STATUS_M;
+                       ice_aqc_cee_status_shift = ICE_AQC_CEE_ISCSI_STATUS_S;
+                       ice_aqc_cee_app_mask = ICE_AQC_CEE_APP_ISCSI_M;
+                       ice_aqc_cee_app_shift = ICE_AQC_CEE_APP_ISCSI_S;
+                       ice_app_sel_type = ICE_APP_SEL_TCPIP;
+                       ice_app_prot_id_type = ICE_APP_PROT_ID_ISCSI;
+               } else {
+                       /* FIP APP */
+                       ice_aqc_cee_status_mask = ICE_AQC_CEE_FIP_STATUS_M;
+                       ice_aqc_cee_status_shift = ICE_AQC_CEE_FIP_STATUS_S;
+                       ice_aqc_cee_app_mask = ICE_AQC_CEE_APP_FIP_M;
+                       ice_aqc_cee_app_shift = ICE_AQC_CEE_APP_FIP_S;
+                       ice_app_sel_type = ICE_APP_SEL_ETHTYPE;
+                       ice_app_prot_id_type = ICE_APP_PROT_ID_FIP;
+               }
+
+               status = (tlv_status & ice_aqc_cee_status_mask) >>
+                        ice_aqc_cee_status_shift;
+               err = (status & ICE_TLV_STATUS_ERR) ? 1 : 0;
+               sync = (status & ICE_TLV_STATUS_SYNC) ? 1 : 0;
+               oper = (status & ICE_TLV_STATUS_OPER) ? 1 : 0;
+               /* Add FCoE/iSCSI/FIP APP if Error is False and
+                * Oper/Sync is True
+                */
+               if (!err && sync && oper) {
+                       dcbcfg->app[app_index].priority =
+                               (app_prio & ice_aqc_cee_app_mask) >>
+                               ice_aqc_cee_app_shift;
+                       dcbcfg->app[app_index].selector = ice_app_sel_type;
+                       dcbcfg->app[app_index].prot_id = ice_app_prot_id_type;
+                       app_index++;
+               }
+       }
+
+       dcbcfg->numapps = app_index;
+}
+
+/**
+ * ice_get_ieee_dcb_cfg
+ * @pi: port information structure
+ * @dcbx_mode: mode of DCBX (IEEE or CEE)
+ *
+ * Get IEEE or CEE mode DCB configuration from the Firmware
+ */
+STATIC enum ice_status
+ice_get_ieee_or_cee_dcb_cfg(struct ice_port_info *pi, u8 dcbx_mode)
+{
+       struct ice_dcbx_cfg *dcbx_cfg = NULL;
+       enum ice_status ret;
+
+       if (!pi)
+               return ICE_ERR_PARAM;
+
+       if (dcbx_mode == ICE_DCBX_MODE_IEEE)
+               dcbx_cfg = &pi->local_dcbx_cfg;
+       else if (dcbx_mode == ICE_DCBX_MODE_CEE)
+               dcbx_cfg = &pi->desired_dcbx_cfg;
+
+       /* Get Local DCB Config in case of ICE_DCBX_MODE_IEEE
+        * or get CEE DCB Desired Config in case of ICE_DCBX_MODE_CEE
+        */
+       ret = ice_aq_get_dcb_cfg(pi->hw, ICE_AQ_LLDP_MIB_LOCAL,
+                                ICE_AQ_LLDP_BRID_TYPE_NEAREST_BRID, dcbx_cfg);
+       if (ret)
+               goto out;
+
+       /* Get Remote DCB Config */
+       dcbx_cfg = &pi->remote_dcbx_cfg;
+       ret = ice_aq_get_dcb_cfg(pi->hw, ICE_AQ_LLDP_MIB_REMOTE,
+                                ICE_AQ_LLDP_BRID_TYPE_NEAREST_BRID, dcbx_cfg);
+       /* Don't treat ENOENT as an error for Remote MIBs */
+       if (pi->hw->adminq.sq_last_status == ICE_AQ_RC_ENOENT)
+               ret = ICE_SUCCESS;
+
+out:
+       return ret;
+}
+
+/**
+ * ice_get_dcb_cfg
+ * @pi: port information structure
+ *
+ * Get DCB configuration from the Firmware
+ */
+enum ice_status ice_get_dcb_cfg(struct ice_port_info *pi)
+{
+       struct ice_aqc_get_cee_dcb_cfg_resp cee_cfg;
+       struct ice_dcbx_cfg *dcbx_cfg;
+       enum ice_status ret;
+
+       if (!pi)
+               return ICE_ERR_PARAM;
+
+       ret = ice_aq_get_cee_dcb_cfg(pi->hw, &cee_cfg, NULL);
+       if (ret == ICE_SUCCESS) {
+               /* CEE mode */
+               dcbx_cfg = &pi->local_dcbx_cfg;
+               dcbx_cfg->dcbx_mode = ICE_DCBX_MODE_CEE;
+               dcbx_cfg->tlv_status = LE32_TO_CPU(cee_cfg.tlv_status);
+               ice_cee_to_dcb_cfg(&cee_cfg, dcbx_cfg);
+               ret = ice_get_ieee_or_cee_dcb_cfg(pi, ICE_DCBX_MODE_CEE);
+       } else if (pi->hw->adminq.sq_last_status == ICE_AQ_RC_ENOENT) {
+               /* CEE mode not enabled try querying IEEE data */
+               dcbx_cfg = &pi->local_dcbx_cfg;
+               dcbx_cfg->dcbx_mode = ICE_DCBX_MODE_IEEE;
+               ret = ice_get_ieee_or_cee_dcb_cfg(pi, ICE_DCBX_MODE_IEEE);
+       }
+
+       return ret;
+}
+
+/**
+ * ice_init_dcb
+ * @hw: pointer to the HW struct
+ *
+ * Update DCB configuration from the Firmware
+ */
+enum ice_status ice_init_dcb(struct ice_hw *hw)
+{
+       struct ice_port_info *pi = hw->port_info;
+       enum ice_status ret = ICE_SUCCESS;
+
+       if (!hw->func_caps.common_cap.dcb)
+               return ICE_ERR_NOT_SUPPORTED;
+
+       pi->is_sw_lldp = true;
+
+       /* Get DCBX status */
+       pi->dcbx_status = ice_get_dcbx_status(hw);
+
+       if (pi->dcbx_status == ICE_DCBX_STATUS_DONE ||
+           pi->dcbx_status == ICE_DCBX_STATUS_IN_PROGRESS) {
+               /* Get current DCBX configuration */
+               ret = ice_get_dcb_cfg(pi);
+               pi->is_sw_lldp = (hw->adminq.sq_last_status == ICE_AQ_RC_EPERM);
+               if (ret)
+                       return ret;
+       } else if (pi->dcbx_status == ICE_DCBX_STATUS_DIS) {
+               return ICE_ERR_NOT_READY;
+       } else if (pi->dcbx_status == ICE_DCBX_STATUS_MULTIPLE_PEERS) {
+       }
+
+       /* Configure the LLDP MIB change event */
+       ret = ice_aq_cfg_lldp_mib_change(hw, true, NULL);
+       if (!ret)
+               pi->is_sw_lldp = false;
+
+       return ret;
+}
+
+/**
+ * ice_add_ieee_ets_common_tlv
+ * @buf: Data buffer to be populated with ice_dcb_ets_cfg data
+ * @ets_cfg: Container for ice_dcb_ets_cfg data
+ *
+ * Populate the TLV buffer with ice_dcb_ets_cfg data
+ */
+static void
+ice_add_ieee_ets_common_tlv(u8 *buf, struct ice_dcb_ets_cfg *ets_cfg)
+{
+       u8 priority0, priority1;
+       u8 offset = 0;
+       int i;
+
+       /* Priority Assignment Table (4 octets)
+        * Octets:|    1    |    2    |    3    |    4    |
+        *        -----------------------------------------
+        *        |pri0|pri1|pri2|pri3|pri4|pri5|pri6|pri7|
+        *        -----------------------------------------
+        *   Bits:|7  4|3  0|7  4|3  0|7  4|3  0|7  4|3  0|
+        *        -----------------------------------------
+        */
+       for (i = 0; i < ICE_MAX_TRAFFIC_CLASS / 2; i++) {
+               priority0 = ets_cfg->prio_table[i * 2] & 0xF;
+               priority1 = ets_cfg->prio_table[i * 2 + 1] & 0xF;
+               buf[offset] = (priority0 << ICE_IEEE_ETS_PRIO_1_S) | priority1;
+               offset++;
+       }
+
+       /* TC Bandwidth Table (8 octets)
+        * Octets:| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 |
+        *        ---------------------------------
+        *        |tc0|tc1|tc2|tc3|tc4|tc5|tc6|tc7|
+        *        ---------------------------------
+        *
+        * TSA Assignment Table (8 octets)
+        * Octets:| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 |
+        *        ---------------------------------
+        *        |tc0|tc1|tc2|tc3|tc4|tc5|tc6|tc7|
+        *        ---------------------------------
+        */
+       ice_for_each_traffic_class(i) {
+               buf[offset] = ets_cfg->tcbwtable[i];
+               buf[ICE_MAX_TRAFFIC_CLASS + offset] = ets_cfg->tsatable[i];
+               offset++;
+       }
+}
+
+/**
+ * ice_add_ieee_ets_tlv - Prepare ETS TLV in IEEE format
+ * @tlv: Fill the ETS config data in IEEE format
+ * @dcbcfg: Local store which holds the DCB Config
+ *
+ * Prepare IEEE 802.1Qaz ETS CFG TLV
+ */
+static void
+ice_add_ieee_ets_tlv(struct ice_lldp_org_tlv *tlv, struct ice_dcbx_cfg *dcbcfg)
+{
+       struct ice_dcb_ets_cfg *etscfg;
+       u8 *buf = tlv->tlvinfo;
+       u8 maxtcwilling = 0;
+       u32 ouisubtype;
+       u16 typelen;
+
+       typelen = ((ICE_TLV_TYPE_ORG << ICE_LLDP_TLV_TYPE_S) |
+                  ICE_IEEE_ETS_TLV_LEN);
+       tlv->typelen = HTONS(typelen);
+
+       ouisubtype = ((ICE_IEEE_8021QAZ_OUI << ICE_LLDP_TLV_OUI_S) |
+                     ICE_IEEE_SUBTYPE_ETS_CFG);
+       tlv->ouisubtype = HTONL(ouisubtype);
+
+       /* First Octet post subtype
+        * --------------------------
+        * |will-|CBS  | Re-  | Max |
+        * |ing  |     |served| TCs |
+        * --------------------------
+        * |1bit | 1bit|3 bits|3bits|
+        */
+       etscfg = &dcbcfg->etscfg;
+       if (etscfg->willing)
+               maxtcwilling = BIT(ICE_IEEE_ETS_WILLING_S);
+       maxtcwilling |= etscfg->maxtcs & ICE_IEEE_ETS_MAXTC_M;
+       buf[0] = maxtcwilling;
+
+       /* Begin adding at Priority Assignment Table (offset 1 in buf) */
+       ice_add_ieee_ets_common_tlv(&buf[1], etscfg);
+}
+
+/**
+ * ice_add_ieee_etsrec_tlv - Prepare ETS Recommended TLV in IEEE format
+ * @tlv: Fill ETS Recommended TLV in IEEE format
+ * @dcbcfg: Local store which holds the DCB Config
+ *
+ * Prepare IEEE 802.1Qaz ETS REC TLV
+ */
+static void
+ice_add_ieee_etsrec_tlv(struct ice_lldp_org_tlv *tlv,
+                       struct ice_dcbx_cfg *dcbcfg)
+{
+       struct ice_dcb_ets_cfg *etsrec;
+       u8 *buf = tlv->tlvinfo;
+       u32 ouisubtype;
+       u16 typelen;
+
+       typelen = ((ICE_TLV_TYPE_ORG << ICE_LLDP_TLV_TYPE_S) |
+                  ICE_IEEE_ETS_TLV_LEN);
+       tlv->typelen = HTONS(typelen);
+
+       ouisubtype = ((ICE_IEEE_8021QAZ_OUI << ICE_LLDP_TLV_OUI_S) |
+                     ICE_IEEE_SUBTYPE_ETS_REC);
+       tlv->ouisubtype = HTONL(ouisubtype);
+
+       etsrec = &dcbcfg->etsrec;
+
+       /* First Octet is reserved */
+       /* Begin adding at Priority Assignment Table (offset 1 in buf) */
+       ice_add_ieee_ets_common_tlv(&buf[1], etsrec);
+}
+
+/**
+ * ice_add_ieee_pfc_tlv - Prepare PFC TLV in IEEE format
+ * @tlv: Fill PFC TLV in IEEE format
+ * @dcbcfg: Local store which holds the PFC CFG data
+ *
+ * Prepare IEEE 802.1Qaz PFC CFG TLV
+ */
+static void
+ice_add_ieee_pfc_tlv(struct ice_lldp_org_tlv *tlv, struct ice_dcbx_cfg *dcbcfg)
+{
+       u8 *buf = tlv->tlvinfo;
+       u32 ouisubtype;
+       u16 typelen;
+
+       typelen = ((ICE_TLV_TYPE_ORG << ICE_LLDP_TLV_TYPE_S) |
+                  ICE_IEEE_PFC_TLV_LEN);
+       tlv->typelen = HTONS(typelen);
+
+       ouisubtype = ((ICE_IEEE_8021QAZ_OUI << ICE_LLDP_TLV_OUI_S) |
+                     ICE_IEEE_SUBTYPE_PFC_CFG);
+       tlv->ouisubtype = HTONL(ouisubtype);
+
+       /* ----------------------------------------
+        * |will-|MBC  | Re-  | PFC |  PFC Enable  |
+        * |ing  |     |served| cap |              |
+        * -----------------------------------------
+        * |1bit | 1bit|2 bits|4bits| 1 octet      |
+        */
+       if (dcbcfg->pfc.willing)
+               buf[0] = BIT(ICE_IEEE_PFC_WILLING_S);
+
+       if (dcbcfg->pfc.mbc)
+               buf[0] |= BIT(ICE_IEEE_PFC_MBC_S);
+
+       buf[0] |= dcbcfg->pfc.pfccap & 0xF;
+       buf[1] = dcbcfg->pfc.pfcena;
+}
+
+/**
+ * ice_add_ieee_app_pri_tlv -  Prepare APP TLV in IEEE format
+ * @tlv: Fill APP TLV in IEEE format
+ * @dcbcfg: Local store which holds the APP CFG data
+ *
+ * Prepare IEEE 802.1Qaz APP CFG TLV
+ */
+static void
+ice_add_ieee_app_pri_tlv(struct ice_lldp_org_tlv *tlv,
+                        struct ice_dcbx_cfg *dcbcfg)
+{
+       u16 typelen, len, offset = 0;
+       u8 priority, selector, i = 0;
+       u8 *buf = tlv->tlvinfo;
+       u32 ouisubtype;
+
+       /* No APP TLVs then just return */
+       if (dcbcfg->numapps == 0)
+               return;
+       ouisubtype = ((ICE_IEEE_8021QAZ_OUI << ICE_LLDP_TLV_OUI_S) |
+                     ICE_IEEE_SUBTYPE_APP_PRI);
+       tlv->ouisubtype = HTONL(ouisubtype);
+
+       /* Move offset to App Priority Table */
+       offset++;
+       /* Application Priority Table (3 octets)
+        * Octets:|         1          |    2    |    3    |
+        *        -----------------------------------------
+        *        |Priority|Rsrvd| Sel |    Protocol ID    |
+        *        -----------------------------------------
+        *   Bits:|23    21|20 19|18 16|15                0|
+        *        -----------------------------------------
+        */
+       while (i < dcbcfg->numapps) {
+               priority = dcbcfg->app[i].priority & 0x7;
+               selector = dcbcfg->app[i].selector & 0x7;
+               buf[offset] = (priority << ICE_IEEE_APP_PRIO_S) | selector;
+               buf[offset + 1] = (dcbcfg->app[i].prot_id >> 0x8) & 0xFF;
+               buf[offset + 2] = dcbcfg->app[i].prot_id & 0xFF;
+               /* Move to next app */
+               offset += 3;
+               i++;
+               if (i >= ICE_DCBX_MAX_APPS)
+                       break;
+       }
+       /* len includes size of ouisubtype + 1 reserved + 3*numapps */
+       len = sizeof(tlv->ouisubtype) + 1 + (i * 3);
+       typelen = ((ICE_TLV_TYPE_ORG << ICE_LLDP_TLV_TYPE_S) | (len & 0x1FF));
+       tlv->typelen = HTONS(typelen);
+}
+
+/**
+ * ice_add_dcb_tlv - Add all IEEE TLVs
+ * @tlv: Fill TLV data in IEEE format
+ * @dcbcfg: Local store which holds the DCB Config
+ * @tlvid: Type of IEEE TLV
+ *
+ * Add tlv information
+ */
+static void
+ice_add_dcb_tlv(struct ice_lldp_org_tlv *tlv, struct ice_dcbx_cfg *dcbcfg,
+               u16 tlvid)
+{
+       switch (tlvid) {
+       case ICE_IEEE_TLV_ID_ETS_CFG:
+               ice_add_ieee_ets_tlv(tlv, dcbcfg);
+               break;
+       case ICE_IEEE_TLV_ID_ETS_REC:
+               ice_add_ieee_etsrec_tlv(tlv, dcbcfg);
+               break;
+       case ICE_IEEE_TLV_ID_PFC_CFG:
+               ice_add_ieee_pfc_tlv(tlv, dcbcfg);
+               break;
+       case ICE_IEEE_TLV_ID_APP_PRI:
+               ice_add_ieee_app_pri_tlv(tlv, dcbcfg);
+               break;
+       default:
+               break;
+       }
+}
+
+/**
+ * ice_dcb_cfg_to_lldp - Convert DCB configuration to MIB format
+ * @lldpmib: pointer to the HW struct
+ * @miblen: length of LLDP mib
+ * @dcbcfg: Local store which holds the DCB Config
+ *
+ * Convert the DCB configuration to MIB format
+ */
+void ice_dcb_cfg_to_lldp(u8 *lldpmib, u16 *miblen, struct ice_dcbx_cfg *dcbcfg)
+{
+       u16 len, offset = 0, tlvid = ICE_TLV_ID_START;
+       struct ice_lldp_org_tlv *tlv;
+       u16 typelen;
+
+       tlv = (struct ice_lldp_org_tlv *)lldpmib;
+       while (1) {
+               ice_add_dcb_tlv(tlv, dcbcfg, tlvid++);
+               typelen = NTOHS(tlv->typelen);
+               len = (typelen & ICE_LLDP_TLV_LEN_M) >> ICE_LLDP_TLV_LEN_S;
+               if (len)
+                       offset += len + 2;
+               /* END TLV or beyond LLDPDU size */
+               if (tlvid >= ICE_TLV_ID_END_OF_LLDPPDU ||
+                   offset > ICE_LLDPDU_SIZE)
+                       break;
+               /* Move to next TLV */
+               if (len)
+                       tlv = (struct ice_lldp_org_tlv *)
+                               ((char *)tlv + sizeof(tlv->typelen) + len);
+       }
+       *miblen = offset;
+}
+
+/**
+ * ice_set_dcb_cfg - Set the local LLDP MIB to FW
+ * @pi: port information structure
+ *
+ * Set DCB configuration to the Firmware
+ */
+enum ice_status ice_set_dcb_cfg(struct ice_port_info *pi)
+{
+       u8 mib_type, *lldpmib = NULL;
+       struct ice_dcbx_cfg *dcbcfg;
+       enum ice_status ret;
+       struct ice_hw *hw;
+       u16 miblen;
+
+       if (!pi)
+               return ICE_ERR_PARAM;
+
+       hw = pi->hw;
+
+       /* update the HW local config */
+       dcbcfg = &pi->local_dcbx_cfg;
+       /* Allocate the LLDPDU */
+       lldpmib = (u8 *)ice_malloc(hw, ICE_LLDPDU_SIZE);
+       if (!lldpmib)
+               return ICE_ERR_NO_MEMORY;
+
+       mib_type = SET_LOCAL_MIB_TYPE_LOCAL_MIB;
+       if (dcbcfg->app_mode == ICE_DCBX_APPS_NON_WILLING)
+               mib_type |= SET_LOCAL_MIB_TYPE_CEE_NON_WILLING;
+
+       ice_dcb_cfg_to_lldp(lldpmib, &miblen, dcbcfg);
+       ret = ice_aq_set_lldp_mib(hw, mib_type, (void *)lldpmib, miblen,
+                                 NULL);
+
+       ice_free(hw, lldpmib);
+
+       return ret;
+}
+
+/**
+ * ice_aq_query_port_ets - query port ets configuration
+ * @pi: port information structure
+ * @buf: pointer to buffer
+ * @buf_size: buffer size in bytes
+ * @cd: pointer to command details structure or NULL
+ *
+ * query current port ets configuration
+ */
+enum ice_status
+ice_aq_query_port_ets(struct ice_port_info *pi,
+                     struct ice_aqc_port_ets_elem *buf, u16 buf_size,
+                     struct ice_sq_cd *cd)
+{
+       struct ice_aqc_query_port_ets *cmd;
+       struct ice_aq_desc desc;
+       enum ice_status status;
+
+       if (!pi)
+               return ICE_ERR_PARAM;
+       cmd = &desc.params.port_ets;
+       ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_query_port_ets);
+       cmd->port_teid = pi->root->info.node_teid;
+
+       status = ice_aq_send_cmd(pi->hw, &desc, buf, buf_size, cd);
+       return status;
+}
+
+/**
+ * ice_update_port_tc_tree_cfg - update TC tree configuration
+ * @pi: port information structure
+ * @buf: pointer to buffer
+ *
+ * update the SW DB with the new TC changes
+ */
+enum ice_status
+ice_update_port_tc_tree_cfg(struct ice_port_info *pi,
+                           struct ice_aqc_port_ets_elem *buf)
+{
+       struct ice_sched_node *node, *tc_node;
+       struct ice_aqc_get_elem elem;
+       enum ice_status status = ICE_SUCCESS;
+       u32 teid1, teid2;
+       u8 i, j;
+
+       if (!pi)
+               return ICE_ERR_PARAM;
+       /* suspend the missing TC nodes */
+       for (i = 0; i < pi->root->num_children; i++) {
+               teid1 = LE32_TO_CPU(pi->root->children[i]->info.node_teid);
+               ice_for_each_traffic_class(j) {
+                       teid2 = LE32_TO_CPU(buf->tc_node_teid[j]);
+                       if (teid1 == teid2)
+                               break;
+               }
+               if (j < ICE_MAX_TRAFFIC_CLASS)
+                       continue;
+               /* TC is missing */
+               pi->root->children[i]->in_use = false;
+       }
+       /* add the new TC nodes */
+       ice_for_each_traffic_class(j) {
+               teid2 = LE32_TO_CPU(buf->tc_node_teid[j]);
+               if (teid2 == ICE_INVAL_TEID)
+                       continue;
+               /* Is it already present in the tree ? */
+               for (i = 0; i < pi->root->num_children; i++) {
+                       tc_node = pi->root->children[i];
+                       if (!tc_node)
+                               continue;
+                       teid1 = LE32_TO_CPU(tc_node->info.node_teid);
+                       if (teid1 == teid2) {
+                               tc_node->tc_num = j;
+                               tc_node->in_use = true;
+                               break;
+                       }
+               }
+               if (i < pi->root->num_children)
+                       continue;
+               /* new TC */
+               status = ice_sched_query_elem(pi->hw, teid2, &elem);
+               if (!status)
+                       status = ice_sched_add_node(pi, 1, &elem.generic[0]);
+               if (status)
+                       break;
+               /* update the TC number */
+               node = ice_sched_find_node_by_teid(pi->root, teid2);
+               if (node)
+                       node->tc_num = j;
+       }
+       return status;
+}
+
+/**
+ * ice_query_port_ets - query port ets configuration
+ * @pi: port information structure
+ * @buf: pointer to buffer
+ * @buf_size: buffer size in bytes
+ * @cd: pointer to command details structure or NULL
+ *
+ * query current port ets configuration and update the
+ * SW DB with the TC changes
+ */
+enum ice_status
+ice_query_port_ets(struct ice_port_info *pi,
+                  struct ice_aqc_port_ets_elem *buf, u16 buf_size,
+                  struct ice_sq_cd *cd)
+{
+       enum ice_status status;
+
+       ice_acquire_lock(&pi->sched_lock);
+       status = ice_aq_query_port_ets(pi, buf, buf_size, cd);
+       if (!status)
+               status = ice_update_port_tc_tree_cfg(pi, buf);
+       ice_release_lock(&pi->sched_lock);
+       return status;
+}
diff --git a/drivers/net/ice/base/ice_dcb.h b/drivers/net/ice/base/ice_dcb.h
new file mode 100644 (file)
index 0000000..d922c8a
--- /dev/null
@@ -0,0 +1,223 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2001-2019
+ */
+
+#ifndef _ICE_DCB_H_
+#define _ICE_DCB_H_
+
+#include "ice_type.h"
+
+#define ICE_DCBX_OFFLOAD_DIS           0
+#define ICE_DCBX_OFFLOAD_ENABLED       1
+
+#define ICE_DCBX_STATUS_NOT_STARTED    0
+#define ICE_DCBX_STATUS_IN_PROGRESS    1
+#define ICE_DCBX_STATUS_DONE           2
+#define ICE_DCBX_STATUS_MULTIPLE_PEERS 3
+#define ICE_DCBX_STATUS_DIS            7
+
+#define ICE_TLV_TYPE_END               0
+#define ICE_TLV_TYPE_ORG               127
+
+#define ICE_IEEE_8021QAZ_OUI           0x0080C2
+#define ICE_IEEE_SUBTYPE_ETS_CFG       9
+#define ICE_IEEE_SUBTYPE_ETS_REC       10
+#define ICE_IEEE_SUBTYPE_PFC_CFG       11
+#define ICE_IEEE_SUBTYPE_APP_PRI       12
+
+#define ICE_CEE_DCBX_OUI               0x001B21
+#define ICE_CEE_DCBX_TYPE              2
+
+#define ICE_CEE_SUBTYPE_CTRL           1
+#define ICE_CEE_SUBTYPE_PG_CFG         2
+#define ICE_CEE_SUBTYPE_PFC_CFG                3
+#define ICE_CEE_SUBTYPE_APP_PRI                4
+
+#define ICE_CEE_MAX_FEAT_TYPE          3
+#define ICE_LLDP_ADMINSTATUS_DIS       0
+#define ICE_LLDP_ADMINSTATUS_ENA_RX    1
+#define ICE_LLDP_ADMINSTATUS_ENA_TX    2
+#define ICE_LLDP_ADMINSTATUS_ENA_RXTX  3
+
+/* Defines for LLDP TLV header */
+#define ICE_LLDP_TLV_LEN_S             0
+#define ICE_LLDP_TLV_LEN_M             (0x01FF << ICE_LLDP_TLV_LEN_S)
+#define ICE_LLDP_TLV_TYPE_S            9
+#define ICE_LLDP_TLV_TYPE_M            (0x7F << ICE_LLDP_TLV_TYPE_S)
+#define ICE_LLDP_TLV_SUBTYPE_S         0
+#define ICE_LLDP_TLV_SUBTYPE_M         (0xFF << ICE_LLDP_TLV_SUBTYPE_S)
+#define ICE_LLDP_TLV_OUI_S             8
+#define ICE_LLDP_TLV_OUI_M             (0xFFFFFFUL << ICE_LLDP_TLV_OUI_S)
+
+/* Defines for IEEE ETS TLV */
+#define ICE_IEEE_ETS_MAXTC_S   0
+#define ICE_IEEE_ETS_MAXTC_M           (0x7 << ICE_IEEE_ETS_MAXTC_S)
+#define ICE_IEEE_ETS_CBS_S             6
+#define ICE_IEEE_ETS_CBS_M             BIT(ICE_IEEE_ETS_CBS_S)
+#define ICE_IEEE_ETS_WILLING_S         7
+#define ICE_IEEE_ETS_WILLING_M         BIT(ICE_IEEE_ETS_WILLING_S)
+#define ICE_IEEE_ETS_PRIO_0_S          0
+#define ICE_IEEE_ETS_PRIO_0_M          (0x7 << ICE_IEEE_ETS_PRIO_0_S)
+#define ICE_IEEE_ETS_PRIO_1_S          4
+#define ICE_IEEE_ETS_PRIO_1_M          (0x7 << ICE_IEEE_ETS_PRIO_1_S)
+#define ICE_CEE_PGID_PRIO_0_S          0
+#define ICE_CEE_PGID_PRIO_0_M          (0xF << ICE_CEE_PGID_PRIO_0_S)
+#define ICE_CEE_PGID_PRIO_1_S          4
+#define ICE_CEE_PGID_PRIO_1_M          (0xF << ICE_CEE_PGID_PRIO_1_S)
+#define ICE_CEE_PGID_STRICT            15
+
+/* Defines for IEEE TSA types */
+#define ICE_IEEE_TSA_STRICT            0
+#define ICE_IEEE_TSA_CBS               1
+#define ICE_IEEE_TSA_ETS               2
+#define ICE_IEEE_TSA_VENDOR            255
+
+/* Defines for IEEE PFC TLV */
+#define ICE_IEEE_PFC_CAP_S             0
+#define ICE_IEEE_PFC_CAP_M             (0xF << ICE_IEEE_PFC_CAP_S)
+#define ICE_IEEE_PFC_MBC_S             6
+#define ICE_IEEE_PFC_MBC_M             BIT(ICE_IEEE_PFC_MBC_S)
+#define ICE_IEEE_PFC_WILLING_S         7
+#define ICE_IEEE_PFC_WILLING_M         BIT(ICE_IEEE_PFC_WILLING_S)
+
+/* Defines for IEEE APP TLV */
+#define ICE_IEEE_APP_SEL_S             0
+#define ICE_IEEE_APP_SEL_M             (0x7 << ICE_IEEE_APP_SEL_S)
+#define ICE_IEEE_APP_PRIO_S            5
+#define ICE_IEEE_APP_PRIO_M            (0x7 << ICE_IEEE_APP_PRIO_S)
+
+/* TLV definitions for preparing MIB */
+#define ICE_TLV_ID_CHASSIS_ID          0
+#define ICE_TLV_ID_PORT_ID             1
+#define ICE_TLV_ID_TIME_TO_LIVE                2
+#define ICE_IEEE_TLV_ID_ETS_CFG                3
+#define ICE_IEEE_TLV_ID_ETS_REC                4
+#define ICE_IEEE_TLV_ID_PFC_CFG                5
+#define ICE_IEEE_TLV_ID_APP_PRI                6
+#define ICE_TLV_ID_END_OF_LLDPPDU      7
+#define ICE_TLV_ID_START               ICE_IEEE_TLV_ID_ETS_CFG
+
+#define ICE_IEEE_ETS_TLV_LEN           25
+#define ICE_IEEE_PFC_TLV_LEN           6
+#define ICE_IEEE_APP_TLV_LEN           11
+
+#pragma pack(1)
+/* IEEE 802.1AB LLDP TLV structure */
+struct ice_lldp_generic_tlv {
+       __be16 typelen;
+       u8 tlvinfo[1];
+};
+
+/* IEEE 802.1AB LLDP Organization specific TLV */
+struct ice_lldp_org_tlv {
+       __be16 typelen;
+       __be32 ouisubtype;
+       u8 tlvinfo[1];
+};
+
+#pragma pack()
+
+struct ice_cee_tlv_hdr {
+       __be16 typelen;
+       u8 operver;
+       u8 maxver;
+};
+
+struct ice_cee_ctrl_tlv {
+       struct ice_cee_tlv_hdr hdr;
+       __be32 seqno;
+       __be32 ackno;
+};
+
+struct ice_cee_feat_tlv {
+       struct ice_cee_tlv_hdr hdr;
+       u8 en_will_err; /* Bits: |En|Will|Err|Reserved(5)| */
+#define ICE_CEE_FEAT_TLV_ENA_M         0x80
+#define ICE_CEE_FEAT_TLV_WILLING_M     0x40
+#define ICE_CEE_FEAT_TLV_ERR_M         0x20
+       u8 subtype;
+       u8 tlvinfo[1];
+};
+
+#pragma pack(1)
+struct ice_cee_app_prio {
+       __be16 protocol;
+       u8 upper_oui_sel; /* Bits: |Upper OUI(6)|Selector(2)| */
+#define ICE_CEE_APP_SELECTOR_M 0x03
+       __be16 lower_oui;
+       u8 prio_map;
+};
+
+#pragma pack()
+
+/* TODO: The below structures related LLDP/DCBX variables
+ * and statistics are defined but need to find how to get
+ * the required information from the Firmware to use them
+ */
+
+/* IEEE 802.1AB LLDP Agent Statistics */
+struct ice_lldp_stats {
+       u64 remtablelastchangetime;
+       u64 remtableinserts;
+       u64 remtabledeletes;
+       u64 remtabledrops;
+       u64 remtableageouts;
+       u64 txframestotal;
+       u64 rxframesdiscarded;
+       u64 rxportframeerrors;
+       u64 rxportframestotal;
+       u64 rxporttlvsdiscardedtotal;
+       u64 rxporttlvsunrecognizedtotal;
+       u64 remtoomanyneighbors;
+};
+
+/* IEEE 802.1Qaz DCBX variables */
+struct ice_dcbx_variables {
+       u32 defmaxtrafficclasses;
+       u32 defprioritytcmapping;
+       u32 deftcbandwidth;
+       u32 deftsaassignment;
+};
+
+enum ice_status
+ice_aq_get_lldp_mib(struct ice_hw *hw, u8 bridge_type, u8 mib_type, void *buf,
+                   u16 buf_size, u16 *local_len, u16 *remote_len,
+                   struct ice_sq_cd *cd);
+enum ice_status
+ice_aq_set_lldp_mib(struct ice_hw *hw, u8 mib_type, void *buf, u16 buf_size,
+                   struct ice_sq_cd *cd);
+enum ice_status
+ice_aq_get_cee_dcb_cfg(struct ice_hw *hw,
+                      struct ice_aqc_get_cee_dcb_cfg_resp *buff,
+                      struct ice_sq_cd *cd);
+u8 ice_get_dcbx_status(struct ice_hw *hw);
+enum ice_status ice_lldp_to_dcb_cfg(u8 *lldpmib, struct ice_dcbx_cfg *dcbcfg);
+enum ice_status
+ice_aq_get_dcb_cfg(struct ice_hw *hw, u8 mib_type, u8 bridgetype,
+                  struct ice_dcbx_cfg *dcbcfg);
+enum ice_status ice_get_dcb_cfg(struct ice_port_info *pi);
+enum ice_status ice_set_dcb_cfg(struct ice_port_info *pi);
+enum ice_status ice_init_dcb(struct ice_hw *hw);
+void ice_dcb_cfg_to_lldp(u8 *lldpmib, u16 *miblen, struct ice_dcbx_cfg *dcbcfg);
+enum ice_status
+ice_query_port_ets(struct ice_port_info *pi,
+                  struct ice_aqc_port_ets_elem *buf, u16 buf_size,
+                  struct ice_sq_cd *cmd_details);
+enum ice_status
+ice_aq_query_port_ets(struct ice_port_info *pi,
+                     struct ice_aqc_port_ets_elem *buf, u16 buf_size,
+                     struct ice_sq_cd *cd);
+enum ice_status
+ice_update_port_tc_tree_cfg(struct ice_port_info *pi,
+                           struct ice_aqc_port_ets_elem *buf);
+enum ice_status
+ice_aq_stop_lldp(struct ice_hw *hw, bool shutdown_lldp_agent,
+                struct ice_sq_cd *cd);
+enum ice_status ice_aq_start_lldp(struct ice_hw *hw, struct ice_sq_cd *cd);
+enum ice_status
+ice_aq_start_stop_dcbx(struct ice_hw *hw, bool start_dcbx_agent,
+                      bool *dcbx_agent_status, struct ice_sq_cd *cd);
+enum ice_status
+ice_aq_cfg_lldp_mib_change(struct ice_hw *hw, bool ena_update,
+                          struct ice_sq_cd *cd);
+#endif /* _ICE_DCB_H_ */
index cd561b0..ac120fa 100644 (file)
@@ -13,6 +13,7 @@ enum ice_status {
        ICE_ERR_PARAM                           = -1,
        ICE_ERR_NOT_IMPL                        = -2,
        ICE_ERR_NOT_READY                       = -3,
+       ICE_ERR_NOT_SUPPORTED                   = -4,
        ICE_ERR_BAD_PTR                         = -5,
        ICE_ERR_INVAL_SIZE                      = -6,
        ICE_ERR_DEVICE_NOT_SUPPORTED            = -8,
index 90736fa..6a08b3d 100644 (file)
@@ -240,6 +240,9 @@ struct ice_hw_common_caps {
 
        u32 os2bmc;
        u32 valid_functions;
+       /* DCB capabilities */
+       u32 active_tc_bitmap;
+       u32 maxtc;
 
        /* RSS related capabilities */
        u32 rss_table_size;             /* 512 for PFs and 64 for VFs */
@@ -276,6 +279,7 @@ struct ice_hw_common_caps {
        u8 evb_802_1_qbg;               /* Edge Virtual Bridging */
        u8 evb_802_1_qbh;               /* Bridge Port Extension */
 
+       u8 dcb;
        u8 iscsi;
        u8 mgmt_cem;
 
@@ -527,7 +531,6 @@ struct ice_sched_vsi_info {
        struct ice_bw_type_info bw_t_info[ICE_MAX_TRAFFIC_CLASS];
 };
 
-#if !defined(NO_DCB_SUPPORT) || defined(ADQ_SUPPORT)
 /* CEE or IEEE 802.1Qaz ETS Configuration data */
 struct ice_dcb_ets_cfg {
        u8 willing;
@@ -580,7 +583,6 @@ struct ice_dcbx_cfg {
        u8 app_mode;
 #define ICE_DCBX_APPS_NON_WILLING      0x1
 };
-#endif /* !NO_DCB_SUPPORT || ADQ_SUPPORT */
 
 struct ice_port_info {
        struct ice_sched_node *root;    /* Root Node per Port */
@@ -601,9 +603,13 @@ struct ice_port_info {
        struct ice_lock sched_lock;     /* protect access to TXSched tree */
        /* List contain profile ID(s) and other params per layer */
        struct LIST_HEAD_TYPE rl_prof_list[ICE_AQC_TOPO_MAX_LEVEL_NUM];
-#if !defined(NO_DCB_SUPPORT) || defined(ADQ_SUPPORT)
        struct ice_dcbx_cfg local_dcbx_cfg;     /* Oper/Local Cfg */
-#endif /* !NO_DCB_SUPPORT || ADQ_SUPPORT */
+       /* DCBX info */
+       struct ice_dcbx_cfg remote_dcbx_cfg;    /* Peer Cfg */
+       struct ice_dcbx_cfg desired_dcbx_cfg;   /* CEE Desired Cfg */
+       /* LLDP/DCBX Status */
+       u8 dcbx_status;
+       u8 is_sw_lldp;
        u8 lport;
 #define ICE_LPORT_MASK         0xff
        u8 is_vf;
index d7f8536..755d249 100644 (file)
@@ -9,6 +9,7 @@ sources = [
        'ice_nvm.c',
        'ice_flex_pipe.c',
        'ice_flow.c',
+       'ice_dcb.c',
 ]
 
 error_cflags = ['-Wno-unused-value',