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 E53C43214; Thu, 15 Aug 2024 14:38:19 +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=1723732700; cv=none; b=kbpl3+5nt0UF+LFedc9QqMgAWhxC0gaSIyFGkE56+8uWfrf4da3ANuFbaLrkkgK9empPEoWEkWs9yhQlqaIozvgSL952HslnvGT88w/shk3082PpK85Yew0474/0Lp26qFqamFYpEwQxQ8mt1byH/vbxySeSG2Dn8DB/VWZcsEs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723732700; c=relaxed/simple; bh=xmFxvgNsBGl9XAAmLNyZIygJv7OZtA/11YAuNYS1FkE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=dEBW7iZM3NrJpIpNz1LJHZc9UgOY1lWmXoRJ+bzHw32qAMpiEo9mq9xrf76D1GdXk8kee4daik8RxU6bCwFhHe+uBlVWx8zCnQTagzGEfJuUpx/eIZIHUXWujuOde3PpnZ4Gg2Fytlfo8LQp+t9RYPlI/0bAuj3yBvnrRXOXz+U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Mc1N3COb; 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="Mc1N3COb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 55BF9C32786; Thu, 15 Aug 2024 14:38:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1723732699; bh=xmFxvgNsBGl9XAAmLNyZIygJv7OZtA/11YAuNYS1FkE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Mc1N3CObGIwAp+yFWo32c5cm2+kViO33ox6csFpzJnXW1GbRyTfHDQtUIvMQrBhU+ boeCYB+XZlNH5bUD4I3MaUZT+ui2IKo+Lnl5oK2JMn2A8mzKyQBeR5jsWYspWJNDXP nwgJifAz0uawmHba28y8ofzuNZ7JXQajB8q84qC8= 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.10 260/352] net: fec: Stop PPS on driver remove Date: Thu, 15 Aug 2024 15:25:26 +0200 Message-ID: <20240815131929.493421595@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240815131919.196120297@linuxfoundation.org> References: <20240815131919.196120297@linuxfoundation.org> User-Agent: quilt/0.67 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 5.10-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 780fbb3e1ed06..84e0855069a84 100644 --- a/drivers/net/ethernet/freescale/fec_ptp.c +++ b/drivers/net/ethernet/freescale/fec_ptp.c @@ -640,6 +640,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