ptp: netc: fix potential interrupt storm caused by incorrect unbind order

In netc_timer_remove(), hardware interrupts are disabled by clearing
TMR_TEMASK before ptp_clock_unregister() is called. This may cause a
race condition during driver unbind that could leave hardware interrupts
active. For example, a concurrent PTP_CLK_REQ_EXTTS ioctl can re-enable
TMR_TEMASK after it has been cleared, leaving a pending hardware
interrupt when the driver unbinds.

Since the NETC Timer does not support PCIe FLR, hardware state is not
reset during probe. When the driver is rebound and the IRQ is registered,
the pending interrupt fires immediately. At that point priv->tmr_emask
is still zero, so netc_timer_isr() does not clear the interrupt status
and unconditionally returns IRQ_HANDLED, resulting in an uninterruptible
infinite interrupt storm.

Fix this in several ways. First, request the IRQ with IRQF_NO_AUTOEN so
it is not enabled when request_irq() runs, and clear TMR_TEMASK in
netc_timer_init() before enabling it. The IRQ is only enabled at the end
of probe once the timer has been reprogrammed and the PTP clock has been
registered. This ensures a stale pending interrupt from a previous unbind
or an unclean shutdown cannot be delivered before the driver is fully
initialized.

Second, in netc_timer_remove() call disable_irq() before
ptp_clock_unregister() and move the TMR_TEMASK/TMR_CTRL clearing after
it. disable_irq() masks the line and waits for any in-flight
netc_timer_isr() to finish, so no ISR can dereference priv->clock after
ptp_clock_unregister() has freed it. Unregistering the PTP clock before
clearing the mask also guarantees that no in-flight or concurrent ioctl
can re-enable hardware interrupts.

Finally, return IRQ_NONE from netc_timer_isr() when the masked event
status is zero, so the kernel's spurious interrupt detection can disable
a stuck line instead of looping forever.

Fixes: 671e266835b8 ("ptp: netc: add periodic pulse output support")
Reported-by: Sashiko <sashiko-bot@kernel.org>
Closes: https://sashiko.dev/#/patchset/20260720012508.23227-1-wei.fang%40oss.nxp.com
Signed-off-by: Wei Fang <wei.fang@nxp.com>
Link: https://patch.msgid.link/20260727060348.1887464-1-wei.fang@oss.nxp.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/ptp/ptp_netc.c b/drivers/ptp/ptp_netc.c
index 5e381c354d746ab7c568ad4284c0bfbe53b26bb4..1c20d7efab92939bda20d12e127a7829d802910f 100644 (file)
--- a/drivers/ptp/ptp_netc.c
+++ b/drivers/ptp/ptp_netc.c
@@ -769,6 +769,7 @@ static void netc_timer_init(struct netc_timer *priv)
                   TMR_CTRL_TE | TMR_CTRL_FS;
        netc_timer_wr(priv, NETC_TMR_CTRL, tmr_ctrl);
        netc_timer_wr(priv, NETC_TMR_PRSC, priv->oclk_prsc);
+       netc_timer_wr(priv, NETC_TMR_TEMASK, 0);
 
        /* Disable FIPER by default */
        fiper_ctrl = netc_timer_rd(priv, NETC_TMR_FIPER_CTRL);
@@ -901,6 +902,11 @@ static irqreturn_t netc_timer_isr(int irq, void *data)
        /* Clear interrupts status */
        netc_timer_wr(priv, NETC_TMR_TEVENT, tmr_event);
 
+       if (!tmr_event) {
+               spin_unlock(&priv->lock);
+               return IRQ_NONE;
+       }
+
        if (tmr_event & TMR_TEVENT_ALMEN(0))
                netc_timer_alarm_write(priv, NETC_TMR_DEFAULT_ALARM, 0);
 
@@ -936,7 +942,8 @@ static int netc_timer_init_msix_irq(struct netc_timer *priv)
        }
 
        priv->irq = pci_irq_vector(pdev, 0);
-       err = request_irq(priv->irq, netc_timer_isr, 0, priv->irq_name, priv);
+       err = request_irq(priv->irq, netc_timer_isr, IRQF_NO_AUTOEN,
+                         priv->irq_name, priv);
        if (err) {
                dev_err(&pdev->dev, "request_irq() failed\n");
                pci_free_irq_vectors(pdev);
@@ -951,7 +958,6 @@ static void netc_timer_free_msix_irq(struct netc_timer *priv)
 {
        struct pci_dev *pdev = priv->pdev;
 
-       disable_irq(priv->irq);
        free_irq(priv->irq, priv);
        pci_free_irq_vectors(pdev);
 }
@@ -1005,6 +1011,8 @@ static int netc_timer_probe(struct pci_dev *pdev,
                goto free_msix_irq;
        }
 
+       enable_irq(priv->irq);
+
        return 0;
 
 free_msix_irq:
@@ -1019,9 +1027,10 @@ static void netc_timer_remove(struct pci_dev *pdev)
 {
        struct netc_timer *priv = pci_get_drvdata(pdev);
 
+       disable_irq(priv->irq);
+       ptp_clock_unregister(priv->clock);
        netc_timer_wr(priv, NETC_TMR_TEMASK, 0);
        netc_timer_wr(priv, NETC_TMR_CTRL, 0);
-       ptp_clock_unregister(priv->clock);
        netc_timer_free_msix_irq(priv);
        netc_timer_pci_remove(pdev);
 }