add stmac read mac form eeprom

hc

2023-12-09 b22da3d8526a935aa31e086e63f60ff3246cb61c

 kernel/drivers/char/ipmi/ipmi_smic_sm.c
..
..
@@ -21,6 +21,8 @@
21
21
  * 2001 Hewlett-Packard Company
22
22
  */
23
23
 
24
+#define DEBUG /* So dev_dbg() is always available. */
25
+
24
26
 #include <linux/kernel.h> /* For printk. */
25
27
 #include <linux/string.h>
26
28
 #include <linux/module.h>
..
..
@@ -126,14 +128,17 @@
126
128
 	if (size > MAX_SMIC_WRITE_SIZE)
127
129
 		return IPMI_REQ_LEN_EXCEEDED_ERR;
128
130
 
129
-	if ((smic->state != SMIC_IDLE) && (smic->state != SMIC_HOSED))
131
+	if ((smic->state != SMIC_IDLE) && (smic->state != SMIC_HOSED)) {
132
+		dev_warn(smic->io->dev,
133
+			 "SMIC in invalid state %d\n", smic->state);
130
134
 		return IPMI_NOT_IN_MY_STATE_ERR;
135
+	}
131
136
 
132
137
 	if (smic_debug & SMIC_DEBUG_MSG) {
133
-		printk(KERN_DEBUG "start_smic_transaction -");
138
+		dev_dbg(smic->io->dev, "%s -", __func__);
134
139
 		for (i = 0; i < size; i++)
135
-			printk(" %02x", (unsigned char) data[i]);
136
-		printk("\n");
140
+			pr_cont(" %02x", data[i]);
141
+		pr_cont("\n");
137
142
 	}
138
143
 	smic->error_retries = 0;
139
144
 	memcpy(smic->write_data, data, size);
..
..
@@ -152,10 +157,10 @@
152
157
 	int i;
153
158
 
154
159
 	if (smic_debug & SMIC_DEBUG_MSG) {
155
-		printk(KERN_DEBUG "smic_get result -");
160
+		dev_dbg(smic->io->dev, "smic_get result -");
156
161
 		for (i = 0; i < smic->read_pos; i++)
157
-			printk(" %02x", smic->read_data[i]);
158
-		printk("\n");
162
+			pr_cont(" %02x", smic->read_data[i]);
163
+		pr_cont("\n");
159
164
 	}
160
165
 	if (length < smic->read_pos) {
161
166
 		smic->read_pos = length;
..
..
@@ -212,8 +217,7 @@
212
217
 	(smic->error_retries)++;
213
218
 	if (smic->error_retries > SMIC_MAX_ERROR_RETRIES) {
214
219
 		if (smic_debug & SMIC_DEBUG_ENABLE)
215
-			printk(KERN_WARNING
216
-			       "ipmi_smic_drv: smic hosed: %s\n", reason);
220
+			pr_warn("ipmi_smic_drv: smic hosed: %s\n", reason);
217
221
 		smic->state = SMIC_HOSED;
218
222
 	} else {
219
223
 		smic->write_count = smic->orig_write_count;
..
..
@@ -325,10 +329,9 @@
325
329
 	}
326
330
 	if (smic->state != SMIC_IDLE) {
327
331
 		if (smic_debug & SMIC_DEBUG_STATES)
328
-			printk(KERN_DEBUG
329
-			       "smic_event - smic->smic_timeout = %ld,"
330
-			       " time = %ld\n",
331
-			       smic->smic_timeout, time);
332
+			dev_dbg(smic->io->dev,
333
+				"%s - smic->smic_timeout = %ld, time = %ld\n",
334
+				__func__, smic->smic_timeout, time);
332
335
 		/*
333
336
 		 * FIXME: smic_event is sometimes called with time >
334
337
 		 * SMIC_RETRY_TIMEOUT
..
..
@@ -347,10 +350,9 @@
347
350
 
348
351
 	status = read_smic_status(smic);
349
352
 	if (smic_debug & SMIC_DEBUG_STATES)
350
-		printk(KERN_DEBUG
351
-		       "smic_event - state = %d, flags = 0x%02x,"
352
-		       " status = 0x%02x\n",
353
-		       smic->state, flags, status);
353
+		dev_dbg(smic->io->dev,
354
+			"%s - state = %d, flags = 0x%02x, status = 0x%02x\n",
355
+			__func__, smic->state, flags, status);
354
356
 
355
357
 	switch (smic->state) {
356
358
 	case SMIC_IDLE:
..
..
@@ -440,8 +442,9 @@
440
442
 		data = read_smic_data(smic);
441
443
 		if (data != 0) {
442
444
 			if (smic_debug & SMIC_DEBUG_ENABLE)
443
-				printk(KERN_DEBUG
444
-				       "SMIC_WRITE_END: data = %02x\n", data);
445
+				dev_dbg(smic->io->dev,
446
+					"SMIC_WRITE_END: data = %02x\n",
447
+					data);
445
448
 			start_error_recovery(smic,
446
449
 					     "state = SMIC_WRITE_END, "
447
450
 					     "data != SUCCESS");
..
..
@@ -520,8 +523,9 @@
520
523
 		/* data register holds an error code */
521
524
 		if (data != 0) {
522
525
 			if (smic_debug & SMIC_DEBUG_ENABLE)
523
-				printk(KERN_DEBUG
524
-				       "SMIC_READ_END: data = %02x\n", data);
526
+				dev_dbg(smic->io->dev,
527
+					"SMIC_READ_END: data = %02x\n",
528
+					data);
525
529
 			start_error_recovery(smic,
526
530
 					     "state = SMIC_READ_END, "
527
531
 					     "data != SUCCESS");
..
..
@@ -537,7 +541,8 @@
537
541
 
538
542
 	default:
539
543
 		if (smic_debug & SMIC_DEBUG_ENABLE) {
540
-			printk(KERN_DEBUG "smic->state = %d\n", smic->state);
544
+			dev_dbg(smic->io->dev,
545
+				"smic->state = %d\n", smic->state);
541
546
 			start_error_recovery(smic, "state = UNKNOWN");
542
547
 			return SI_SM_CALL_WITH_DELAY;
543
548
 		}