r8169 get mac form eeprom

hc

2024-08-13 72be3801e63d82671c9d90577a9efb3126a6aa37

 kernel/drivers/net/ethernet/realtek/r8169_main.c
..
..
@@ -3200,7 +3200,6 @@
3200
3200
 		{ 0x01, 0xffff,	0x068b }
3201
3201
 	};
3202
3202
 	int rg_saw_cnt;
3203
-
3204
3203
 	/* disable aspm and clock request before access ephy */
3205
3204
 	rtl_hw_aspm_clkreq_enable(tp, false);
3206
3205
 	rtl_ephy_init(tp, e_info_8168h_1);
..
..
@@ -3226,8 +3225,13 @@
3226
3225
 
3227
3226
 	RTL_W8(tp, DLLPR, RTL_R8(tp, DLLPR) & ~PFM_EN);
3228
3227
 	RTL_W8(tp, MISC_1, RTL_R8(tp, MISC_1) & ~PFM_D3COLD_EN);
3229
-
3228
+	
3230
3229
 	RTL_W8(tp, DLLPR, RTL_R8(tp, DLLPR) & ~TX_10M_PS_EN);
3230
+
3231
+
3232
+	printk("troy 0x18 value init: %x\n",RTL_R16(tp,0x18));
3233
+	RTL_W16(tp, 0x18, 0x042F);
3234
+	printk("troy 0x18 value write: %x\n",RTL_R16(tp,0x18));
3231
3235
 
3232
3236
 	rtl_eri_clear_bits(tp, 0x1b0, BIT(12));
3233
3237
 
..
..
@@ -5292,7 +5296,7 @@
5292
5296
 
5293
5297
 	return rc;
5294
5298
 }
5295
-extern ssize_t at24_mac_read(unsigned char* mac);
5299
+extern ssize_t at24_mac1_read(unsigned char* mac);
5296
5300
 static void rtl_init_mac_address(struct rtl8169_private *tp)
5297
5301
 {
5298
5302
 	struct net_device *dev = tp->dev;
..
..
@@ -5313,7 +5317,7 @@
5313
5317
 		goto done;
5314
5318
 */
5315
5319
 	memset(mac, 0x00, 6);
5316
-	at24_mac_read(mac);
5320
+	at24_mac1_read(mac);
5317
5321
 	
5318
5322
 	if ((mac[0] == 0x68) && (mac[1] == 0xed))
5319
5323
 	{
..
..
@@ -5341,7 +5345,6 @@
5341
5345
 	rtl_rar_set(tp, mac_addr);
5342
5346
 }
5343
5347
 
5344
-extern ssize_t at24_mac1_read(unsigned char* mac);
5345
5348
 static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
5346
5349
 {
5347
5350
 	struct rtl8169_private *tp;