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 BE8781EA8D; Mon, 12 Aug 2024 16:05:11 +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=1723478711; cv=none; b=SoyHCPsxQMKHtHlH8p5TAfGD0c8oW3ann8wWQpawCeu+rcroSltgOFoy0pAV4DV40e7Ka8zjJhU7lx3IPcyJScBu8wVytK7ITx9jK9m/WqH7OLDqWooI42cuOFFKiMTr1Q0ZW/ZKVIVOuOcsdFcSDoNB/I/moA8dAAPA9tWOpuk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723478711; c=relaxed/simple; bh=Ly06PjFnvHQYZdltpS6EJ6TOKrMpK7OB29sBP+pnZio=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=l0yCt6jSPQBNwwJNiPbvPVJbcZVcbpMLL41BiUyxk7YBAVlqyK+tzsGjDkFFiC8trklyBLX0EINoHV0evjkMLEsI/DeBgpFoi6aHS8Z7E7AXCGhmym+I6iTe1MYafTj/GKBuhNs1QPIY0xOZKiTa1dxSgE6zM9Z+bTYnVvMsy2c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Mm1xDKBr; 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="Mm1xDKBr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 99516C32782; Mon, 12 Aug 2024 16:05:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1723478711; bh=Ly06PjFnvHQYZdltpS6EJ6TOKrMpK7OB29sBP+pnZio=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Mm1xDKBrUU1nVvJcwz3N2L7Z5ATmIHg9qc9JA+eEPQe2yFsCFme6sllRI31EHoo7y 1FFhWPm/tPQTOXMSFPEk8iDXxUZhVGY0o5AJaOQuVUSaQXy34MlklevnRu3DpW0pvJ KagDqnLHvupVZL2Q5ipaqRtrwu5fweQWCxX+1//4= 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 6.1 015/150] net: fec: Stop PPS on driver remove Date: Mon, 12 Aug 2024 18:01:36 +0200 Message-ID: <20240812160125.744837804@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240812160125.139701076@linuxfoundation.org> References: <20240812160125.139701076@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 6.1-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 e0393dc159fc7..37d83ff5b30be 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