Skip to contentSkip to conversation

powerpc 4xx EMAC driver: device name reported on timeout is not correct

PATCH In review Mikhail Zolotaryov 2 participants 2 messages Mar 10, 2009 – Mar 20, 2009 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc 4xx EMAC driver: device name reported on timeout is not correct

Hi,

not critical problem here.

IBM EMAC driver performs device reset (drivers/net/ibm_newemac/core.c: emac_probe() -> emac_init_phy() -> emac_reset()) before registering appropriate net_device (emac_probe() -> register_netdev()), so net_device name contains raw format string during EMAC reset ("eth%d").

If the case of reset timeout, emac_report_timeout_error() function is called to report an error. The problem is this function uses net_device name to report device related, which is not correct, as a result in the kernel log buffer we see:

eth%d: reset timeout

The solution is to print device_node full_name instead. After applying the patch proposed, error string is like the following:

/plb/opb/ethernet@ef600e00: reset timeout

drivers/net/ibm_newemac/core.c renamed from drivers/net/ibm_newemac/core.c.orig +1 -1
@@ -134,7 +134,7 @@
 				  EMAC_FTR_440EP_PHY_CLK_FIX))
 		DBG(dev, "%s" NL, error);
 	else if (net_ratelimit())
-		printk(KERN_ERR "%s: %s\n", dev->ndev->name, error);
+		printk(KERN_ERR "%s: %s\n", dev->ofdev->node->full_name, error);
 }
 
 /* EMAC PHY clock workaround:
Acked-by on v1 1/1
#1 lore raw
Quoted 16 lines · Mikhail Zolotaryov

Hi,

not critical problem here.

IBM EMAC driver performs device reset (drivers/net/ibm_newemac/core.c:
emac_probe() -> emac_init_phy() -> emac_reset()) before registering appropriate net_device (emac_probe() -> register_netdev()), so net_device name contains raw format string during EMAC reset ("eth%d").

If the case of reset timeout, emac_report_timeout_error() function is called to report an error. The problem is this function uses net_device name to report device related, which is not correct, as a result in the kernel log buffer we see:

eth%d: reset timeout

Quoted 7 lines

The solution is to print device_node full_name instead. After applying the patch proposed, error string is like the following:

/plb/opb/ethernet@ef600e00: reset timeout

---

Please submit with my Ack included to the netdev list.

Cheers,
Ben.

Quoted 18 lines

plain text document attachment (emac_report_timeout_error.patch)

drivers/net/ibm_newemac/core.c renamed from drivers/net/ibm_newemac/core.c.orig +1 -1
@@ -134,7 +134,7 @@
 				  EMAC_FTR_440EP_PHY_CLK_FIX))
 		DBG(dev, "%s" NL, error);
 	else if (net_ratelimit())
-		printk(KERN_ERR "%s: %s\n", dev->ndev->name, error);
+		printk(KERN_ERR "%s: %s\n", dev->ofdev->node->full_name, error);
 }
 
 /* EMAC PHY clock workaround:

_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://ozlabs.org/mailman/listinfo/linuxppc-dev