Received-SPF: pass (google.com: domain of linux-kernel+bounces-202259-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Message-ID: <05146417-c29b-41f4-89ac-bc9e1af2cee7@intel.com>
Date: Wed, 5 Jun 2024 13:24:50 +0200
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH net V3 3/3] net: phy: mxl-gpy: Remove interrupt mask
 clearing from config_init
To: Raju Lakkaraju <Raju.Lakkaraju@microchip.com>, <netdev@vger.kernel.org>
CC: <davem@davemloft.net>, <kuba@kernel.org>, <linux-kernel@vger.kernel.org>,
	<bryan.whitehead@microchip.com>, <andrew@lunn.ch>, <linux@armlinux.org.uk>,
	<sbauer@blackbox.su>, <hmehrtens@maxlinear.com>, <lxu@maxlinear.com>,
	<hkallweit1@gmail.com>, <edumazet@google.com>, <pabeni@redhat.com>,
	<UNGLinuxDriver@microchip.com>
References: <20240605101611.18791-1-Raju.Lakkaraju@microchip.com>
 <20240605101611.18791-4-Raju.Lakkaraju@microchip.com>
Content-Language: en-US
From: Wojciech Drewek <wojciech.drewek@intel.com>
In-Reply-To: <20240605101611.18791-4-Raju.Lakkaraju@microchip.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Zi9lVGdYamRtaUN4cEJuWWVIdFM5VWgvaGpnaXp6ZjA1eThwRDAvMnBBRVVM?=
 =?utf-8?B?Sm5WdnRQeFRtdDE1elpHUDZCc21jbVNMdHIzbFdIOTVST3M4N3lYcFFVM0Rs?=
 =?utf-8?B?WXhYN1NYOU0vZk03N281eCtXN0NMSTAxUnpZZVJJUXZ4NW8wRWovclpXaVVq?=
 =?utf-8?B?MmFOZUtxZU5zM0p2bVdCaVl5UDY0SjZJWGVtQmwrWHYrUmkrR0ppYzZHMG9G?=
 =?utf-8?B?NStGM1NWbm1Eb3c3QmRRREFTdU5RbWs3WnFoekpYYkdBelF5b1ErVnJIcEZs?=
 =?utf-8?B?a0pwblJ0Zi9OY3pkODhUM2hrSkRjQncrdFR1Rzh4bXpxZExXRFBwemFoQmZt?=
 =?utf-8?B?UDR0QnZiVEFLRWliNDVyTHhZS1BteFJ5Y2hQY2xFSzVDL1A5L0dRUWtjdVE0?=
 =?utf-8?B?N1lUWUphWENUN1R2Q0VnYW9WeTNnQWJWbk1TaFhPbVQwRGJDVnRkZlBXSmhX?=
 =?utf-8?B?WHlYVStxcHpQTHRvWm15S1lvbGpnMkZCc0FjSlNxNEdtK3ZvcTdxOUxXOGNj?=
 =?utf-8?B?UWlueHNENWNEZkJtQnArcDc0WFhpMjNuTEwvUXgyQ2MwSlZsTThSeTJFOUtr?=
 =?utf-8?B?T0wzSHMza3g0Z2ZDa0UzeUtVVmlnditmVzlQZzQ2UmhXQ1BCTUYwTGRUalU5?=
 =?utf-8?B?VkVwUEdyMGJsM1JSMHdxT05JMDZnSFI3Qk10N1NOaDFBeHFQczdHRnExL2dP?=
 =?utf-8?B?RXduWFBpRXNWaFNFU201MXVzSlN2TDNRMzMrRVZzZGtwdDVRUjNGZS9mbUNY?=
 =?utf-8?B?TkJUeDVMb1pxelRhWEtPSXdVVy9NWitSVURsRWxxdlJuK1pVcmNVb1NpOTZC?=
 =?utf-8?B?MFlwNSt2ekZkcWVTb1grSTZrZ0ZHQVZSdFRUNGQ5QmVhNkt4dUsxaGlVd05W?=
 =?utf-8?B?Rk1rUXd5TDBCekpxYVRpVWFFbFZRUU00SGtQcHhtbThKOEFPYWFqakhoa3ZI?=
 =?utf-8?B?bi9TWmxUT3ZCZTllWDhHdGxZeUdVK2dqMlJNME1vVVRGM2xUNnV6N2lFSlIw?=
 =?utf-8?B?dXlOaWNDWTR1UHgrUVpLOHdJOFJsYTZyN2tjTUxzWWF5U0oyUjg1NVp1d1lw?=
 =?utf-8?B?TTBzdXhycWFSRE4yZDh5TFlUeUNHTVZJR05wbGtnZ2lrSjFqRkZKYml2YitC?=
 =?utf-8?B?UmJsSTlBRUVLSXpLK1JVSnJCakFIR0k1S3dWSXkySWtMeHFJcHV3Rk1IdVVp?=
 =?utf-8?B?aTJxSkkyNGhyblYveEtvdXUvVEQyak92aDUvckh6RnZoK2NFd1dxTDFsQjFi?=
 =?utf-8?B?alk5RFpkeCtqOU1VTllSN1hYT2JBR1RhMmZoY05CWXRGME9MMktVNW9Ndjd2?=
 =?utf-8?B?aVVUVnBNL1FocWFYMG5NWXc1NFZRYUdxdWtkdU9EanpIN3E0aXBuWW5kSmZO?=
 =?utf-8?B?ZmhKMklZSk9RWVZlRDQvNnBQTmNTRW8zQnNuM05YeHhHR0JOeVFFN1hibCs1?=
 =?utf-8?B?NlNhdWc2ejUyeksyVTBXUmd1R3E1eWhlQ0p5UUk1THZhWDdOUkZlMWxsZlQv?=
 =?utf-8?B?NGZqNy9BVDM4QmVSZGZWbExydktBZmxtczJxTy9kMjIvNmVvc1ArUHgxMVhy?=
 =?utf-8?B?NDJSQTdZcXJCMEkzTnU5L1QralVXb0hvQTlRM3dnWFhaYm1UdUdpeHJkc0Zq?=
 =?utf-8?B?dlNJOXNvNGl6cjc5b2JaZDBLMDA2VEs4OVNnVXErUXl4ci9rQVhwMTJ1S25K?=
 =?utf-8?B?bVlHWjJDdkNKRXVqMnB2RGdYd0hTTEtGSjVXbGNDY21MUkNXVGlSa0xlbXIy?=
 =?utf-8?B?ZWcwN3ZSVmI0MkpRL1J1dndvMHdsZVBrNGpmUFAvbng1MzVpK3FzYldRWEVM?=
 =?utf-8?B?Yy90ZmI2VjB6OTNnSG1YQld6KzVvU05CZXl5OFhkNmdBNDlITjZNUkRrTFlQ?=
 =?utf-8?B?dmR4UjJKWHRyc3hyNitqbUp0Z1VuOUdhSGhLL2xDMU5XczhDSzlGVlhvK3d0?=
 =?utf-8?B?YS9qemVyZlBzSmFqUndXNTk3UHdrV2dlUTJ2TXgwUmdFcHovYnVwbUNNOVVB?=
 =?utf-8?B?b1NQbkpBaVR5Q01HQmZwbDd1RStUeWExbDJ6OTVLR1VEcjg4Umt1NzN6eEVD?=
 =?utf-8?B?Vk41ZUNlUCtoa016cXUzYklmbUNvWTA3andGOUw0UENudWZwRGhhM1J0WFJG?=
 =?utf-8?B?S1JGM0lYL3IvN1A0bEE3U3VYSjRnSzF0Szd6Ylh0NlhYcDVQREFUd3FxWVU3?=
 =?utf-8?B?blE9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: ba0764ee-004d-4ae4-33ae-08dc855221df
