1 files changed, 162 insertions, 13 deletions

diff --git a/drivers/net/ethernet/qlogic/qed/qed_mcp.h b/drivers/net/ethernet/qlogic/qed/qed_mcp.h
index 8a5c988d0c3c..1adfe52b3905 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_mcp.h
+++ b/drivers/net/ethernet/qlogic/qed/qed_mcp.h
@@ -213,6 +213,44 @@ enum qed_ov_wol {
         QED_OV_WOL_ENABLED
 };
 
+enum qed_mfw_tlv_type {
+        QED_MFW_TLV_GENERIC = 0x1,      /* Core driver TLVs */
+        QED_MFW_TLV_ETH = 0x2,          /* L2 driver TLVs */
+        QED_MFW_TLV_FCOE = 0x4,         /* FCoE protocol TLVs */
+        QED_MFW_TLV_ISCSI = 0x8,        /* SCSI protocol TLVs */
+        QED_MFW_TLV_MAX = 0x16,
+};
+
+struct qed_mfw_tlv_generic {
+#define QED_MFW_TLV_FLAGS_SIZE  2
+        struct {
+                u8 ipv4_csum_offload;
+                u8 lso_supported;
+                bool b_set;
+        } flags;
+
+#define QED_MFW_TLV_MAC_COUNT 3
+        /* First entry for primary MAC, 2 secondary MACs possible */
+        u8 mac[QED_MFW_TLV_MAC_COUNT][6];
+        bool mac_set[QED_MFW_TLV_MAC_COUNT];
+
+        u64 rx_frames;
+        bool rx_frames_set;
+        u64 rx_bytes;
+        bool rx_bytes_set;
+        u64 tx_frames;
+        bool tx_frames_set;
+        u64 tx_bytes;
+        bool tx_bytes_set;
+};
+
+union qed_mfw_tlv_data {
+        struct qed_mfw_tlv_generic generic;
+        struct qed_mfw_tlv_eth eth;
+        struct qed_mfw_tlv_fcoe fcoe;
+        struct qed_mfw_tlv_iscsi iscsi;
+};
+
 /**
  * @brief - returns the link params of the hw function
  *
@@ -284,14 +322,61 @@ int qed_mcp_get_mbi_ver(struct qed_hwfn *p_hwfn,
  * @brief Get media type value of the port.
  *
  * @param cdev      - qed dev pointer
+ * @param p_ptt
  * @param mfw_ver    - media type value
  *
  * @return int -
  *      0 - Operation was successul.
  *      -EBUSY - Operation failed
  */
-int qed_mcp_get_media_type(struct qed_dev      *cdev,
-                           u32                  *media_type);
+int qed_mcp_get_media_type(struct qed_hwfn *p_hwfn,
+                           struct qed_ptt *p_ptt, u32 *media_type);
+
+/**
+ * @brief Get transceiver data of the port.
+ *
+ * @param cdev      - qed dev pointer
+ * @param p_ptt
+ * @param p_transceiver_state - transceiver state.
+ * @param p_transceiver_type - media type value
+ *
+ * @return int -
+ *      0 - Operation was successful.
+ *      -EBUSY - Operation failed
+ */
+int qed_mcp_get_transceiver_data(struct qed_hwfn *p_hwfn,
+                                 struct qed_ptt *p_ptt,
+                                 u32 *p_transceiver_state,
+                                 u32 *p_tranceiver_type);
+
+/**
+ * @brief Get transceiver supported speed mask.
+ *
+ * @param cdev      - qed dev pointer
+ * @param p_ptt
+ * @param p_speed_mask - Bit mask of all supported speeds.
+ *
+ * @return int -
+ *      0 - Operation was successful.
+ *      -EBUSY - Operation failed
+ */
+
+int qed_mcp_trans_speed_mask(struct qed_hwfn *p_hwfn,
+                             struct qed_ptt *p_ptt, u32 *p_speed_mask);
+
+/**
+ * @brief Get board configuration.
+ *
+ * @param cdev      - qed dev pointer
+ * @param p_ptt
+ * @param p_board_config - Board config.
+ *
+ * @return int -
+ *      0 - Operation was successful.
+ *      -EBUSY - Operation failed
+ */
+int qed_mcp_get_board_config(struct qed_hwfn *p_hwfn,
+                             struct qed_ptt *p_ptt, u32 *p_board_config);
 
 /**
  * @brief General function for sending commands to the MCP
@@ -486,7 +571,20 @@ struct qed_nvm_image_att {
  * @brief Allows reading a whole nvram image
  *
  * @param p_hwfn
- * @param p_ptt
+ * @param image_id - image to get attributes for
+ * @param p_image_att - image attributes structure into which to fill data
+ *
+ * @return int - 0 - operation was successful.
+ */
+int
+qed_mcp_get_nvm_image_att(struct qed_hwfn *p_hwfn,
+                          enum qed_nvm_images image_id,
+                          struct qed_nvm_image_att *p_image_att);
+
+/**
+ * @brief Allows reading a whole nvram image
+ *
+ * @param p_hwfn
  * @param image_id - image requested for reading
  * @param p_buffer - allocated buffer into which to fill data
  * @param buffer_len - length of the allocated buffer.
@@ -494,7 +592,6 @@ struct qed_nvm_image_att {
  * @return 0 iff p_buffer now contains the nvram image.
  */
 int qed_mcp_get_nvm_image(struct qed_hwfn *p_hwfn,
-                          struct qed_ptt *p_ptt,
                           enum qed_nvm_images image_id,
                           u8 *p_buffer, u32 buffer_len);
 
@@ -549,6 +646,17 @@ int qed_mcp_bist_nvm_get_image_att(struct qed_hwfn *p_hwfn,
                                    struct bist_nvm_image_att *p_image_att,
                                    u32 image_index);
 
+/**
+ * @brief - Processes the TLV request from MFW i.e., get the required TLV info
+ *          from the qed client and send it to the MFW.
+ *
+ * @param p_hwfn
+ * @param p_ptt
+ *
+ * @param return 0 upon success.
+ */
+int qed_mfw_process_tlv_req(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt);
+
 /* Using hwfn number (and not pf_num) is required since in CMT mode,
  * same pf_num may be used by two different hwfn
  * TODO - this shouldn't really be in .h file, but until all fields
@@ -574,11 +682,14 @@ struct qed_mcp_info {
          */
         spinlock_t                              cmd_lock;
 
+        /* Flag to indicate whether sending a MFW mailbox command is blocked */
+        bool                                    b_block_cmd;
+
         /* Spinlock used for syncing SW link-changes and link-changes
          * originating from attention context.
          */
         spinlock_t                              link_lock;
-        bool                                    block_mb_sending;
+
         u32                                     public_base;
         u32                                     drv_mb_addr;
         u32                                     mfw_mb_addr;
@@ -599,14 +710,28 @@ struct qed_mcp_info {
 };
 
 struct qed_mcp_mb_params {
-        u32                     cmd;
-        u32                     param;
-        void                    *p_data_src;
-        u8                      data_src_size;
-        void                    *p_data_dst;
-        u8                      data_dst_size;
-        u32                     mcp_resp;
-        u32                     mcp_param;
+        u32 cmd;
+        u32 param;
+        void *p_data_src;
+        void *p_data_dst;
+        u8 data_src_size;
+        u8 data_dst_size;
+        u32 mcp_resp;
+        u32 mcp_param;
+        u32 flags;
+#define QED_MB_FLAG_CAN_SLEEP   (0x1 << 0)
+#define QED_MB_FLAG_AVOID_BLOCK (0x1 << 1)
+#define QED_MB_FLAGS_IS_SET(params, flag) \
+        ({ typeof(params) __params = (params); \
+           (__params && (__params->flags & QED_MB_FLAG_ ## flag)); })
+};
+
+struct qed_drv_tlv_hdr {
+        u8 tlv_type;
+        u8 tlv_length;  /* In dwords - not including this header */
+        u8 tlv_reserved;
+#define QED_DRV_TLV_FLAGS_CHANGED 0x01
+        u8 tlv_flags;
 };
 
 /**
@@ -771,6 +896,22 @@ int qed_mcp_nvm_rd_cmd(struct qed_hwfn *p_hwfn,
                        u32 *o_mcp_param, u32 *o_txn_size, u32 *o_buf);
 
 /**
+ * @brief Read from sfp
+ *
+ *  @param p_hwfn - hw function
+ *  @param p_ptt  - PTT required for register access
+ *  @param port   - transceiver port
+ *  @param addr   - I2C address
+ *  @param offset - offset in sfp
+ *  @param len    - buffer length
+ *  @param p_buf  - buffer to read into
+ *
+ * @return int - 0 - operation was successful.
+ */
+int qed_mcp_phy_sfp_read(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt,
+                         u32 port, u32 addr, u32 offset, u32 len, u8 *p_buf);
+
+/**
  * @brief indicates whether the MFW objects [under mcp_info] are accessible
  *
  * @param p_hwfn
@@ -993,6 +1134,14 @@ int qed_mcp_get_capabilities(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt);
 int qed_mcp_set_capabilities(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt);
 
 /**
+ * @brief Read ufp config from the shared memory.
+ *
+ * @param p_hwfn
+ * @param p_ptt
+ */
+void qed_mcp_read_ufp_config(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt);
+
+/**
  * @brief Populate the nvm info shadow in the given hardware function
  *
  * @param p_hwfn