]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: fec: do not register PPS event for PEROUT
authorWei Fang <wei.fang@nxp.com>
Tue, 25 Nov 2025 08:52:10 +0000 (16:52 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 6 Dec 2025 21:24:56 +0000 (06:24 +0900)
[ Upstream commit 9a060d0fac9e75524f72864adec6d8cdb70a5bca ]

There are currently two situations that can trigger the PTP interrupt,
one is the PPS event, the other is the PEROUT event. However, the irq
handler fec_pps_interrupt() does not check the irq event type and
directly registers a PPS event into the system, but the event may be
a PEROUT event. This is incorrect because PEROUT is an output signal,
while PPS is the input of the kernel PPS system. Therefore, add a check
for the event type, if pps_enable is true, it means that the current
event is a PPS event, and then the PPS event is registered.

Fixes: 350749b909bf ("net: fec: Add support for periodic output signal of PPS")
Signed-off-by: Wei Fang <wei.fang@nxp.com>
Link: https://patch.msgid.link/20251125085210.1094306-5-wei.fang@nxp.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/freescale/fec_ptp.c

index beb1d98fa741a17de794aa3301db0c4d409feb28..4bb894b5afcb99a3d50d81f3bfd8a0a665eb60d6 100644 (file)
@@ -719,8 +719,11 @@ static irqreturn_t fec_pps_interrupt(int irq, void *dev_id)
                fep->next_counter = (fep->next_counter + fep->reload_period) &
                                fep->cc.mask;
 
-               event.type = PTP_CLOCK_PPS;
-               ptp_clock_event(fep->ptp_clock, &event);
+               if (fep->pps_enable) {
+                       event.type = PTP_CLOCK_PPS;
+                       ptp_clock_event(fep->ptp_clock, &event);
+               }
+
                return IRQ_HANDLED;
        }