Skip to content

Commit ba8cf80

Browse files
Daiwei Lianguy11
authored andcommitted
igb: Fix not clearing TimeSync interrupts for 82580
82580 NICs have a hardware bug that makes it necessary to write into the TSICR (TimeSync Interrupt Cause) register to clear it: https://lore.kernel.org/all/CDCB8BE0.1EC2C%[email protected]/ Add a conditional so only for 82580 we write into the TSICR register, so we don't risk losing events for other models. Without this change, when running ptp4l with an Intel 82580 card, I get the following output: > timed out while polling for tx timestamp increasing tx_timestamp_timeout or > increasing kworker priority may correct this issue, but a driver bug likely > causes it This goes away with this change. This (partially) reverts commit ee14cc9 ("igb: Fix missing time sync events"). Fixes: ee14cc9 ("igb: Fix missing time sync events") Closes: https://lore.kernel.org/intel-wired-lan/CAN0jFd1kO0MMtOh8N2Ztxn6f7vvDKp2h507sMryobkBKe=xk=w@mail.gmail.com/ Tested-by: Daiwei Li <[email protected]> Suggested-by: Vinicius Costa Gomes <[email protected]> Signed-off-by: Daiwei Li <[email protected]> Acked-by: Vinicius Costa Gomes <[email protected]> Reviewed-by: Kurt Kanzenbach <[email protected]> Tested-by: Pucha Himasekhar Reddy <[email protected]> (A Contingent worker at Intel) Signed-off-by: Tony Nguyen <[email protected]>
1 parent 3a0504d commit ba8cf80

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

drivers/net/ethernet/intel/igb/igb_main.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6960,10 +6960,20 @@ static void igb_extts(struct igb_adapter *adapter, int tsintr_tt)
69606960

69616961
static void igb_tsync_interrupt(struct igb_adapter *adapter)
69626962
{
6963+
const u32 mask = (TSINTR_SYS_WRAP | E1000_TSICR_TXTS |
6964+
TSINTR_TT0 | TSINTR_TT1 |
6965+
TSINTR_AUTT0 | TSINTR_AUTT1);
69636966
struct e1000_hw *hw = &adapter->hw;
69646967
u32 tsicr = rd32(E1000_TSICR);
69656968
struct ptp_clock_event event;
69666969

6970+
if (hw->mac.type == e1000_82580) {
6971+
/* 82580 has a hardware bug that requires an explicit
6972+
* write to clear the TimeSync interrupt cause.
6973+
*/
6974+
wr32(E1000_TSICR, tsicr & mask);
6975+
}
6976+
69676977
if (tsicr & TSINTR_SYS_WRAP) {
69686978
event.type = PTP_CLOCK_PPS;
69696979
if (adapter->ptp_caps.pps)

0 commit comments

Comments
 (0)