add r8169 read mac form eeprom

hc

2024-02-19 1c055e55a242a33e574e48be530e06770a210dcd

 kernel/drivers/tty/serial/sb1250-duart.c
..
..
@@ -15,10 +15,6 @@
15
15
  *	"BCM1250/BCM1125/BCM1125H User Manual", Broadcom Corporation
16
16
  */
17
17
 
18
-#if defined(CONFIG_SERIAL_SB1250_DUART_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
19
-#define SUPPORT_SYSRQ
20
-#endif
21
-
22
18
 #include <linux/compiler.h>
23
19
 #include <linux/console.h>
24
20
 #include <linux/delay.h>
..
..
@@ -39,7 +35,6 @@
39
35
 
40
36
 #include <linux/refcount.h>
41
37
 #include <asm/io.h>
42
-#include <asm/war.h>
43
38
 
44
39
 #include <asm/sibyte/sb1250.h>
45
40
 #include <asm/sibyte/sb1250_uart.h>
..
..
@@ -161,7 +156,7 @@
161
156
 	unsigned char retval;
162
157
 
163
158
 	retval = __read_sbdchn(sport, reg);
164
-	if (SIBYTE_1956_WAR)
159
+	if (IS_ENABLED(CONFIG_SB1_PASS_2_WORKAROUNDS))
165
160
 		__war_sbd1956(sport);
166
161
 	return retval;
167
162
 }
..
..
@@ -171,7 +166,7 @@
171
166
 	unsigned char retval;
172
167
 
173
168
 	retval = __read_sbdshr(sport, reg);
174
-	if (SIBYTE_1956_WAR)
169
+	if (IS_ENABLED(CONFIG_SB1_PASS_2_WORKAROUNDS))
175
170
 		__war_sbd1956(sport);
176
171
 	return retval;
177
172
 }
..
..
@@ -179,14 +174,14 @@
179
174
 static void write_sbdchn(struct sbd_port *sport, int reg, unsigned int value)
180
175
 {
181
176
 	__write_sbdchn(sport, reg, value);
182
-	if (SIBYTE_1956_WAR)
177
+	if (IS_ENABLED(CONFIG_SB1_PASS_2_WORKAROUNDS))
183
178
 		__war_sbd1956(sport);
184
179
 }
185
180
 
186
181
 static void write_sbdshr(struct sbd_port *sport, int reg, unsigned int value)
187
182
 {
188
183
 	__write_sbdshr(sport, reg, value);
189
-	if (SIBYTE_1956_WAR)
184
+	if (IS_ENABLED(CONFIG_SB1_PASS_2_WORKAROUNDS))
190
185
 		__war_sbd1956(sport);
191
186
 }
192
187
 
..
..
@@ -668,7 +663,7 @@
668
663
 	struct sbd_duart *duart = sport->duart;
669
664
 
670
665
 	if (!uport->membase)
671
-		uport->membase = ioremap_nocache(uport->mapbase,
666
+		uport->membase = ioremap(uport->mapbase,
672
667
 						 DUART_CHANREG_SPACING);
673
668
 	if (!uport->membase) {
674
669
 		printk(err);
..
..
@@ -676,7 +671,7 @@
676
671
 	}
677
672
 
678
673
 	if (!sport->memctrl)
679
-		sport->memctrl = ioremap_nocache(duart->mapctrl,
674
+		sport->memctrl = ioremap(duart->mapctrl,
680
675
 						 DUART_CHANREG_SPACING);
681
676
 	if (!sport->memctrl) {
682
677
 		printk(err);
..
..
@@ -813,6 +808,7 @@
813
808
 			uport->ops	= &sbd_ops;
814
809
 			uport->line	= line;
815
810
 			uport->mapbase	= SBD_CHANREGS(line);
811
+			uport->has_sysrq = IS_ENABLED(CONFIG_SERIAL_SB1250_DUART_CONSOLE);
816
812
 		}
817
813
 	}
818
814
 }