Re: [PATCH net-next 06/15] net: phy: meson-gxl: remove the use of .ack_callback()

[Jerome Brunet <jbrunet@baylibre.com>]

On Mon 23 Nov 2020 at 16:38, Ioana Ciornei <ciorneiioana@gmail.com> wrote:

> From: Ioana Ciornei <ioana.ciornei@nxp.com>
>
> In preparation of removing the .ack_interrupt() callback, we must replace
> its occurrences (aka phy_clear_interrupt), from the 2 places where it is
> called from (phy_enable_interrupts and phy_disable_interrupts), with
> equivalent functionality.
>
> This means that clearing interrupts now becomes something that the PHY
> driver is responsible of doing, before enabling interrupts and after
> clearing them. Make this driver follow the new contract.
>
> Cc: Jerome Brunet <jbrunet@baylibre.com>
> Cc: Neil Armstrong <narmstrong@baylibre.com>
> Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
> ---
>  drivers/net/phy/meson-gxl.c | 19 +++++++++++--------
>  1 file changed, 11 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/net/phy/meson-gxl.c b/drivers/net/phy/meson-gxl.c
> index b16b1cc89165..7e7904fee1d9 100644
> --- a/drivers/net/phy/meson-gxl.c
> +++ b/drivers/net/phy/meson-gxl.c
> @@ -204,22 +204,27 @@ static int meson_gxl_config_intr(struct phy_device *phydev)
>  	int ret;
>  
>  	if (phydev->interrupts == PHY_INTERRUPT_ENABLED) {
> +		/* Ack any pending IRQ */
> +		ret = meson_gxl_ack_interrupt(phydev);
> +		if (ret)
> +			return ret;
> +
>  		val = INTSRC_ANEG_PR
>  			| INTSRC_PARALLEL_FAULT
>  			| INTSRC_ANEG_LP_ACK
>  			| INTSRC_LINK_DOWN
>  			| INTSRC_REMOTE_FAULT
>  			| INTSRC_ANEG_COMPLETE;
> +		ret = phy_write(phydev, INTSRC_MASK, val);
>  	} else {
>  		val = 0;
> -	}
> +		ret = phy_write(phydev, INTSRC_MASK, val);
>  
> -	/* Ack any pending IRQ */
> -	ret = meson_gxl_ack_interrupt(phydev);
> -	if (ret)
> -		return ret;
> +		/* Ack any pending IRQ */
> +		ret = meson_gxl_ack_interrupt(phydev);
> +	}
>  
> -	return phy_write(phydev, INTSRC_MASK, val);
> +	return ret;

The only thing the above does is clear the irq *after* writing INTSRC_MASK
*only* when the interrupts are not enabled. If that was not the intent,
please let me know.

As it stands, I don't think this hunk is necessary and I would prefer if
it was not included.

>  }
>  
>  static irqreturn_t meson_gxl_handle_interrupt(struct phy_device *phydev)
> @@ -249,7 +254,6 @@ static struct phy_driver meson_gxl_phy[] = {
>  		.soft_reset     = genphy_soft_reset,
>  		.config_init	= meson_gxl_config_init,
>  		.read_status	= meson_gxl_read_status,
> -		.ack_interrupt	= meson_gxl_ack_interrupt,
>  		.config_intr	= meson_gxl_config_intr,
>  		.handle_interrupt = meson_gxl_handle_interrupt,
>  		.suspend        = genphy_suspend,
> @@ -260,7 +264,6 @@ static struct phy_driver meson_gxl_phy[] = {
>  		/* PHY_BASIC_FEATURES */
>  		.flags		= PHY_IS_INTERNAL,
>  		.soft_reset     = genphy_soft_reset,
> -		.ack_interrupt	= meson_gxl_ack_interrupt,
>  		.config_intr	= meson_gxl_config_intr,
>  		.handle_interrupt = meson_gxl_handle_interrupt,
>  		.suspend        = genphy_suspend,