| Message ID | 4A3E7FC5.6060400@simon.arlott.org.uk |
|---|---|
| State | Rejected, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Simon Arlott <simon@fire.lp0.eu> Date: Sun, 21 Jun 2009 19:45:25 +0100 > When booting over the network the physical link will already be up > and configured appropriately, so there is no need to reset it and > cause auto-negotiation to occur again. Adding an option to disable > this makes it possible to avoid a 2 second delay while booting. > > Signed-off-by: Simon Arlott <simon@fire.lp0.eu> This is getting out of control. We're not going to add a hundred different obscure module options to eliminate delays and device resets. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 4e22462..ca34a63 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -187,6 +187,7 @@ MODULE_DEVICE_TABLE(pci, rtl8169_pci_tbl); static int rx_copybreak = 200; static int use_dac; +static int phy_reset; static struct { u32 msg_enable; } debug = { -1 }; @@ -504,6 +505,8 @@ module_param(rx_copybreak, int, 0); MODULE_PARM_DESC(rx_copybreak, "Copy breakpoint for copy-only-tiny-frames"); module_param(use_dac, int, 0); MODULE_PARM_DESC(use_dac, "Enable PCI DAC. Unsafe on 32 bit PCI slot."); +module_param(phy_reset, int, 1); +MODULE_PARM_DESC(phy_reset, "Reset PHY when initialising device"); module_param_named(debug, debug.msg_enable, int, 0); MODULE_PARM_DESC(debug, "Debug verbosity level (0=none, ..., 16=all)"); MODULE_LICENSE("GPL"); @@ -1798,6 +1801,9 @@ static void rtl8169_init_phy(struct net_device *dev, struct rtl8169_private *tp) mdio_write(ioaddr, 0x0b, 0x0000); //w 0x0b 15 0 0 } + if (!phy_reset) + return; + rtl8169_phy_reset(dev, tp); /*
When booting over the network the physical link will already be up and configured appropriately, so there is no need to reset it and cause auto-negotiation to occur again. Adding an option to disable this makes it possible to avoid a 2 second delay while booting. Signed-off-by: Simon Arlott <simon@fire.lp0.eu> --- drivers/net/r8169.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)