From nobody Fri Dec 19 21:48:32 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B03F3180B83; Sun, 24 Mar 2024 23:47:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711324067; cv=none; b=LMIrxinWH55NUcxcGzcSqKZdLGFr/ptQdNXGURtDJ3DuZtdWUg2mYgCSAy0vgVXl3ca3lBPWad8ZvX6An9h1JjYIK3akYe3FZUz2tiu5jZbL//97y8MZkgRzC8l+7VUOsQIfDdGutr6z7J9Xp2QePaPiSAaFRJUlOPl2z2vqC6M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711324067; c=relaxed/simple; bh=gLV7BXMgy4BHjaqXwUFmVmV1A/4dI7lvd8u+X/1gMmA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kRhB4MdfG+jtbdbWBCVK8+NxrKa8Q/0dOw3sWEQIq6Icqvxr9ncZDXPgvmWfzUPT/rsHQwgiJlHF4JZwVL9iP68NDYA5h0Lb8oZFgNSNfElaA8VgCuU+NsDFmOAV3ZjDgDm5CGBQlJhUQ9LuyGfXuN8WzFesdc+j30Kit33rYj0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MJyHUPlH; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="MJyHUPlH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7F250C43390; Sun, 24 Mar 2024 23:47:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711324066; bh=gLV7BXMgy4BHjaqXwUFmVmV1A/4dI7lvd8u+X/1gMmA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MJyHUPlHIo+KkksDYilhwXyeB5dYPhsoPLk1cGIakMc+iQdAF9clrw21LxSyugj3t uIrRp7kQQzLefu/Za/9fQmK9HeuwKitWDxkslIyp/tYUz2RmQkNSZ2fsWIEa9DWDBw hI8awsouEXElOKu64gGoJ/wRX3JspZ8Pk15lznxo3uyBs5S7N1PNXT2ymbIhoi9Jo8 k67d98W7MC2SUISeqcpPe9nU03+TbNlaAPrhCPS+SVI8ilUdEKM+rWT7lRg58HszcT XxTMzJCNcm7vdRNOrzvK8+Y5CbXHZcC3/dx8mo1FhyOv0Zzk1YjY+lazjxq4zgdZ6S I72U9N8Co3FGg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ruud Bos , Gurucharan G , Tony Nguyen , Sasha Levin Subject: [PATCH 5.4 067/183] igb: move PEROUT and EXTTS isr logic to separate functions Date: Sun, 24 Mar 2024 19:44:40 -0400 Message-ID: <20240324234638.1355609-68-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324234638.1355609-1-sashal@kernel.org> References: <20240324234638.1355609-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Ruud Bos [ Upstream commit cf99c1dd7b7729091043374b90807c7a5f9fd9b1 ] Remove code duplication in the tsync interrupt handler function by moving this logic to separate functions. This keeps the interrupt handler readable and allows the new functions to be extended for adapter types other than i210. Signed-off-by: Ruud Bos Tested-by: Gurucharan G Signed-off-by: Tony Nguyen Stable-dep-of: ee14cc9ea19b ("igb: Fix missing time sync events") Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/igb/igb_main.c | 81 +++++++++++++---------- 1 file changed, 46 insertions(+), 35 deletions(-) diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethern= et/intel/igb/igb_main.c index 6638d314c811c..fd1efac092472 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -6479,12 +6479,52 @@ void igb_update_stats(struct igb_adapter *adapter) } } =20 +static void igb_perout(struct igb_adapter *adapter, int tsintr_tt) +{ + int pin =3D ptp_find_pin(adapter->ptp_clock, PTP_PF_PEROUT, tsintr_tt); + struct e1000_hw *hw =3D &adapter->hw; + struct timespec64 ts; + u32 tsauxc; + + if (pin < 0 || pin >=3D IGB_N_PEROUT) + return; + + spin_lock(&adapter->tmreg_lock); + ts =3D timespec64_add(adapter->perout[pin].start, + adapter->perout[pin].period); + /* u32 conversion of tv_sec is safe until y2106 */ + wr32((tsintr_tt =3D=3D 1) ? E1000_TRGTTIML1 : E1000_TRGTTIML0, ts.tv_nsec= ); + wr32((tsintr_tt =3D=3D 1) ? E1000_TRGTTIMH1 : E1000_TRGTTIMH0, (u32)ts.tv= _sec); + tsauxc =3D rd32(E1000_TSAUXC); + tsauxc |=3D TSAUXC_EN_TT0; + wr32(E1000_TSAUXC, tsauxc); + adapter->perout[pin].start =3D ts; + spin_unlock(&adapter->tmreg_lock); +} + +static void igb_extts(struct igb_adapter *adapter, int tsintr_tt) +{ + int pin =3D ptp_find_pin(adapter->ptp_clock, PTP_PF_EXTTS, tsintr_tt); + struct e1000_hw *hw =3D &adapter->hw; + struct ptp_clock_event event; + u32 sec, nsec; + + if (pin < 0 || pin >=3D IGB_N_EXTTS) + return; + + nsec =3D rd32((tsintr_tt =3D=3D 1) ? E1000_AUXSTMPL1 : E1000_AUXSTMPL0); + sec =3D rd32((tsintr_tt =3D=3D 1) ? E1000_AUXSTMPH1 : E1000_AUXSTMPH0); + event.type =3D PTP_CLOCK_EXTTS; + event.index =3D tsintr_tt; + event.timestamp =3D sec * 1000000000ULL + nsec; + ptp_clock_event(adapter->ptp_clock, &event); +} + static void igb_tsync_interrupt(struct igb_adapter *adapter) { struct e1000_hw *hw =3D &adapter->hw; + u32 ack =3D 0, tsicr =3D rd32(E1000_TSICR); struct ptp_clock_event event; - struct timespec64 ts; - u32 ack =3D 0, tsauxc, sec, nsec, tsicr =3D rd32(E1000_TSICR); =20 if (tsicr & TSINTR_SYS_WRAP) { event.type =3D PTP_CLOCK_PPS; @@ -6500,51 +6540,22 @@ static void igb_tsync_interrupt(struct igb_adapter = *adapter) } =20 if (tsicr & TSINTR_TT0) { - spin_lock(&adapter->tmreg_lock); - ts =3D timespec64_add(adapter->perout[0].start, - adapter->perout[0].period); - /* u32 conversion of tv_sec is safe until y2106 */ - wr32(E1000_TRGTTIML0, ts.tv_nsec); - wr32(E1000_TRGTTIMH0, (u32)ts.tv_sec); - tsauxc =3D rd32(E1000_TSAUXC); - tsauxc |=3D TSAUXC_EN_TT0; - wr32(E1000_TSAUXC, tsauxc); - adapter->perout[0].start =3D ts; - spin_unlock(&adapter->tmreg_lock); + igb_perout(adapter, 0); ack |=3D TSINTR_TT0; } =20 if (tsicr & TSINTR_TT1) { - spin_lock(&adapter->tmreg_lock); - ts =3D timespec64_add(adapter->perout[1].start, - adapter->perout[1].period); - wr32(E1000_TRGTTIML1, ts.tv_nsec); - wr32(E1000_TRGTTIMH1, (u32)ts.tv_sec); - tsauxc =3D rd32(E1000_TSAUXC); - tsauxc |=3D TSAUXC_EN_TT1; - wr32(E1000_TSAUXC, tsauxc); - adapter->perout[1].start =3D ts; - spin_unlock(&adapter->tmreg_lock); + igb_perout(adapter, 1); ack |=3D TSINTR_TT1; } =20 if (tsicr & TSINTR_AUTT0) { - nsec =3D rd32(E1000_AUXSTMPL0); - sec =3D rd32(E1000_AUXSTMPH0); - event.type =3D PTP_CLOCK_EXTTS; - event.index =3D 0; - event.timestamp =3D sec * 1000000000ULL + nsec; - ptp_clock_event(adapter->ptp_clock, &event); + igb_extts(adapter, 0); ack |=3D TSINTR_AUTT0; } =20 if (tsicr & TSINTR_AUTT1) { - nsec =3D rd32(E1000_AUXSTMPL1); - sec =3D rd32(E1000_AUXSTMPH1); - event.type =3D PTP_CLOCK_EXTTS; - event.index =3D 1; - event.timestamp =3D sec * 1000000000ULL + nsec; - ptp_clock_event(adapter->ptp_clock, &event); + igb_extts(adapter, 1); ack |=3D TSINTR_AUTT1; } =20 --=20 2.43.0