Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   "Ismail, Mohammad Athari" <mohammad.athari.ismail@intel.com>
To:     Jakub Kicinski <kuba@kernel.org>
CC:     Giuseppe Cavallaro <peppe.cavallaro@st.com>,
        Alexandre Torgue <alexandre.torgue@st.com>,
        Jose Abreu <joabreu@synopsys.com>,
        "David S . Miller" <davem@davemloft.net>,
        Maxime Coquelin <mcoquelin.stm32@gmail.com>,
        "Ong, Boon Leong" <boon.leong.ong@intel.com>,
        "Voon, Weifeng" <weifeng.voon@intel.com>,
        "Wong, Vee Khee" <vee.khee.wong@intel.com>,
        "Huacai Chen" <chenhuacai@kernel.org>,
        Alexandre Torgue <alexandre.torgue@foss.st.com>,
        "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
        "linux-stm32@st-md-mailman.stormreply.com" 
        <linux-stm32@st-md-mailman.stormreply.com>,
        "linux-arm-kernel@lists.infradead.org" 
        <linux-arm-kernel@lists.infradead.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "stable@vger.kernel.org" <stable@vger.kernel.org>
Subject: RE: [PATCH net v2 2/2] net: stmmac: skip only stmmac_ptp_register
 when resume from suspend
Thread-Topic: [PATCH net v2 2/2] net: stmmac: skip only stmmac_ptp_register
 when resume from suspend
Thread-Index: AQHYEZsS6IdbtbO8OkO3EV0xu+Kh+qx0tC0AgAAznrA=
Date:   Wed, 26 Jan 2022 07:23:22 +0000
Message-ID: <CO1PR11MB4771A6297E5E91D063DBDCA6D5209@CO1PR11MB4771.namprd11.prod.outlook.com>
References: <20220125032324.4055-1-mohammad.athari.ismail@intel.com>
        <20220125032324.4055-3-mohammad.athari.ismail@intel.com>
 <20220125201756.1606e1c4@kicinski-fedora-PC1C0HJN.hsd1.ca.comcast.net>