X-MS-Exchange-CrossTenant-AuthSource: MW4PR11MB5776.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2024 11:24:58.4134
 (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: KPxbUAsNp+0jO/P2Mk37qo51mjwY7JkzMtvxL8Mi5dA9EvQzqi4piJCrOKoWaAYZZh5oIt/eRT5RbZam8+bnYh1W8/BWADv59XhhzOOTszg=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR11MB7714
X-OriginatorOrg: intel.com


On 05.06.2024 12:16, Raju Lakkaraju wrote:
> When the system resumes from sleep, the phy_init_hw() function invokes
> config_init(), which clears all interrupt masks and causes wake events to be
> lost in subsequent wake sequences. Remove interrupt mask clearing from
> config_init() and preserve relevant masks in config_intr()
> 
> Fixes: 7d901a1e878a ("net: phy: add Maxlinear GPY115/21x/24x driver")
> Signed-off-by: Raju Lakkaraju <Raju.Lakkaraju@microchip.com>
> ---

One nit, other than that:
Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com>

> Change List:                                                                    
> ------------                                                                    
> V0 -> V3:
>   - Address the https://lore.kernel.org/lkml/4a565d54-f468-4e32-8a2c-102c1203f72c@lunn.ch/T/
>     review comments
>   
>  drivers/net/phy/mxl-gpy.c | 58 +++++++++++++++++++++++++--------------
>  1 file changed, 38 insertions(+), 20 deletions(-)
> 
> diff --git a/drivers/net/phy/mxl-gpy.c b/drivers/net/phy/mxl-gpy.c
> index b2d36a3a96f1..e5f8ac4b4604 100644
> --- a/drivers/net/phy/mxl-gpy.c
> +++ b/drivers/net/phy/mxl-gpy.c
> @@ -107,6 +107,7 @@ struct gpy_priv {
>  
>  	u8 fw_major;
>  	u8 fw_minor;
> +	u32 wolopts;
>  
>  	/* It takes 3 seconds to fully switch out of loopback mode before
>  	 * it can safely re-enter loopback mode. Record the time when
> @@ -221,6 +222,15 @@ static int gpy_hwmon_register(struct phy_device *phydev)
>  }
>  #endif
>  
> +static int gpy_ack_interrupt(struct phy_device *phydev)
> +{
> +	int ret;
> +
> +	/* Clear all pending interrupts */
> +	ret = phy_read(phydev, PHY_ISTAT);
> +	return ret < 0 ? ret : 0;

Can we just return phy_read?

> +}
> +
>  static int gpy_mbox_read(struct phy_device *phydev, u32 addr)
>  {
>  	struct gpy_priv *priv = phydev->priv;
> @@ -262,16 +272,8 @@ static int gpy_mbox_read(struct phy_device *phydev, u32 addr)
>  
>  static int gpy_config_init(struct phy_device *phydev)
>  {
> -	int ret;
> -
> -	/* Mask all interrupts */
> -	ret = phy_write(phydev, PHY_IMASK, 0);
> -	if (ret)
> -		return ret;
> -
> -	/* Clear all pending interrupts */
> -	ret = phy_read(phydev, PHY_ISTAT);
> -	return ret < 0 ? ret : 0;
> +	/* Nothing to configure. Configuration Requirement Placeholder */
> +	return 0;
>  }
>  
>  static int gpy21x_config_init(struct phy_device *phydev)
> @@ -627,11 +629,23 @@ static int gpy_read_status(struct phy_device *phydev)
>  
>  static int gpy_config_intr(struct phy_device *phydev)
>  {
> +	struct gpy_priv *priv = phydev->priv;
>  	u16 mask = 0;
> +	int ret;
> +
> +	ret = gpy_ack_interrupt(phydev);
> +	if (ret)
> +		return ret;
>  
>  	if (phydev->interrupts == PHY_INTERRUPT_ENABLED)
>  		mask = PHY_IMASK_MASK;
>  
> +	if (priv->wolopts & WAKE_MAGIC)
> +		mask |= PHY_IMASK_WOL;
> +
> +	if (priv->wolopts & WAKE_PHY)
> +		mask |= PHY_IMASK_LSTC;
> +
>  	return phy_write(phydev, PHY_IMASK, mask);
>  }
>  
> @@ -678,6 +692,7 @@ static int gpy_set_wol(struct phy_device *phydev,
>  		       struct ethtool_wolinfo *wol)
>  {
>  	struct net_device *attach_dev = phydev->attached_dev;
> +	struct gpy_priv *priv = phydev->priv;
>  	int ret;
>  
>  	if (wol->wolopts & WAKE_MAGIC) {
> @@ -725,6 +740,8 @@ static int gpy_set_wol(struct phy_device *phydev,
>  		ret = phy_read(phydev, PHY_ISTAT);
>  		if (ret < 0)
>  			return ret;
> +
> +		priv->wolopts |= WAKE_MAGIC;
>  	} else {
>  		/* Disable magic packet matching */
>  		ret = phy_clear_bits_mmd(phydev, MDIO_MMD_VEND2,
> @@ -732,6 +749,13 @@ static int gpy_set_wol(struct phy_device *phydev,
>  					 WOL_EN);
>  		if (ret < 0)
>  			return ret;
> +
> +		/* Disable the WOL interrupt */
> +		ret = phy_clear_bits(phydev, PHY_IMASK, PHY_IMASK_WOL);
> +		if (ret < 0)
> +			return ret;
> +
> +		priv->wolopts &= ~WAKE_MAGIC;
>  	}
>  
>  	if (wol->wolopts & WAKE_PHY) {
> @@ -748,9 +772,11 @@ static int gpy_set_wol(struct phy_device *phydev,
>  		if (ret & (PHY_IMASK_MASK & ~PHY_IMASK_LSTC))
>  			phy_trigger_machine(phydev);
>  
> +		priv->wolopts |= WAKE_PHY;
>  		return 0;
>  	}
>  
> +	priv->wolopts &= ~WAKE_PHY;
>  	/* Disable the link state change interrupt */
>  	return phy_clear_bits(phydev, PHY_IMASK, PHY_IMASK_LSTC);
>  }
> @@ -758,18 +784,10 @@ static int gpy_set_wol(struct phy_device *phydev,
>  static void gpy_get_wol(struct phy_device *phydev,
>  			struct ethtool_wolinfo *wol)
>  {
> -	int ret;
> +	struct gpy_priv *priv = phydev->priv;
>  
>  	wol->supported = WAKE_MAGIC | WAKE_PHY;
> -	wol->wolopts = 0;
> -
> -	ret = phy_read_mmd(phydev, MDIO_MMD_VEND2, VPSPEC2_WOL_CTL);
> -	if (ret & WOL_EN)
> -		wol->wolopts |= WAKE_MAGIC;
> -
> -	ret = phy_read(phydev, PHY_IMASK);
> -	if (ret & PHY_IMASK_LSTC)
> -		wol->wolopts |= WAKE_PHY;
> +	wol->wolopts = priv->wolopts;
>  }
>  
>  static int gpy_loopback(struct phy_device *phydev, bool enable)