add stmac read mac form eeprom

hc

2023-12-09 b22da3d8526a935aa31e086e63f60ff3246cb61c

 kernel/drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c
..
..
@@ -33,6 +33,7 @@
33
33
 #include <linux/etherdevice.h>
34
34
 #include <linux/mlx5/driver.h>
35
35
 #include <linux/mlx5/mlx5_ifc.h>
36
+#include <linux/mlx5/mpfs.h>
36
37
 #include <linux/mlx5/eswitch.h>
37
38
 #include "mlx5_core.h"
38
39
 #include "lib/mpfs.h"
..
..
@@ -40,8 +41,7 @@
40
41
 /* HW L2 Table (MPFS) management */
41
42
 static int set_l2table_entry_cmd(struct mlx5_core_dev *dev, u32 index, u8 *mac)
42
43
 {
43
-	u32 in[MLX5_ST_SZ_DW(set_l2_table_entry_in)]   = {0};
44
-	u32 out[MLX5_ST_SZ_DW(set_l2_table_entry_out)] = {0};
44
+	u32 in[MLX5_ST_SZ_DW(set_l2_table_entry_in)] = {};
45
45
 	u8 *in_mac_addr;
46
46
 
47
47
 	MLX5_SET(set_l2_table_entry_in, in, opcode, MLX5_CMD_OP_SET_L2_TABLE_ENTRY);
..
..
@@ -50,23 +50,23 @@
50
50
 	in_mac_addr = MLX5_ADDR_OF(set_l2_table_entry_in, in, mac_address);
51
51
 	ether_addr_copy(&in_mac_addr[2], mac);
52
52
 
53
-	return mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));
53
+	return mlx5_cmd_exec_in(dev, set_l2_table_entry, in);
54
54
 }
55
55
 
56
56
 static int del_l2table_entry_cmd(struct mlx5_core_dev *dev, u32 index)
57
57
 {
58
-	u32 in[MLX5_ST_SZ_DW(delete_l2_table_entry_in)]   = {0};
59
-	u32 out[MLX5_ST_SZ_DW(delete_l2_table_entry_out)] = {0};
58
+	u32 in[MLX5_ST_SZ_DW(delete_l2_table_entry_in)] = {};
60
59
 
61
60
 	MLX5_SET(delete_l2_table_entry_in, in, opcode, MLX5_CMD_OP_DELETE_L2_TABLE_ENTRY);
62
61
 	MLX5_SET(delete_l2_table_entry_in, in, table_index, index);
63
-	return mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));
62
+	return mlx5_cmd_exec_in(dev, delete_l2_table_entry, in);
64
63
 }
65
64
 
66
65
 /* UC L2 table hash node */
67
66
 struct l2table_node {
68
67
 	struct l2addr_node node;
69
68
 	u32                index; /* index in HW l2 table */
69
+	int                ref_count;
70
70
 };
71
71
 
72
72
 struct mlx5_mpfs {
..
..
@@ -108,8 +108,7 @@
108
108
 
109
109
 	mutex_init(&mpfs->lock);
110
110
 	mpfs->size   = l2table_size;
111
-	mpfs->bitmap = kcalloc(BITS_TO_LONGS(l2table_size),
112
-			       sizeof(uintptr_t), GFP_KERNEL);
111
+	mpfs->bitmap = bitmap_zalloc(l2table_size, GFP_KERNEL);
113
112
 	if (!mpfs->bitmap) {
114
113
 		kfree(mpfs);
115
114
 		return -ENOMEM;
..
..
@@ -123,11 +122,11 @@
123
122
 {
124
123
 	struct mlx5_mpfs *mpfs = dev->priv.mpfs;
125
124
 
126
-	if (!MLX5_ESWITCH_MANAGER(dev))
125
+	if (!mpfs)
127
126
 		return;
128
127
 
129
128
 	WARN_ON(!hlist_empty(mpfs->hash));
130
-	kfree(mpfs->bitmap);
129
+	bitmap_free(mpfs->bitmap);
131
130
 	kfree(mpfs);
132
131
 }
133
132
 
..
..
@@ -135,43 +134,49 @@
135
134
 {
136
135
 	struct mlx5_mpfs *mpfs = dev->priv.mpfs;
137
136
 	struct l2table_node *l2addr;
137
+	int err = 0;
138
138
 	u32 index;
139
-	int err;
140
139
 
141
-	if (!MLX5_ESWITCH_MANAGER(dev))
140
+	if (!mpfs)
142
141
 		return 0;
143
142
 
144
143
 	mutex_lock(&mpfs->lock);
145
144
 
146
145
 	l2addr = l2addr_hash_find(mpfs->hash, mac, struct l2table_node);
147
146
 	if (l2addr) {
148
-		err = -EEXIST;
149
-		goto abort;
147
+		l2addr->ref_count++;
148
+		goto out;
150
149
 	}
151
150
 
152
151
 	err = alloc_l2table_index(mpfs, &index);
153
152
 	if (err)
154
-		goto abort;
153
+		goto out;
155
154
 
156
155
 	l2addr = l2addr_hash_add(mpfs->hash, mac, struct l2table_node, GFP_KERNEL);
157
156
 	if (!l2addr) {
158
-		free_l2table_index(mpfs, index);
159
157
 		err = -ENOMEM;
160
-		goto abort;
158
+		goto hash_add_err;
161
159
 	}
160
+
161
+	err = set_l2table_entry_cmd(dev, index, mac);
162
+	if (err)
163
+		goto set_table_entry_err;
162
164
 
163
165
 	l2addr->index = index;
164
-	err = set_l2table_entry_cmd(dev, index, mac);
165
-	if (err) {
166
-		l2addr_hash_del(l2addr);
167
-		free_l2table_index(mpfs, index);
168
-	}
166
+	l2addr->ref_count = 1;
169
167
 
170
168
 	mlx5_core_dbg(dev, "MPFS mac added %pM, index (%d)\n", mac, index);
171
-abort:
169
+	goto out;
170
+
171
+set_table_entry_err:
172
+	l2addr_hash_del(l2addr);
173
+hash_add_err:
174
+	free_l2table_index(mpfs, index);
175
+out:
172
176
 	mutex_unlock(&mpfs->lock);
173
177
 	return err;
174
178
 }
179
+EXPORT_SYMBOL(mlx5_mpfs_add_mac);
175
180
 
176
181
 int mlx5_mpfs_del_mac(struct mlx5_core_dev *dev, u8 *mac)
177
182
 {
..
..
@@ -180,7 +185,7 @@
180
185
 	int err = 0;
181
186
 	u32 index;
182
187
 
183
-	if (!MLX5_ESWITCH_MANAGER(dev))
188
+	if (!mpfs)
184
189
 		return 0;
185
190
 
186
191
 	mutex_lock(&mpfs->lock);
..
..
@@ -191,6 +196,9 @@
191
196
 		goto unlock;
192
197
 	}
193
198
 
199
+	if (--l2addr->ref_count > 0)
200
+		goto unlock;
201
+
194
202
 	index = l2addr->index;
195
203
 	del_l2table_entry_cmd(dev, index);
196
204
 	l2addr_hash_del(l2addr);
..
..
@@ -200,3 +208,4 @@
200
208
 	mutex_unlock(&mpfs->lock);
201
209
 	return err;
202
210
 }
211
+EXPORT_SYMBOL(mlx5_mpfs_del_mac);