From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BFE64476CF7 for ; Tue, 18 Aug 2026 13:28:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787059687; cv=none; b=EyDL1ydshyxSRQNiMq7xpEykx+S2H6x0RSqW7+MouKQgxArqgjlOmFY1PQ6o/8IvkJsw+x6PusoxI7b37raGqPI4FBMvrAWGS2P3DgfI47yOtr3gBCUTh3uZBmcmhGC9wHPeZoy+TjIN7ivArpZMYlbJEYc8e1siOd2ahk1UpdI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787059687; c=relaxed/simple; bh=hKXgIueQ+cktyJ3NvuIdviR5rHT5VkYLFJZj7Ezv9gc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=StP7EbSsokJE4uhPnaOkK6prCx3dcjSXI1Feru+7UQwQvswPaBOAJwJBeSEzgLRjkV00ayXSnqZRk1W8j6T5LRpoqUnizWkoBq13PsdFpjmHQ248Dd6Nc1pUo7mehzN8zKNk0HLbB0T3nxreCuQoC/LSfad+StQsJbSbKyAHjqA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=GyW9vgPi; arc=none smtp.client-ip=209.85.221.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GyW9vgPi" Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-47fd4531020so2792927f8f.3 for ; Tue, 18 Aug 2026 06:28:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787059684; x=1787664484; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=djPZzMb89wYlNjLL6Fty3Ib9LSWHKIU4RnghfXD9YU0=; b=GyW9vgPi3VKZAXKWNVwxYUI80wrImrCMojgMewxH/nG41g1H7jZKOPQMg9exZtBdiP uvx96KMQlSwdF67gf+vx1JBpMoV6DMPQ2L6mVjOMl4ck09bYO10vb1rDa7eYNcWCpP8t dDVYwyPI8bbSBhM4vElVqP2YGbt8Zkru9Xntl/iqgUJLu39V5Q16tXci6A19I6jC1sBA YUL56d43p+49xKDw4nqucc9XZDDIZykpISG8Uu8ZZDIUkKDY1J3RM4f9OygOo9NGs8Bt m5m9epmcZDViCRTh1LPI8OXDX/95zOGkLzj0wZn9fqkM8R951t5oYw6YGvkVAzy4CPHb Ir2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787059684; x=1787664484; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=djPZzMb89wYlNjLL6Fty3Ib9LSWHKIU4RnghfXD9YU0=; b=JyzpIibwusk5H3dp9sp4lvOJ5k6n/oFOvHm9TfbTWaM5GNydcBi+nmITH+WFcXd/aa D80nFFzK1bKxMmh7vBV+wRzUijZfPofNMe+diorw52dhN4kq849cAld+kq5stQMPMNNU VOV3+6QhQprIz1uTgZOq35SYE4XeF9fdI0TikfLk8AFv/HBSo69NBtWDMkEmlkih2vR9 TwiiRl8w5FqfwB72CYgycZhadLPECYnyUsw4cFSJQ8sciMpAi0jU+IJxBYdzYltqWfkR C2rwsL6skYST90OB+NvngmdnnX0e+ey9pSRNEvdhI2Ur9s/1Tq7NkhWT0XoQUJECaEz/ 8K2A== X-Forwarded-Encrypted: i=1; AHgh+RpFN7moAHs1oocH5F/For0eCvrLOdsQR+wADhnxUlZwg39eDr9hPPMVe3BemfrjCbYsFq6RrCaFoBntFro=@vger.kernel.org X-Gm-Message-State: AOJu0YyKjMEBsDu6No4KCRWs+WNclz7SB8r/YfLmn1S44aNnh8Vmh6c8 EKVcxbQRqm1cj9fCl15osIH2jxOmHbwFXdyInFCv/OjLu+RxTG6DA0jsIOfCoBiY X-Gm-Gg: AR+sD121nJ0KY8LwIpKeOcBeIkMJ4OcQ0G7BDjPkbZdpjT+RMLL+WWXwWJhvxuKunrN LKG6vPQraxELviWMxLvGhwHKWCH2hAZXUUcmAe8KvvBQNgk5d2zYJBaGvhBbK4IeH6upNC/hTNp ECtcdt4vda8OCaMGZMLQYgwNhTkG8hDOuNMQaRc3OeAKN9aydXjmBfRNjPMnNG9iwAUHC9qljGw RyW0RXBLJ7T8e1GREMbid32df969MudpBVvU4QpHKuLtesfGnM6ubvLzCdy3xCnY8ggZeBZOVbC BB/1CWjwattfHGGOgT5MRYEVtk5RtjG3pfOJN1VXxuGi5uCiYOvQ5UvJMSrOa5O9/fpfDGFvJXV wd68E1ryMKcV/U7ydWfqyLS54RYt1oKl2b5RgGAk9FdfZOJ0th/Ox6n+jWo60zhlg5PnXa2NEP4 PG8Wv0jwUaA4bMiYCrfOIrhb7Yd/OPczaBirz3BxqOMYAAzqo7A6IiybBZpLM= X-Received: by 2002:a05:6000:1a85:b0:480:c5:d635 with SMTP id ffacd0b85a97d-481606ac8bemr51077592f8f.0.1787059683663; Tue, 18 Aug 2026 06:28:03 -0700 (PDT) Received: from server227.. ([39.170.101.209]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-482a5a7c568sm12140145f8f.18.2026.08.18.06.27.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Aug 2026 06:28:03 -0700 (PDT) From: Zxyan Zhu To: maxime.chevallier@bootlin.com, mcoquelin.stm32@gmail.com, alexandre.torgue@foss.st.com, andrew+netdev@lunn.ch, richardcochran@gmail.com Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, muhammad.nazim.amirul.nazle.asmade@altera.com, Zxyan Zhu Subject: [PATCH net-next v3 2/2] net: stmmac: dwmac-socfpga: mask XGMAC_TSIE during cross-timestamp Date: Tue, 18 Aug 2026 21:27:22 +0800 Message-Id: <20260818132722.1852876-3-zxyan0222@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260818132722.1852876-1-zxyan0222@gmail.com> References: <20260818132722.1852876-1-zxyan0222@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The Agilex5 smtg_crosststamp() handler arms an internal auxiliary snapshot, toggles GPO0 and then polls XGMAC_INT_STATUS for TSIS in process context to learn that the snapshot is ready. Once XGMAC_TSIE is unmasked (done by a companion change that enables it in XGMAC_INT_DEFAULT_EN), the DWXGMAC2 timestamp interrupt handler runs from hardirq on every timestamp event and clears TSIS by reading XGMAC_TIMESTAMP_STATUS. That read can win the race against the poll loop, which then times out and makes PTP_SYS_OFFSET_PRECISE fail with "Wait for time sync operation timeout". Mask XGMAC_TSIE around the snapshot trigger and FIFO read so the hardirq handler cannot clear TSIS while smtg_crosststamp() owns it, and restore it on every return path. Tested-by: Nazim Amirul Signed-off-by: Zxyan Zhu --- drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c index 1d7f0a57d288..a4d00bf81423 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c @@ -310,6 +310,13 @@ static int smtg_crosststamp(ktime_t *device, struct system_counterval_t *system, if (priv->plat->flags & STMMAC_FLAG_EXT_SNAPSHOT_EN) return -EBUSY; + /* The XGMAC timestamp interrupt handler clears TSIS by reading + * XGMAC_TIMESTAMP_STATUS, which would race with the TSIS poll + * below. Mask XGMAC_TSIE for the duration of the cross-timestamp + * so the handler does not run while we own the snapshot FIFO. + */ + stmmac_mac_irq_modify(priv, XGMAC_TSIE, 0); + mutex_lock(&priv->aux_ts_lock); /* Enable Internal snapshot trigger */ acr_value = readl(ptpaddr + PTP_ACR); @@ -329,6 +336,7 @@ static int smtg_crosststamp(ktime_t *device, struct system_counterval_t *system, break; default: mutex_unlock(&priv->aux_ts_lock); + stmmac_mac_irq_modify(priv, 0, XGMAC_TSIE); return -EINVAL; } writel(acr_value, ptpaddr + PTP_ACR); @@ -353,6 +361,7 @@ static int smtg_crosststamp(ktime_t *device, struct system_counterval_t *system, ret = readl_poll_timeout(priv->ioaddr + XGMAC_INT_STATUS, v, (v & XGMAC_INT_TSIS), 100, 10000); if (ret) { + stmmac_mac_irq_modify(priv, 0, XGMAC_TSIE); netdev_err(priv->dev, "%s: Wait for time sync operation timeout\n", __func__); return ret; @@ -375,6 +384,8 @@ static int smtg_crosststamp(ktime_t *device, struct system_counterval_t *system, read_unlock_irqrestore(&priv->ptp_lock, flags); } + stmmac_mac_irq_modify(priv, 0, XGMAC_TSIE); + get_smtgtime(priv->mii, SMTG_MDIO_ADDR, &smtg_time); system->cycles = smtg_time; -- 2.34.1