In-Reply-To: <20220125201756.1606e1c4@kicinski-fedora-PC1C0HJN.hsd1.ca.comcast.net>
Accept-Language: en-US
Content-Language: en-US
dlp-version: 11.6.200.16
dlp-product: dlpe-windows
dlp-reaction: no-action
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?/FgGSPJ/UVE29BxEZszVrbOmDwYQSYxfuAppHkPkF7aJNLRrHGyWc3NnEUXC?=
 =?us-ascii?Q?ZRpY/ZDinO7ykAraG1uUkESiCg+zvYYObGdKTu2mjBmHJxceizKCBjrzpyA/?=
 =?us-ascii?Q?/lGqi/+mKFGn5R6twYrLfhfH/EKVM/rm8ku74JKUKDK8gq31nh7BsgVoVwL0?=
 =?us-ascii?Q?y+rDIBwqExB1eQvBHQrEDzKDRzFcMbD/pcu8L3sspeJQcgdqH8gN4RaLEq/i?=
 =?us-ascii?Q?g2TIsaUEeP+U/LVpCb+Aoc0iniMS6nEfhxAT4DAXW2w7n5DOI5FDt0/C+MeR?=
 =?us-ascii?Q?IL/TjSb+fAooX/3udFKWlGwy12DZl6GjPAjyZLwj+GSSFxrM5mVk7DOHFPDw?=
 =?us-ascii?Q?z7BxlSihoUtcixoF0KeWOKrJgBGNO7+X6PusLO/seSQckSYaN2np6Eq0HNUt?=
 =?us-ascii?Q?h9VxWvrEPzhYTADMWL+8JwrwmV1vFOC9jC3AKm529TnYYH3ady0xQZbUkHo6?=
 =?us-ascii?Q?kblpYVRlGxNq2PDitKsU6eUNwnbKHZ626YbjUBuWwgbnkohCmLMeXrl6wTSW?=
 =?us-ascii?Q?69RDa6MYxhwB1csPNqRjTp3nSnkAVHectuursrZxa3uvSI5oCCE/k4fGSI9x?=
 =?us-ascii?Q?asMmr4rZfU/EtNJ0486l+40/XObsoozV3AUyxc8FufovhaPQAU8m2b+FB8gh?=
 =?us-ascii?Q?o73zKnkbQegjB6tSPiwkgErNDtBqh5ZTnvXbxixUU0DfT2tlOUjib9dJYp7p?=
 =?us-ascii?Q?po0dmSc3WMpEv7nYU+eLcE8Wal85+RXOmCyGdSS8nn2U5dgUs/eKkwIVV7w5?=
 =?us-ascii?Q?XykwHnxygWrtA19XZ141O2HhnIXsJib3LLZVp1OJlOgm3e3FtRh1oeCPNBCW?=
 =?us-ascii?Q?kajz976j6SE9RaAfdWtnrfGgvkbMbftHakCOdizHoSRCxf799NSXoX02S9WX?=
 =?us-ascii?Q?DfsR/aE76UhvF2LfAeSQ1XC3kiksjGe4bQLHof7BQRUL8XXP7ypEgo3QdVvq?=
 =?us-ascii?Q?407h1kgptDYzDZO0xLCHbt2Ka4FOCj0LNoDb3HrYTs7WsTSyZ4c7E6SDDANU?=
 =?us-ascii?Q?dBX62cwBSjPlg9qdHMW/RQCAjLTpW4Y3LwA5AhsbgbRqa8UKoY4nPNEU5lNu?=
 =?us-ascii?Q?rUvJPHI7Yacbisvr3gJvnR/U8Ze0CWdG85WpI1IDjwqEtWP5dH8aONeRLwuY?=
 =?us-ascii?Q?8QMINcNTT7FAZIfk64qV00oFnPWybcTMVDOidS8pgzx5IWewxIvvkmxsc2z9?=
 =?us-ascii?Q?caTtG4yu8bb0YEQqCmHgpaCIFEyPBjzKfEHIYZAJi1qGPDxKhIKBN2Xt6YyC?=
 =?us-ascii?Q?fhNshXADjxivSuPY45hD4KZBEoW/X7/7/IB23GxGufAj2d942Maww4+73QvO?=
 =?us-ascii?Q?+Yc+anIbVeG9dCf3QnMW08fbW0GkzZBpg8dR/47jhpFG5YRyHe7PnmCyr9iE?=
 =?us-ascii?Q?/VL80Ec60fZgXEFTVKqY+Cbxu+hh6YjKheCSxmloaIi3AXwwcFzxLP4zgrmM?=
 =?us-ascii?Q?L43b1bLL5VoVYUX6AWtumfk6V0Z75oslPqWvkin4L1loetzbAULop8VmPJgD?=
 =?us-ascii?Q?FzB/N6vjAwXR3uhX59mmONNbvjNLUlOvmWcz406bbh0Z1QS33KHM6wFfqz6+?=
 =?us-ascii?Q?UKCIES0a4jrJmMIbt7Iuw6PwOyJQXbj3kpNxDtcds3hqBlBGIEs+I3hVDavn?=
 =?us-ascii?Q?UpN6Z4RPjrDNvU6TBpd9ootMgcHLr1nnkS3Q//Xk5FFPVRsrwp8a92850Czs?=
 =?us-ascii?Q?JE6wDS3uUXi+teD+9NysjOkiie56ax8EXb8eM5yLumEgroclS1NTxWFXIPTI?=
 =?us-ascii?Q?sI177gabvg=3D=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4771.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ecdcc633-74d0-406a-96be-08d9e09cbc4b
X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Jan 2022 07:23:22.6820
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: mWM6tBjs9HZf6X+LF1wKE0bHgqIbp0LWw9DSKEguXGkz+OMgWCYs5BkHOPwXzGqXcU3F03crYstE/jELRVYdihx+nSrph2iQA1fBzn35caPSpW9T3odgSWfYXb1SzUMp
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR11MB4653
X-OriginatorOrg: intel.com
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


