add stmac read mac form eeprom

hc

2023-12-09 b22da3d8526a935aa31e086e63f60ff3246cb61c

 kernel/drivers/infiniband/sw/rxe/rxe_av.c
..
..
@@ -1,50 +1,39 @@
1
+// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB
1
2
 /*
2
3
  * Copyright (c) 2016 Mellanox Technologies Ltd. All rights reserved.
3
4
  * Copyright (c) 2015 System Fabric Works, Inc. All rights reserved.
4
- *
5
- * This software is available to you under a choice of one of two
6
- * licenses.  You may choose to be licensed under the terms of the GNU
7
- * General Public License (GPL) Version 2, available from the file
8
- * COPYING in the main directory of this source tree, or the
9
- * OpenIB.org BSD license below:
10
- *
11
- *	   Redistribution and use in source and binary forms, with or
12
- *	   without modification, are permitted provided that the following
13
- *	   conditions are met:
14
- *
15
- *		- Redistributions of source code must retain the above
16
- *		  copyright notice, this list of conditions and the following
17
- *		  disclaimer.
18
- *
19
- *		- Redistributions in binary form must reproduce the above
20
- *		  copyright notice, this list of conditions and the following
21
- *		  disclaimer in the documentation and/or other materials
22
- *		  provided with the distribution.
23
- *
24
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
25
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
26
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
27
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
28
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
29
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
30
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
31
- * SOFTWARE.
32
5
  */
33
6
 
34
7
 #include "rxe.h"
35
8
 #include "rxe_loc.h"
36
9
 
10
+void rxe_init_av(struct rdma_ah_attr *attr, struct rxe_av *av)
11
+{
12
+	rxe_av_from_attr(rdma_ah_get_port_num(attr), av, attr);
13
+	rxe_av_fill_ip_info(av, attr);
14
+	memcpy(av->dmac, attr->roce.dmac, ETH_ALEN);
15
+}
16
+
37
17
 int rxe_av_chk_attr(struct rxe_dev *rxe, struct rdma_ah_attr *attr)
38
18
 {
19
+	const struct ib_global_route *grh = rdma_ah_read_grh(attr);
39
20
 	struct rxe_port *port;
21
+	int type;
40
22
 
41
23
 	port = &rxe->port;
42
24
 
43
25
 	if (rdma_ah_get_ah_flags(attr) & IB_AH_GRH) {
44
-		u8 sgid_index = rdma_ah_read_grh(attr)->sgid_index;
26
+		if (grh->sgid_index > port->attr.gid_tbl_len) {
27
+			pr_warn("invalid sgid index = %d\n",
28
+					grh->sgid_index);
29
+			return -EINVAL;
30
+		}
45
31
 
46
-		if (sgid_index > port->attr.gid_tbl_len) {
47
-			pr_warn("invalid sgid index = %d\n", sgid_index);
32
+		type = rdma_gid_attr_network_type(grh->sgid_attr);
33
+		if (type < RDMA_NETWORK_IPV4 ||
34
+		    type > RDMA_NETWORK_IPV6) {
35
+			pr_warn("invalid network type for rdma_rxe = %d\n",
36
+					type);
48
37
 			return -EINVAL;
49
38
 		}
50
39
 	}
..
..
@@ -85,11 +74,29 @@
85
74
 void rxe_av_fill_ip_info(struct rxe_av *av, struct rdma_ah_attr *attr)
86
75
 {
87
76
 	const struct ib_gid_attr *sgid_attr = attr->grh.sgid_attr;
77
+	int ibtype;
78
+	int type;
88
79
 
89
80
 	rdma_gid2ip((struct sockaddr *)&av->sgid_addr, &sgid_attr->gid);
90
81
 	rdma_gid2ip((struct sockaddr *)&av->dgid_addr,
91
82
 		    &rdma_ah_read_grh(attr)->dgid);
92
-	av->network_type = rdma_gid_attr_network_type(sgid_attr);
83
+
84
+	ibtype = rdma_gid_attr_network_type(sgid_attr);
85
+
86
+	switch (ibtype) {
87
+	case RDMA_NETWORK_IPV4:
88
+		type = RXE_NETWORK_TYPE_IPV4;
89
+		break;
90
+	case RDMA_NETWORK_IPV6:
91
+		type = RXE_NETWORK_TYPE_IPV6;
92
+		break;
93
+	default:
94
+		/* not reached - checked in rxe_av_chk_attr */
95
+		type = 0;
96
+		break;
97
+	}
98
+
99
+	av->network_type = type;
93
100
 }
94
101
 
95
102
 struct rxe_av *rxe_get_av(struct rxe_pkt_info *pkt)