重命名 AX88772C_eeprom/asix.c 为 asix_mac.c

hc

2024-09-20 a36159eec6ca17402b0e146b86efaf76568dc353

 kernel/drivers/net/ethernet/renesas/ravb.h
..
..
@@ -193,16 +193,12 @@
193
193
 	GECMR	= 0x05b0,
194
194
 	MAHR	= 0x05c0,
195
195
 	MALR	= 0x05c8,
196
-	TROCR	= 0x0700,	/* Undocumented? */
197
-	CDCR	= 0x0708,	/* Undocumented? */
198
-	LCCR	= 0x0710,	/* Undocumented? */
196
+	TROCR	= 0x0700,	/* R-Car Gen3 only */
199
197
 	CEFCR	= 0x0740,
200
198
 	FRECR	= 0x0748,
201
199
 	TSFRCR	= 0x0750,
202
200
 	TLFRCR	= 0x0758,
203
201
 	RFCR	= 0x0760,
204
-	CERCR	= 0x0768,	/* Undocumented? */
205
-	CEECR	= 0x0770,	/* Undocumented? */
206
202
 	MAFCR	= 0x0778,
207
203
 };
208
204
 
..
..
@@ -220,7 +216,6 @@
220
216
 	CCC_CSEL_HPB	= 0x00010000,
221
217
 	CCC_CSEL_ETH_TX	= 0x00020000,
222
218
 	CCC_CSEL_GMII_REF = 0x00030000,
223
-	CCC_BOC		= 0x00100000,	/* Undocumented? */
224
219
 	CCC_LBME	= 0x01000000,
225
220
 };
226
221
 
..
..
@@ -317,7 +312,7 @@
317
312
 
318
313
 /* SFO */
319
314
 enum SFO_BIT {
320
-	SFO_FPB		= 0x0000003F,
315
+	SFO_FBP		= 0x0000003F,
321
316
 };
322
317
 
323
318
 /* RTC */
..
..
@@ -959,7 +954,12 @@
959
954
 #define RX_QUEUE_OFFSET	4
960
955
 #define NUM_RX_QUEUE	2
961
956
 #define NUM_TX_QUEUE	2
962
-#define NUM_TX_DESC	2	/* TX descriptors per packet */
957
+
958
+#define RX_BUF_SZ	(2048 - ETH_FCS_LEN + sizeof(__sum16))
959
+
960
+/* TX descriptors per packet */
961
+#define NUM_TX_DESC_GEN2	2
962
+#define NUM_TX_DESC_GEN3	1
963
963
 
964
964
 struct ravb_tstamp_skb {
965
965
 	struct list_head list;
..
..
@@ -1020,7 +1020,6 @@
1020
1020
 	u32 dirty_rx[NUM_RX_QUEUE];	/* Producer ring indices */
1021
1021
 	u32 cur_tx[NUM_TX_QUEUE];
1022
1022
 	u32 dirty_tx[NUM_TX_QUEUE];
1023
-	u32 rx_buf_sz;			/* Based on MTU+slack. */
1024
1023
 	struct napi_struct napi[NUM_RX_QUEUE];
1025
1024
 	struct work_struct work;
1026
1025
 	/* MII transceiver section. */
..
..
@@ -1037,6 +1036,10 @@
1037
1036
 	unsigned no_avb_link:1;
1038
1037
 	unsigned avb_link_active_low:1;
1039
1038
 	unsigned wol_enabled:1;
1039
+	unsigned rxcidm:1;		/* RX Clock Internal Delay Mode */
1040
+	unsigned txcidm:1;		/* TX Clock Internal Delay Mode */
1041
+	unsigned rgmii_override:1;	/* Deprecated rgmii-*id behavior */
1042
+	int num_tx_desc;		/* TX descriptors per packet */
1040
1043
 };
1041
1044
 
1042
1045
 static inline u32 ravb_read(struct net_device *ndev, enum ravb_reg reg)