igb: Fix not clearing TimeSync interrupts for 82580
authorDaiwei Li <daiweili@google.com>
Wed, 14 Aug 2024 04:55:53 +0000 (21:55 -0700)
committerTony Nguyen <anthony.l.nguyen@intel.com>
Wed, 28 Aug 2024 22:29:36 +0000 (15:29 -0700)
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%25matthew.vick@intel.com/

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 ee14cc9ea19b ("igb: Fix missing time sync events").

Fixes: ee14cc9ea19b ("igb: Fix missing time sync events")
Closes: https://lore.kernel.org/intel-wired-lan/CAN0jFd1kO0MMtOh8N2Ztxn6f7vvDKp2h507sMryobkBKe=xk=w@mail.gmail.com/
Tested-by: Daiwei Li <daiweili@google.com>
Suggested-by: Vinicius Costa Gomes <vinicius.gomes@intel.com>
Signed-off-by: Daiwei Li <daiweili@google.com>
Acked-by: Vinicius Costa Gomes <vinicius.gomes@intel.com>
Reviewed-by: Kurt Kanzenbach <kurt@linutronix.de>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
drivers/net/ethernet/intel/igb/igb_main.c

index 33a42b4c21e0b622aedee563aca67c3ae34063ac..9dc7c60838ed7481ee4c25264dc36b0557bcb215 100644 (file)
@@ -6960,10 +6960,20 @@ static void igb_extts(struct igb_adapter *adapter, int tsintr_tt)
 
 static void igb_tsync_interrupt(struct igb_adapter *adapter)
 {
+       const u32 mask = (TSINTR_SYS_WRAP | E1000_TSICR_TXTS |
+                         TSINTR_TT0 | TSINTR_TT1 |
+                         TSINTR_AUTT0 | TSINTR_AUTT1);
        struct e1000_hw *hw = &adapter->hw;
        u32 tsicr = rd32(E1000_TSICR);
        struct ptp_clock_event event;
 
+       if (hw->mac.type == e1000_82580) {
+               /* 82580 has a hardware bug that requires an explicit
+                * write to clear the TimeSync interrupt cause.
+                */
+               wr32(E1000_TSICR, tsicr & mask);
+       }
+
        if (tsicr & TSINTR_SYS_WRAP) {
                event.type = PTP_CLOCK_PPS;
                if (adapter->ptp_caps.pps)