diff options
| author | Matt Carlson <mcarlson@broadcom.com> | 2008-08-15 23:10:04 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-15 23:10:04 +0200 |
| commit | 4ba526ced990f4d61ee8d65fe8a6f0745e8e455c (patch) | |
| tree | 8b20fe7ea098ff1f6d04282adc82b779e403e02b /drivers/net/tg3.h | |
| parent | tg3: Turn off ASF "driver alive" heartbeats for APE (diff) | |
| download | linux-4ba526ced990f4d61ee8d65fe8a6f0745e8e455c.tar.xz linux-4ba526ced990f4d61ee8d65fe8a6f0745e8e455c.zip | |
tg3: Fix firmware event timeouts
The git commit 7c5026aa9b81dd45df8d3f4e0be73e485976a8b6 ("tg3: Add
link state reporting to UMP firmware") introduced code that waits for
previous firmware events to be serviced before attempting to submit a
new event. Unfortunately that patch contained a bug that cause the
driver to wait 2.5 seconds, rather than 2.5 milliseconds as intended.
This patch fixes that bug.
This bug revealed that not all firmware versions service driver events
though. Since we do not know which versions of the firmware do and don't
service these events, the driver needs some way to minimize the effects
of the delay. This patch solves the problem by recording a jiffies
timestamp when it submits an event to the hardware. If the jiffies
counter shows that 2.5 milliseconds have already passed, a wait is not
needed and the driver can proceed to submit a new event.
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/tg3.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h index 377234947e4f..f5b8cab8d4b5 100644 --- a/drivers/net/tg3.h +++ b/drivers/net/tg3.h @@ -2432,7 +2432,10 @@ struct tg3 { struct tg3_ethtool_stats estats; struct tg3_ethtool_stats estats_prev; + union { unsigned long phy_crc_errors; + unsigned long last_event_jiffies; + }; u32 rx_offset; u32 tg3_flags; |