net: hns3: merge some repetitive macros

[uclinux-h8/linux.git] / drivers / net / ethernet / hisilicon / hns3 / hns3vf / hclgevf_main.h

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h
index e8013be..883130a 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h
@@ -6,6 +6,7 @@
 #include <linux/fs.h>
 #include <linux/if_vlan.h>
 #include <linux/types.h>
+#include <net/devlink.h>
 #include "hclge_mbx.h"
 #include "hclgevf_cmd.h"
 #include "hnae3.h"
@@ -32,16 +33,17 @@
 #define HCLGEVF_VECTOR_VF_OFFSET               0x100000
 
 /* bar registers for cmdq */
-#define HCLGEVF_CMDQ_TX_ADDR_L_REG             0x27000
-#define HCLGEVF_CMDQ_TX_ADDR_H_REG             0x27004
-#define HCLGEVF_CMDQ_TX_DEPTH_REG              0x27008
-#define HCLGEVF_CMDQ_TX_TAIL_REG               0x27010
-#define HCLGEVF_CMDQ_TX_HEAD_REG               0x27014
-#define HCLGEVF_CMDQ_RX_ADDR_L_REG             0x27018
-#define HCLGEVF_CMDQ_RX_ADDR_H_REG             0x2701C
-#define HCLGEVF_CMDQ_RX_DEPTH_REG              0x27020
-#define HCLGEVF_CMDQ_RX_TAIL_REG               0x27024
-#define HCLGEVF_CMDQ_RX_HEAD_REG               0x27028
+#define HCLGEVF_NIC_CSQ_BASEADDR_L_REG         0x27000
+#define HCLGEVF_NIC_CSQ_BASEADDR_H_REG         0x27004
+#define HCLGEVF_NIC_CSQ_DEPTH_REG              0x27008
+#define HCLGEVF_NIC_CSQ_TAIL_REG               0x27010
+#define HCLGEVF_NIC_CSQ_HEAD_REG               0x27014
+#define HCLGEVF_NIC_CRQ_BASEADDR_L_REG         0x27018
+#define HCLGEVF_NIC_CRQ_BASEADDR_H_REG         0x2701C
+#define HCLGEVF_NIC_CRQ_DEPTH_REG              0x27020
+#define HCLGEVF_NIC_CRQ_TAIL_REG               0x27024
+#define HCLGEVF_NIC_CRQ_HEAD_REG               0x27028
+
 #define HCLGEVF_CMDQ_INTR_EN_REG               0x27108
 #define HCLGEVF_CMDQ_INTR_GEN_REG              0x2710C
 
@@ -316,7 +318,6 @@ struct hclgevf_dev {
 
        struct hclgevf_mac_table_cfg mac_table;
 
-       bool mbx_event_pending;
        struct hclgevf_mbx_resp_status mbx_resp; /* mailbox response */
        struct hclgevf_mbx_arq_ring arq; /* mailbox async rx queue */
 
@@ -332,6 +333,8 @@ struct hclgevf_dev {
        u32 flag;
        unsigned long serv_processed_cnt;
        unsigned long last_serv_processed;
+
+       struct devlink *devlink;
 };
 
 static inline bool hclgevf_is_reset_pending(struct hclgevf_dev *hdev)