修改内核路径

hc

2024-05-14 bedbef8ad3e75a304af6361af235302bcc61d06b

 kernel/drivers/net/phy/dp83tc811.c
..
..
@@ -139,19 +139,19 @@
139
139
 			value &= ~DP83811_WOL_SECURE_ON;
140
140
 		}
141
141
 
142
-		value |= (DP83811_WOL_EN | DP83811_WOL_INDICATION_SEL |
143
-			  DP83811_WOL_CLR_INDICATION);
144
-		phy_write_mmd(phydev, DP83811_DEVADDR, MII_DP83811_WOL_CFG,
145
-			      value);
142
+		/* Clear any pending WoL interrupt */
143
+		phy_read(phydev, MII_DP83811_INT_STAT1);
144
+
145
+		value |= DP83811_WOL_EN | DP83811_WOL_INDICATION_SEL |
146
+			 DP83811_WOL_CLR_INDICATION;
147
+
148
+		return phy_write_mmd(phydev, DP83811_DEVADDR,
149
+				     MII_DP83811_WOL_CFG, value);
146
150
 	} else {
147
-		value = phy_read_mmd(phydev, DP83811_DEVADDR,
148
-				     MII_DP83811_WOL_CFG);
149
-		value &= ~DP83811_WOL_EN;
150
-		phy_write_mmd(phydev, DP83811_DEVADDR, MII_DP83811_WOL_CFG,
151
-			      value);
151
+		return phy_clear_bits_mmd(phydev, DP83811_DEVADDR,
152
+					  MII_DP83811_WOL_CFG, DP83811_WOL_EN);
152
153
 	}
153
154
 
154
-	return 0;
155
155
 }
156
156
 
157
157
 static void dp83811_get_wol(struct phy_device *phydev,
..
..
@@ -280,10 +280,6 @@
280
280
 {
281
281
 	int value, err;
282
282
 
283
-	err = genphy_config_init(phydev);
284
-	if (err < 0)
285
-		return err;
286
-
287
283
 	value = phy_read(phydev, MII_DP83811_SGMII_CTRL);
288
284
 	if (phydev->interface == PHY_INTERFACE_MODE_SGMII) {
289
285
 		err = phy_write(phydev, MII_DP83811_SGMII_CTRL,
..
..
@@ -299,8 +295,8 @@
299
295
 
300
296
 	value = DP83811_WOL_MAGIC_EN | DP83811_WOL_SECURE_ON | DP83811_WOL_EN;
301
297
 
302
-	return phy_write_mmd(phydev, DP83811_DEVADDR, MII_DP83811_WOL_CFG,
303
-	      value);
298
+	return phy_clear_bits_mmd(phydev, DP83811_DEVADDR, MII_DP83811_WOL_CFG,
299
+				  value);
304
300
 }
305
301
 
306
302
 static int dp83811_phy_reset(struct phy_device *phydev)
..
..
@@ -328,14 +324,10 @@
328
324
 
329
325
 static int dp83811_resume(struct phy_device *phydev)
330
326
 {
331
-	int value;
332
-
333
327
 	genphy_resume(phydev);
334
328
 
335
-	value = phy_read_mmd(phydev, DP83811_DEVADDR, MII_DP83811_WOL_CFG);
336
-
337
-	phy_write_mmd(phydev, DP83811_DEVADDR, MII_DP83811_WOL_CFG, value |
338
-		      DP83811_WOL_CLR_INDICATION);
329
+	phy_set_bits_mmd(phydev, DP83811_DEVADDR, MII_DP83811_WOL_CFG,
330
+			 DP83811_WOL_CLR_INDICATION);
339
331
 
340
332
 	return 0;
341
333
 }
..
..
@@ -345,8 +337,7 @@
345
337
 		.phy_id = DP83TC811_PHY_ID,
346
338
 		.phy_id_mask = 0xfffffff0,
347
339
 		.name = "TI DP83TC811",
348
-		.features = PHY_BASIC_FEATURES,
349
-		.flags = PHY_HAS_INTERRUPT,
340
+		/* PHY_BASIC_FEATURES */
350
341
 		.config_init = dp83811_config_init,
351
342
 		.config_aneg = dp83811_config_aneg,
352
343
 		.soft_reset = dp83811_phy_reset,