From mboxrd@z Thu Jan 1 00:00:00 1970 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 627DE19EED0; Thu, 15 Aug 2024 14:20:37 +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=1723731637; cv=none; b=nRXBVNC6lSGd2tc1A1yUSgOcWdrJOaE/Az5w3YvgqTdTQvxeLlCrH0I+U6eCelYBhFMbwtvAJ55uXYOKl78Ke4Bwqpou4iv9vGWUnepdhFscS5P4HSSX1BNHmrlbFg+sxA/eBblQq2RTFn+A0VwXcQtA9VIW35pavubIYoJEsg8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723731637; c=relaxed/simple; bh=PZjAbw1nlau2qL13gnKfz82pQHKGUYFFZ0He5MFf/Cs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=qFkBNQU1khIx6OZojtL1cKGI7uDroNk6qf/fOAnFQmFOOYV94X4+6fX29Q1fMUeQnxrCKeScxdlCcMXAjhpH0qvQA5mURPE7/EakkxlaLSIbWq+56g64TE672fXo9Ij1th+zWAQPJBmzdY20ZnpDOljSfnUMUHGmEjQa85Pq+AQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=1nMRMW+g; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="1nMRMW+g" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9698BC32786; Thu, 15 Aug 2024 14:20:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1723731637; bh=PZjAbw1nlau2qL13gnKfz82pQHKGUYFFZ0He5MFf/Cs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1nMRMW+gqn39mgozAnTfFHXCah/BwpxFRqYBqpBZS3zei/msrHkjUORaLldNTMiZe cQ80qyVcjf/jAvHtjpG1HakCFnmFGFzGL+c/D616jIOpbyhEUXYFKYXht7kyAd6+U6 DwGCL0W/6E6rAfpEA8IptQNaFnSn/ZIYFV/sSYmU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Fabio Estevam , =?UTF-8?q?Cs=C3=B3k=C3=A1s, =20Bence?= , Andrew Lunn , Frank Li , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.4 191/259] net: fec: Stop PPS on driver remove Date: Thu, 15 Aug 2024 15:25:24 +0200 Message-ID: <20240815131910.155249242@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240815131902.779125794@linuxfoundation.org> References: <20240815131902.779125794@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Csókás, Bence [ Upstream commit 8fee6d5ad5fa18c270eedb2a2cdf58dbadefb94b ] PPS was not stopped in `fec_ptp_stop()`, called when the adapter was removed. Consequentially, you couldn't safely reload the driver with the PPS signal on. Fixes: 32cba57ba74b ("net: fec: introduce fec_ptp_stop and use in probe fail path") Reviewed-by: Fabio Estevam Link: https://lore.kernel.org/netdev/CAOMZO5BzcZR8PwKKwBssQq_wAGzVgf1ffwe_nhpQJjviTdxy-w@mail.gmail.com/T/#m01dcb810bfc451a492140f6797ca77443d0cb79f Signed-off-by: Csókás, Bence Reviewed-by: Andrew Lunn Reviewed-by: Frank Li Link: https://patch.msgid.link/20240807080956.2556602-1-csokas.bence@prolan.hu Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/freescale/fec_ptp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ethernet/freescale/fec_ptp.c b/drivers/net/ethernet/freescale/fec_ptp.c index 37b8ad29b5b30..c5af845b1b253 100644 --- a/drivers/net/ethernet/freescale/fec_ptp.c +++ b/drivers/net/ethernet/freescale/fec_ptp.c @@ -635,6 +635,9 @@ void fec_ptp_stop(struct platform_device *pdev) struct net_device *ndev = platform_get_drvdata(pdev); struct fec_enet_private *fep = netdev_priv(ndev); + if (fep->pps_enable) + fec_ptp_enable_pps(fep, 0); + cancel_delayed_work_sync(&fep->time_keep); if (fep->ptp_clock) ptp_clock_unregister(fep->ptp_clock); -- 2.43.0