Commit d900954f authored by Russell King's avatar Russell King Committed by David S. Miller

net: sfp: rename T_PROBE_WAIT to T_SERIAL

SFF-8472 rev 12.2 defines the time for the serial bus to become ready
using t_serial.  Use this as our identifier for this timeout to make
it clear what we are referring to.
Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d2e816c0
...@@ -149,11 +149,10 @@ static const enum gpiod_flags gpio_flags[] = { ...@@ -149,11 +149,10 @@ static const enum gpiod_flags gpio_flags[] = {
* the same length on the PCB, which means it's possible for MOD DEF 0 to * the same length on the PCB, which means it's possible for MOD DEF 0 to
* connect before the I2C bus on MOD DEF 1/2. * connect before the I2C bus on MOD DEF 1/2.
* *
* The SFP MSA specifies 300ms as t_init (the time taken for TX_FAULT to * The SFF-8472 specifies t_serial ("Time from power on until module is
* be deasserted) but makes no mention of the earliest time before we can * ready for data transmission over the two wire serial bus.") as 300ms.
* access the I2C EEPROM. However, Avago modules require 300ms.
*/ */
#define T_PROBE_INIT msecs_to_jiffies(300) #define T_SERIAL msecs_to_jiffies(300)
#define T_HPOWER_LEVEL msecs_to_jiffies(300) #define T_HPOWER_LEVEL msecs_to_jiffies(300)
#define T_PROBE_RETRY msecs_to_jiffies(100) #define T_PROBE_RETRY msecs_to_jiffies(100)
...@@ -1560,8 +1559,8 @@ static void sfp_sm_device(struct sfp *sfp, unsigned int event) ...@@ -1560,8 +1559,8 @@ static void sfp_sm_device(struct sfp *sfp, unsigned int event)
} }
} }
/* This state machine tracks the insert/remove state of /* This state machine tracks the insert/remove state of the module, probes
* the module, and handles probing the on-board EEPROM. * the on-board EEPROM, and sets up the power level.
*/ */
static void sfp_sm_module(struct sfp *sfp, unsigned int event) static void sfp_sm_module(struct sfp *sfp, unsigned int event)
{ {
...@@ -1577,7 +1576,7 @@ static void sfp_sm_module(struct sfp *sfp, unsigned int event) ...@@ -1577,7 +1576,7 @@ static void sfp_sm_module(struct sfp *sfp, unsigned int event)
default: default:
if (event == SFP_E_INSERT && sfp->attached) { if (event == SFP_E_INSERT && sfp->attached) {
sfp_module_tx_disable(sfp); sfp_module_tx_disable(sfp);
sfp_sm_mod_next(sfp, SFP_MOD_PROBE, T_PROBE_INIT); sfp_sm_mod_next(sfp, SFP_MOD_PROBE, T_SERIAL);
} }
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment