From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 5B9D44F3936; Thu, 17 Sep 2026 15:51:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789660299; cv=none; b=erZ2dNcVZNGA2cBz5RCmCu/ZNrKUk/w/xzIuo2oiAVfdXl/9DByrrNgbKU78NIpCX0SXPJXvD/tbtvxnwb2XRScWJUZrzSVlOJx4j2Mw/A7JWvHhFHF3dlFHszcIpKFZENA52dXhiUQodnJbL/3dSxPvA8G82funAsiCu81zNoI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789660299; c=relaxed/simple; bh=UY/HKDHWG4uBOXNsG4P62YJV9dD53T1hbc6LDPHTUvA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Agc8cscdetQaEDMpbDWdVm8Ay9iRnocWm+f2QMvTuD/8mRLoaUguBtY75LMnUzueOOYuGb1bLq5D7ZiqEVGiiaqGPCUYeg1IPiBt4rEnrH0MtHanGdZ/TwOnBD4ri+Ns5rq1PQhHhpPaQt3iT+qG1vaEYQxRCSEhC1Bkrb0by1w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=zuve1yRG; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="zuve1yRG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6E5671F000FF; Thu, 17 Sep 2026 15:51:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789660298; bh=U57yNpHy+Z3mGkesa+DPiSD9iUIJ3oAQDbXNYkkjuIQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=zuve1yRGv/ObbwqJ8+KBakudartSD0XjjX6dCYPrFZWzmlk+dtBSzYi/9Jmkzs2Lo 91BT1o4KT81iWo4PuWSX43/c1Sj1L+VDpaqgpnPwH6OHR+OLstOi6ZfIQEelagExrz 2HdYzLkNY5oKZMjpyxB+nSlgleb950hDWdBQzmfs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Th=C3=A9o=20Lebrun?= , Vadim Fedorenko , Runyu Xiao , Jakub Kicinski Subject: [PATCH 7.2 546/733] net: macb: initialize PTP state before registering clock Date: Thu, 17 Sep 2026 16:14:14 +0100 Message-ID: <20260917151405.854090507@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260917151350.597953846@linuxfoundation.org> References: <20260917151350.597953846@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 7.2-stable review patch. If anyone has any objections, please let me know. ------------------ From: Runyu Xiao commit e1406330d70e56dd44fa6fbafc86e77e5c80c122 upstream. gem_ptp_init() registers the PTP clock before initializing bp->tsu_clk_lock and the TSU hardware. Since ptp_clock_register() publishes the PTP character device, userspace may invoke PTP callbacks before the lock and hardware are ready. In addition, gem_ptp_init() is called from both the interface open and resume paths. Reinitializing tsu_clk_lock there can reset the lock while timestamp processing is using it. This race is theoretical and has not been observed in practice. Initialize tsu_clk_lock once during probe and initialize the TSU before registering the PTP clock. Fixes: ab91f0a9b5f4 ("net: macb: Add hardware PTP support") Cc: stable@vger.kernel.org Link: https://lore.kernel.org/netdev/20260904030439.3994047-1-runyu.xiao@seu.edu.cn/ Reviewed-by: Théo Lebrun Reviewed-by: Vadim Fedorenko Signed-off-by: Runyu Xiao Link: https://patch.msgid.link/20260908103924.607033-1-runyu.xiao@seu.edu.cn Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/cadence/macb_main.c | 1 + drivers/net/ethernet/cadence/macb_ptp.c | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -5878,6 +5878,7 @@ static int macb_probe(struct platform_de } spin_lock_init(&bp->lock); spin_lock_init(&bp->stats_lock); + spin_lock_init(&bp->tsu_clk_lock); /* setup capabilities */ macb_configure_caps(bp, macb_config); --- a/drivers/net/ethernet/cadence/macb_ptp.c +++ b/drivers/net/ethernet/cadence/macb_ptp.c @@ -334,6 +334,7 @@ void gem_ptp_init(struct net_device *net bp->tsu_rate = bp->ptp_info->get_tsu_rate(bp); bp->ptp_clock_info.max_adj = bp->ptp_info->get_ptp_max_adj(); gem_ptp_init_timer(bp); + gem_ptp_init_tsu(bp); bp->ptp_clock = ptp_clock_register(&bp->ptp_clock_info, &netdev->dev); if (IS_ERR(bp->ptp_clock)) { pr_err("ptp clock register failed: %ld\n", @@ -345,10 +346,6 @@ void gem_ptp_init(struct net_device *net return; } - spin_lock_init(&bp->tsu_clk_lock); - - gem_ptp_init_tsu(bp); - dev_info(&bp->pdev->dev, "%s ptp clock registered.\n", GEM_PTP_TIMER_NAME); }