From patchwork Wed Jan 26 09:47:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mohammad Athari Bin Ismail X-Patchwork-Id: 12724822 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 89750C2BA4C for ; Wed, 26 Jan 2022 09:50:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=lvh1ggsU5sxomVe6jbLvQUYTNMtpaQqVBh7izS30sGQ=; b=S8coq0lBNRQ+GK ZveYQdRn4H+sasnssdHBHymAWJ5zwKUaD6d53c94OOnRsW+LizQKwWvMho7ilwXc7VRoUrIn5x6Lo tXScAeE1/LPPT1gqd+R5wSqNoJfYgasmRTSwoUIX1U/MVXQglt2xWJ2wBx5h3HMFhZTfW24IPPxQz SPU108oSEoDedCvTp72wG0YMGdgAyN9tLmPZzK4AsPmbFjlo326wfBJDGYInRX/LZTDlOIeiR8Vf9 hJnWIZacOiDGnrc6VLruJE2SVMhiGQzcjP9WKvGR8Ak5x2cTA8V9JZ3Bhz9EMtWmY9ueLhEQdFXx3 zHRZgHwacylBvZbCd++w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nCevO-00B4d6-7O; Wed, 26 Jan 2022 09:49:10 +0000 Received: from mga09.intel.com ([134.134.136.24]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nCeuc-00B4Jp-7T for linux-arm-kernel@lists.infradead.org; Wed, 26 Jan 2022 09:48:23 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1643190502; x=1674726502; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=MpWSglKXQYEeeqqBjrw+ec+l47eU3cuban3iOotIK3s=; b=LiX7XRbMTt/5ixoeYiYu8iJxHtvO4B7FvFc7Nxgds6rJn1QBesJXp9Uw 2HQNr4Mo412gRLibO9YHw8TkXKHCGdqLl+rM3YGQtTERcgziiUXWl1B// P+eq/1FEyonwmFMZT3jtwbEE5vY5NLfwytE9frlGLLs1TQnTO/30TD5FQ T1ffmhI8YF7h4Smvp7mu2XmtWJ3qTPRmrOqSjO0nAX/CrYUH9851ZCoOT hcWwohaIEslV3sxmmgMxXwnlDiaTt5agNiNiLfUpGnUb8yTOKZUVdw8IN 5q7IBETfHGnQ5S5JJFBK188/iiWDwKRfb3mDOJ/3T6CPdMYMZdPpALHtn A==; X-IronPort-AV: E=McAfee;i="6200,9189,10238"; a="246294819" X-IronPort-AV: E=Sophos;i="5.88,317,1635231600"; d="scan'208";a="246294819" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Jan 2022 01:48:21 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,317,1635231600"; d="scan'208";a="617918605" Received: from mismail5-ilbpg0.png.intel.com ([10.88.229.13]) by FMSMGA003.fm.intel.com with ESMTP; 26 Jan 2022 01:48:17 -0800 From: Mohammad Athari Bin Ismail To: Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , "David S . Miller" , Jakub Kicinski , Maxime Coquelin , Ong Boon Leong , Voon Weifeng , Wong Vee Khee , Huacai Chen , Alexandre Torgue Cc: netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, mohammad.athari.ismail@intel.com Subject: [PATCH net v3 2/2] net: stmmac: skip only stmmac_ptp_register when resume from suspend Date: Wed, 26 Jan 2022 17:47:23 +0800 Message-Id: <20220126094723.11849-3-mohammad.athari.ismail@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220126094723.11849-1-mohammad.athari.ismail@intel.com> References: <20220126094723.11849-1-mohammad.athari.ismail@intel.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220126_014822_406719_888D8200 X-CRM114-Status: GOOD ( 16.54 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org When resume from suspend, besides skipping PTP registration, it also skipping PTP HW initialization. This could cause PTP clock not able to operate properly when resume from suspend. To fix this, only stmmac_ptp_register() is skipped when resume from suspend. Fixes: fe1319291150 ("stmmac: Don't init ptp again when resume from suspend/hibernation") Cc: # 5.15.x Signed-off-by: Mohammad Athari Bin Ismail --- v3 changelog: - Move the stmmac_ptp_register() call out to stmmac_hw_setup(). Commented by Jakub Kicinski . v2 changelog: - Fix build warning related to "function parameter or member not described". --- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index d7e261768f73..dfda1cbf81ae 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -914,8 +914,6 @@ static int stmmac_init_ptp(struct stmmac_priv *priv) priv->hwts_tx_en = 0; priv->hwts_rx_en = 0; - stmmac_ptp_register(priv); - return 0; } @@ -3241,7 +3239,7 @@ static int stmmac_fpe_start_wq(struct stmmac_priv *priv) /** * stmmac_hw_setup - setup mac in a usable state. * @dev : pointer to the device structure. - * @init_ptp: initialize PTP if set + * @ptp_register: register PTP if set * Description: * this is the main function to setup the HW in a usable state because the * dma engine is reset, the core registers are configured (e.g. AXI, @@ -3251,7 +3249,7 @@ static int stmmac_fpe_start_wq(struct stmmac_priv *priv) * 0 on success and an appropriate (-)ve integer as defined in errno.h * file on failure. */ -static int stmmac_hw_setup(struct net_device *dev, bool init_ptp) +static int stmmac_hw_setup(struct net_device *dev, bool ptp_register) { struct stmmac_priv *priv = netdev_priv(dev); u32 rx_cnt = priv->plat->rx_queues_to_use; @@ -3308,13 +3306,13 @@ static int stmmac_hw_setup(struct net_device *dev, bool init_ptp) stmmac_mmc_setup(priv); - if (init_ptp) { - ret = stmmac_init_ptp(priv); - if (ret == -EOPNOTSUPP) - netdev_warn(priv->dev, "PTP not supported by HW\n"); - else if (ret) - netdev_warn(priv->dev, "PTP init failed\n"); - } + ret = stmmac_init_ptp(priv); + if (ret == -EOPNOTSUPP) + netdev_warn(priv->dev, "PTP not supported by HW\n"); + else if (ret) + netdev_warn(priv->dev, "PTP init failed\n"); + else if (ptp_register) + stmmac_ptp_register(priv); priv->eee_tw_timer = STMMAC_DEFAULT_TWT_LS;