> -----Original Message-----
> From: Jakub Kicinski <kuba@kernel.org>
> Sent: Wednesday, January 26, 2022 12:18 PM
> To: Ismail, Mohammad Athari <mohammad.athari.ismail@intel.com>
> Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>; Alexandre Torgue
> <alexandre.torgue@st.com>; Jose Abreu <joabreu@synopsys.com>; David
> S . Miller <davem@davemloft.net>; Maxime Coquelin
> <mcoquelin.stm32@gmail.com>; Ong, Boon Leong
> <boon.leong.ong@intel.com>; Voon, Weifeng <weifeng.voon@intel.com>;
> Wong, Vee Khee <vee.khee.wong@intel.com>; Huacai Chen
> <chenhuacai@kernel.org>; Alexandre Torgue
> <alexandre.torgue@foss.st.com>; 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
> Subject: Re: [PATCH net v2 2/2] net: stmmac: skip only stmmac_ptp_registe=
r
> when resume from suspend
>=20
> On Tue, 25 Jan 2022 11:23:24 +0800 Mohammad Athari Bin Ismail wrote:
> > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> > b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> > index d7e261768f73..b8e5e19e6f7b 100644
> > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> > @@ -880,11 +880,12 @@
> EXPORT_SYMBOL_GPL(stmmac_init_tstamp_counter);
> >  /**
> >   * stmmac_init_ptp - init PTP
> >   * @priv: driver private structure
> > + * @ptp_register: register PTP if set
> >   * Description: this is to verify if the HW supports the PTPv1 or PTPv=
2.
> >   * This is done by looking at the HW cap. register.
> >   * This function also registers the ptp driver.
> >   */
> > -static int stmmac_init_ptp(struct stmmac_priv *priv)
> > +static int stmmac_init_ptp(struct stmmac_priv *priv, bool
> > +ptp_register)
> >  {
> >  	bool xmac =3D priv->plat->has_gmac4 || priv->plat->has_xgmac;
> >  	int ret;
> > @@ -914,7 +915,8 @@ static int stmmac_init_ptp(struct stmmac_priv
> *priv)
> >  	priv->hwts_tx_en =3D 0;
> >  	priv->hwts_rx_en =3D 0;
> >
> > -	stmmac_ptp_register(priv);
> > +	if (ptp_register)
> > +		stmmac_ptp_register(priv);
>=20
> stmmac_init_ptp() only has one caller, and the registration step is last.
> Wouldn't it be better to move the stmmac_ptp_register() call out to
> stmmac_hw_setup()? That way we don't need to pass extra arguments to
> init.

Yes agree with you suggestion. Will fix it in v3. Thanks.

-Athari-

>=20
> >  	return 0;
> >  }
> > @@ -3241,7 +3243,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 becaus=
e the
> >   *  dma engine is reset, the core registers are configured (e.g. AXI,
> > @@ -3251,7 +3253,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 =3D netdev_priv(dev);
> >  	u32 rx_cnt =3D priv->plat->rx_queues_to_use; @@ -3308,13 +3310,11
> @@
> > static int stmmac_hw_setup(struct net_device *dev, bool init_ptp)
> >
> >  	stmmac_mmc_setup(priv);
> >
> > -	if (init_ptp) {
> > -		ret =3D stmmac_init_ptp(priv);
> > -		if (ret =3D=3D -EOPNOTSUPP)
> > -			netdev_warn(priv->dev, "PTP not supported by
> HW\n");
> > -		else if (ret)
> > -			netdev_warn(priv->dev, "PTP init failed\n");
> > -	}
> > +	ret =3D stmmac_init_ptp(priv, ptp_register);
> > +	if (ret =3D=3D -EOPNOTSUPP)
> > +		netdev_warn(priv->dev, "PTP not supported by HW\n");
> > +	else if (ret)
> > +		netdev_warn(priv->dev, "PTP init failed\n");