enable tun/tap/iptables

hc

2024-05-10 ee930fffee469d076998274a2ca55e13dc1efb67

 kernel/drivers/infiniband/hw/hns/hns_roce_hem.h
..
..
@@ -34,9 +34,7 @@
34
34
 #ifndef _HNS_ROCE_HEM_H
35
35
 #define _HNS_ROCE_HEM_H
36
36
 
37
-#define HW_SYNC_TIMEOUT_MSECS		500
38
-#define HW_SYNC_SLEEP_TIME_INTERVAL	20
39
-#define BT_CMD_SYNC_SHIFT		31
37
+#define HEM_HOP_STEP_DIRECT 0xff
40
38
 
41
39
 enum {
42
40
 	/* MAP HEM(Hardware Entry Memory) */
..
..
@@ -44,10 +42,15 @@
44
42
 	HEM_TYPE_MTPT,
45
43
 	HEM_TYPE_CQC,
46
44
 	HEM_TYPE_SRQC,
45
+	HEM_TYPE_SCCC,
46
+	HEM_TYPE_QPC_TIMER,
47
+	HEM_TYPE_CQC_TIMER,
47
48
 
48
49
 	 /* UNMAP HEM */
49
50
 	HEM_TYPE_MTT,
50
51
 	HEM_TYPE_CQE,
52
+	HEM_TYPE_SRQWQE,
53
+	HEM_TYPE_IDX,
51
54
 	HEM_TYPE_IRRL,
52
55
 	HEM_TYPE_TRRL,
53
56
 };
..
..
@@ -68,11 +71,6 @@
68
71
 	(type >= HEM_TYPE_MTT && hop_num == 1) || \
69
72
 	(type >= HEM_TYPE_MTT && hop_num == HNS_ROCE_HOP_NUM_0))
70
73
 
71
-enum {
72
-	 HNS_ROCE_HEM_PAGE_SHIFT = 12,
73
-	 HNS_ROCE_HEM_PAGE_SIZE  = 1 << HNS_ROCE_HEM_PAGE_SHIFT,
74
-};
75
-
76
74
 struct hns_roce_hem_chunk {
77
75
 	struct list_head	 list;
78
76
 	int			 npages;
..
..
@@ -82,8 +80,8 @@
82
80
 };
83
81
 
84
82
 struct hns_roce_hem {
85
-	struct list_head	 chunk_list;
86
-	int			 refcount;
83
+	struct list_head chunk_list;
84
+	refcount_t refcount;
87
85
 };
88
86
 
89
87
 struct hns_roce_hem_iter {
..
..
@@ -97,9 +95,9 @@
97
95
 	u32	buf_chunk_size;
98
96
 	u32	bt_chunk_size;
99
97
 	u32	ba_l0_num;
100
-	u32	l0_idx;/* level 0 base address table index */
101
-	u32	l1_idx;/* level 1 base address table index */
102
-	u32	l2_idx;/* level 2 base address table index */
98
+	u32	l0_idx; /* level 0 base address table index */
99
+	u32	l1_idx; /* level 1 base address table index */
100
+	u32	l2_idx; /* level 2 base address table index */
103
101
 };
104
102
 
105
103
 void hns_roce_free_hem(struct hns_roce_dev *hr_dev, struct hns_roce_hem *hem);
..
..
@@ -110,12 +108,6 @@
110
108
 void *hns_roce_table_find(struct hns_roce_dev *hr_dev,
111
109
 			  struct hns_roce_hem_table *table, unsigned long obj,
112
110
 			  dma_addr_t *dma_handle);
113
-int hns_roce_table_get_range(struct hns_roce_dev *hr_dev,
114
-			     struct hns_roce_hem_table *table,
115
-			     unsigned long start, unsigned long end);
116
-void hns_roce_table_put_range(struct hns_roce_dev *hr_dev,
117
-			      struct hns_roce_hem_table *table,
118
-			      unsigned long start, unsigned long end);
119
111
 int hns_roce_init_hem_table(struct hns_roce_dev *hr_dev,
120
112
 			    struct hns_roce_hem_table *table, u32 type,
121
113
 			    unsigned long obj_size, unsigned long nobj,
..
..
@@ -127,6 +119,19 @@
127
119
 			   struct hns_roce_hem_table *table, unsigned long *obj,
128
120
 			   struct hns_roce_hem_mhop *mhop);
129
121
 bool hns_roce_check_whether_mhop(struct hns_roce_dev *hr_dev, u32 type);
122
+
123
+void hns_roce_hem_list_init(struct hns_roce_hem_list *hem_list);
124
+int hns_roce_hem_list_calc_root_ba(const struct hns_roce_buf_region *regions,
125
+				   int region_cnt, int unit);
126
+int hns_roce_hem_list_request(struct hns_roce_dev *hr_dev,
127
+			      struct hns_roce_hem_list *hem_list,
128
+			      const struct hns_roce_buf_region *regions,
129
+			      int region_cnt, unsigned int bt_pg_shift);
130
+void hns_roce_hem_list_release(struct hns_roce_dev *hr_dev,
131
+			       struct hns_roce_hem_list *hem_list);
132
+void *hns_roce_hem_list_find_mtt(struct hns_roce_dev *hr_dev,
133
+				 struct hns_roce_hem_list *hem_list,
134
+				 int offset, int *mtt_cnt, u64 *phy_addr);
130
135
 
131
136
 static inline void hns_roce_hem_first(struct hns_roce_hem *hem,
132
137
 				      struct hns_roce_hem_iter *iter)
..
..
@@ -162,4 +167,4 @@
162
167
 	return sg_dma_address(&iter->chunk->mem[iter->page_idx]);
163
168
 }
164
169
 
165
-#endif /*_HNS_ROCE_HEM_H*/
170
+#endif /* _HNS_ROCE_HEM_H */