igb: Fix PPS input and output using 3rd and 4th SDP

commit 207ce626add80ddd941f62fc2fe5d77586e0801b upstream.

Fix handling of the tsync interrupt to compare the pin number with
IGB_N_SDP instead of IGB_N_EXTTS/IGB_N_PEROUT and fix the indexing to
the perout array.

Fixes: cf99c1dd7b77 ("igb: move PEROUT and EXTTS isr logic to separate functions")
Reported-by: Matt Corallo <ntp-lists@mattcorallo.com>
Signed-off-by: Miroslav Lichvar <mlichvar@redhat.com>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Gurucharan G <gurucharanx.g@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Link: https://lore.kernel.org/r/20230213185822.3960072-1-anthony.l.nguyen@intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 7cad4ac..bf4317e 100644 (file)
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -6816,7 +6816,7 @@ static void igb_perout(struct igb_adapter *adapter, int tsintr_tt)
        struct timespec64 ts;
        u32 tsauxc;
 
-       if (pin < 0 || pin >= IGB_N_PEROUT)
+       if (pin < 0 || pin >= IGB_N_SDP)
                return;
 
        spin_lock(&adapter->tmreg_lock);
@@ -6824,7 +6824,7 @@ static void igb_perout(struct igb_adapter *adapter, int tsintr_tt)
        if (hw->mac.type == e1000_82580 ||
            hw->mac.type == e1000_i354 ||
            hw->mac.type == e1000_i350) {
-               s64 ns = timespec64_to_ns(&adapter->perout[pin].period);
+               s64 ns = timespec64_to_ns(&adapter->perout[tsintr_tt].period);
                u32 systiml, systimh, level_mask, level, rem;
                u64 systim, now;
 
@@ -6872,8 +6872,8 @@ static void igb_perout(struct igb_adapter *adapter, int tsintr_tt)
                ts.tv_nsec = (u32)systim;
                ts.tv_sec  = ((u32)(systim >> 32)) & 0xFF;
        } else {
-               ts = timespec64_add(adapter->perout[pin].start,
-                                   adapter->perout[pin].period);
+               ts = timespec64_add(adapter->perout[tsintr_tt].start,
+                                   adapter->perout[tsintr_tt].period);
        }
 
        /* u32 conversion of tv_sec is safe until y2106 */
@@ -6882,7 +6882,7 @@ static void igb_perout(struct igb_adapter *adapter, int tsintr_tt)
        tsauxc = rd32(E1000_TSAUXC);
        tsauxc |= TSAUXC_EN_TT0;
        wr32(E1000_TSAUXC, tsauxc);
-       adapter->perout[pin].start = ts;
+       adapter->perout[tsintr_tt].start = ts;
 
        spin_unlock(&adapter->tmreg_lock);
 }
@@ -6896,7 +6896,7 @@ static void igb_extts(struct igb_adapter *adapter, int tsintr_tt)
        struct ptp_clock_event event;
        struct timespec64 ts;
 
-       if (pin < 0 || pin >= IGB_N_EXTTS)
+       if (pin < 0 || pin >= IGB_N_SDP)
                return;
 
        if (hw->mac.type == e1000_82580 ||