Date:   Tue, 14 Mar 2023 10:01:44 +0100
From:   Piotr Raczynski <piotr.raczynski@intel.com>
To:     Michael Sit Wei Hong <michael.wei.hong.sit@intel.com>
CC:     Giuseppe Cavallaro <peppe.cavallaro@st.com>,
        Alexandre Torgue <alexandre.torgue@foss.st.com>,
        Jose Abreu <joabreu@synopsys.com>,
        "David S . Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        "Jakub Kicinski" <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Maxime Coquelin <mcoquelin.stm32@gmail.com>,
        Ong Boon Leong <boon.leong.ong@intel.com>,
        <netdev@vger.kernel.org>,
        <linux-stm32@st-md-mailman.stormreply.com>,
        <linux-arm-kernel@lists.infradead.org>,
        <linux-kernel@vger.kernel.org>,
        "Looi Hong Aun" <hong.aun.looi@intel.com>,
        Voon Weifeng <weifeng.voon@intel.com>,
        Lai Peter Jun Ann <peter.jun.ann.lai@intel.com>
Subject: Re: [PATCH net 2/2] net: stmmac: move fixed-link support fixup code
Message-ID: <ZBA3+LqAaWXDZCKZ@nimitz>
References: <20230313080135.2952774-1-michael.wei.hong.sit@intel.com>
 <20230313080135.2952774-3-michael.wei.hong.sit@intel.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20230313080135.2952774-3-michael.wei.hong.sit@intel.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?xQLvtsEadMp9bX8w3W/7pO7c5FXi7qAk47XsMaUKKVyS7kilavaD01IBz9B0?=
 =?us-ascii?Q?IfuqCHAqcLEr/fjfUwMsNDhl5i28eXM39FVnOnkHTmyLHEKMLMVyKPtP/G5v?=
 =?us-ascii?Q?tkLkVWfRShUZfLu1xiHPouhvbi0txRSzfEUHxjHgsCkz7MhC+rqhZ6qZy92M?=
 =?us-ascii?Q?W40z7v5ZKhxP+G4JSSt0FT5qmYQPp/UiGo8R2QnD9uy6Xp6LgYfWoo4I1e0o?=
 =?us-ascii?Q?09F7T9IrBjvFBqA9Q5Qcdao+SjBtfSH4V8ahJoO2JbobjmUkG00Vq9AfFIwb?=
 =?us-ascii?Q?7A4eEFNBmG1Xtf/Xec9Zv6rfXnv2EizsCDyVq5aO4JKlDBg9z/fIDFo0+8WI?=
 =?us-ascii?Q?IY0Quk+0lgKP9sku1Nlpoaf9T7A+MFERDnDzI0tmNm+ecUKiCRA564rhw0P0?=
 =?us-ascii?Q?ovHXmNxCY5KZKcezO2ONZNys1vinE0FEhwF8DNKbv2B0Fs/oK/6RBetOaA2Z?=
 =?us-ascii?Q?nINDh8P0Op4cy2QcOBuH163eix0AX5WfPkgdDNx1OocEfHJEHLx3mEg/HeT5?=
 =?us-ascii?Q?JqsHDHy/ENTgsaKH8QfA56nwJ9pa8UqOGnIeWll9NRknxBpKorjBZ81d7KYn?=
 =?us-ascii?Q?mpchrvnzsdQ5bSlakbiKS65r6OSyHsnfkBd8hL6fTw2VRiKmzNPxLQNLriHE?=
 =?us-ascii?Q?NmyOv9hQ/g2qcPkid/uufihQHjjX23Atw/rUHmbpUIO+ISsGsh7rdwRIuESw?=
 =?us-ascii?Q?P418XGxRW+xa0biefHEf6RHnwMzOgiQIkU6O/ObTQN5QhZ41OJuBM2RLh9mH?=
 =?us-ascii?Q?RTOFE0JUQDzx0V+eBlJUkMdAv+RKeTgomqPBVOl3Ywi51JsAoyCJsvsPngtb?=
 =?us-ascii?Q?DBb10D88fMkGp5jxK3vBtD08cv6u5pTRdhuaYjJ02yuRN1DpVyKU+bxFww27?=
 =?us-ascii?Q?i451zz5gD8dQ12bjq5awraqFb5Z/ToFAdmKaBRlGFAxRanSR+IwDzeV5q5ju?=
 =?us-ascii?Q?hfn0HjErWTIVXFnlLoOvO8GOx7BDA4QvUfn9X5jxKf+Y0CPNNNWa/GWjVpb7?=
 =?us-ascii?Q?7yxDs4WxGwH04UDTc2RVPGouHcCuH03gUfJ0+RAStjhmpRZbWWJEYBBqwdKB?=
 =?us-ascii?Q?lAT6X35XFpcb7qPQvgNkdWqKsiIgAgCycUkuh+y2dAI1xSa3kdxGZOvWGHCz?=
 =?us-ascii?Q?GvXqwBHHmvUN/a8GmoCXO5r3T9l/qtJU52dt5IantrVApEh7GU8z2jmnAfH4?=
 =?us-ascii?Q?eb5uw8xcEVGnsxYMroUuiIVqeNislZZK/HQ3p0SXPCu4F1QaJhE6x9OGRHUD?=
 =?us-ascii?Q?v/B6/2Ag2eytNpp8oriFFZMXNirOPTDsquB+dTJpw9ABGcJ6N5Th4sIfUOwM?=
 =?us-ascii?Q?l9YEZD+4Y2JxL4215SrBH7Vp/p+Bbz5MRBSx7aUetSPCdCjxorKzcVt70pC/?=
 =?us-ascii?Q?ho560foWZ9I+yWEB+uWqt8hGNbiMFXYA8wc9hfV5ZOekODKB7XQbYq8Ly3WR?=
 =?us-ascii?Q?5pRFniHqX/ZzVHvI8jMaWtpZHfpTFDrdWlnT2bNMmk3oms8iCfQ5EUeFynBV?=
 =?us-ascii?Q?/jxS5BV0lwGnnLluP9SEv69D7SLEaL/Jt5nMjKT/5u5COB1vUgBoM43XLSqJ?=
 =?us-ascii?Q?dZH8Z+5MxDcOqRuaJo2kt4W2uRXUjaGJ1BUWqveIwIloVrILnyAZKwKxr7Nl?=
 =?us-ascii?Q?+g=3D=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 6ca127f2-2c47-47fc-121e-08db246abcf0
