gmac get mac form eeprom

hc

2024-05-10 37f49e37ab4cb5d0bc4c60eb5c6d4dd57db767bb

 kernel/drivers/net/dsa/mv88e6xxx/global2_avb.c
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  * Marvell 88E6xxx Switch Global 2 Registers support
3
4
  *
..
..
@@ -8,12 +9,9 @@
8
9
  *
9
10
  * Copyright (c) 2017 National Instruments
10
11
  *	Brandon Streiff <brandon.streiff@ni.com>
11
- *
12
- * This program is free software; you can redistribute it and/or modify
13
- * it under the terms of the GNU General Public License as published by
14
- * the Free Software Foundation; either version 2 of the License, or
15
- * (at your option) any later version.
16
12
  */
13
+
14
+#include <linux/bitfield.h>
17
15
 
18
16
 #include "global2.h"
19
17
 
..
..
@@ -31,17 +29,33 @@
31
29
 /* mv88e6xxx_g2_avb_read -- Read one or multiple 16-bit words.
32
30
  * The hardware supports snapshotting up to four contiguous registers.
33
31
  */
32
+static int mv88e6xxx_g2_avb_wait(struct mv88e6xxx_chip *chip)
33
+{
34
+	int bit = __bf_shf(MV88E6352_G2_AVB_CMD_BUSY);
35
+
36
+	return mv88e6xxx_g2_wait_bit(chip, MV88E6352_G2_AVB_CMD, bit, 0);
37
+}
38
+
34
39
 static int mv88e6xxx_g2_avb_read(struct mv88e6xxx_chip *chip, u16 readop,
35
40
 				 u16 *data, int len)
36
41
 {
37
42
 	int err;
38
43
 	int i;
39
44
 
45
+	err = mv88e6xxx_g2_avb_wait(chip);
46
+	if (err)
47
+		return err;
48
+
40
49
 	/* Hardware can only snapshot four words. */
41
50
 	if (len > 4)
42
51
 		return -E2BIG;
43
52
 
44
-	err = mv88e6xxx_g2_update(chip, MV88E6352_G2_AVB_CMD, readop);
53
+	err = mv88e6xxx_g2_write(chip, MV88E6352_G2_AVB_CMD,
54
+				 MV88E6352_G2_AVB_CMD_BUSY | readop);
55
+	if (err)
56
+		return err;
57
+
58
+	err = mv88e6xxx_g2_avb_wait(chip);
45
59
 	if (err)
46
60
 		return err;
47
61
 
..
..
@@ -61,11 +75,18 @@
61
75
 {
62
76
 	int err;
63
77
 
78
+	err = mv88e6xxx_g2_avb_wait(chip);
79
+	if (err)
80
+		return err;
81
+
64
82
 	err = mv88e6xxx_g2_write(chip, MV88E6352_G2_AVB_DATA, data);
65
83
 	if (err)
66
84
 		return err;
67
85
 
68
-	return mv88e6xxx_g2_update(chip, MV88E6352_G2_AVB_CMD, writeop);
86
+	err = mv88e6xxx_g2_write(chip, MV88E6352_G2_AVB_CMD,
87
+				 MV88E6352_G2_AVB_CMD_BUSY | writeop);
88
+
89
+	return mv88e6xxx_g2_avb_wait(chip);
69
90
 }
70
91
 
71
92
 static int mv88e6352_g2_avb_port_ptp_read(struct mv88e6xxx_chip *chip,