X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB7471.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2023 09:01:46.3508
 (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: CvpGGnxF75Ro+kQcFhM7EhPZrntPLKtwkVCBlpL5non0S2xILIehJa8skzxfVG3InA1R5G+yLzIUnkbpl80GemTxGN7BLm6wf/1MeI6ER9U=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR11MB5102
X-OriginatorOrg: intel.com
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Mon, Mar 13, 2023 at 04:01:35PM +0800, Michael Sit Wei Hong wrote:
> xpcs_an_inband value is updated in the speed_mode_2500 function
> which turns on the xpcs_an_inband mode.
> 
> Moving the fixed-link fixup code to right before phylink setup to
> ensure no more fixup will affect the fixed-link mode configurations.
> 
> Fixes: 72edaf39fc65 ("stmmac: intel: add phy-mode and fixed-link ACPI _DSD setting support")
> Signed-off-by: Michael Sit Wei Hong <michael.wei.hong.sit@intel.com>
> ---
>  drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 11 -----------
>  drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 15 +++++++++++++++
>  2 files changed, 15 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
> index 7deb1f817dac..d02db2b529b9 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
> @@ -592,17 +592,6 @@ static int intel_mgbe_common_data(struct pci_dev *pdev,
>  		plat->mdio_bus_data->xpcs_an_inband = true;
>  	}
>  
> -	/* For fixed-link setup, we clear xpcs_an_inband */
> -	if (fwnode) {
> -		struct fwnode_handle *fixed_node;
> -
> -		fixed_node = fwnode_get_named_child_node(fwnode, "fixed-link");
> -		if (fixed_node)
> -			plat->mdio_bus_data->xpcs_an_inband = false;
> -
> -		fwnode_handle_put(fixed_node);
> -	}
> -
>  	/* Ensure mdio bus scan skips intel serdes and pcs-xpcs */
>  	plat->mdio_bus_data->phy_mask = 1 << INTEL_MGBE_ADHOC_ADDR;
>  	plat->mdio_bus_data->phy_mask |= 1 << INTEL_MGBE_XPCS_ADDR;
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> index 398adcd68ee8..5a9abafba490 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> @@ -7064,6 +7064,7 @@ int stmmac_dvr_probe(struct device *device,
>  		     struct stmmac_resources *res)
>  {
>  	struct net_device *ndev = NULL;
> +	struct fwnode_handle *fwnode;
>  	struct stmmac_priv *priv;
>  	u32 rxq;
>  	int i, ret = 0;
> @@ -7306,6 +7307,20 @@ int stmmac_dvr_probe(struct device *device,
>  			goto error_xpcs_setup;
>  	}
>  
> +	/* For fixed-link setup, we clear xpcs_an_inband */
> +	if (!fwnode)
> +		fwnode = dev_fwnode(priv->device);
> +
> +	if (fwnode) {
> +		struct fwnode_handle *fixed_node;
> +
> +		fixed_node = fwnode_get_named_child_node(fwnode, "fixed-link");
> +		if (fixed_node)
> +			priv->plat->mdio_bus_data->xpcs_an_inband = false;
> +
> +		fwnode_handle_put(fixed_node);
> +	}
> +

Now you're doing similar checks here and inside stmmac_init_phy. Maybe
you could combined this to some function?

Piotr

>  	ret = stmmac_phy_setup(priv);
>  	if (ret) {
>  		netdev_err(ndev, "failed to setup phy (%d)\n", ret);
> -- 
> 2.34.1
>