netdev - Re: [net-next PATCH v3 02/10] net: phy: Rename MDIO_CTRL1_SPEED for 2.5G and 5G to reflect PMA values

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20523422-7328-4803-940c-9ef1031f05fc@bootlin.com>
Date: Wed, 12 Nov 2025 09:53:31 +0100
From: Maxime Chevallier <maxime.chevallier@...tlin.com>
To: Alexander Duyck <alexander.duyck@...il.com>, netdev@...r.kernel.org
Cc: kuba@...nel.org, kernel-team@...a.com, andrew+netdev@...n.ch,
 hkallweit1@...il.com, linux@...linux.org.uk, pabeni@...hat.com,
 davem@...emloft.net
Subject: Re: [net-next PATCH v3 02/10] net: phy: Rename MDIO_CTRL1_SPEED for
 2.5G and 5G to reflect PMA values

Hi Alexander,

On 10/11/2025 17:01, Alexander Duyck wrote:
> From: Alexander Duyck <alexanderduyck@...com>
> 
> The 2.5G and 5G values are not consistent between the PCS CTRL1 and PMA
> CTRL1 values. In order to avoid confusion between the two I am updating the
> values to include "PMA" in the name similar to values used in similar
> places.
> 
> Signed-off-by: Alexander Duyck <alexanderduyck@...com>
> ---
>  drivers/net/phy/phy-c45.c |    8 ++++----
>  include/uapi/linux/mdio.h |    4 ++--
>  2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/net/phy/phy-c45.c b/drivers/net/phy/phy-c45.c
> index 1d747fbaa10c..d161fe3fee75 100644
> --- a/drivers/net/phy/phy-c45.c
> +++ b/drivers/net/phy/phy-c45.c
> @@ -148,12 +148,12 @@ int genphy_c45_pma_setup_forced(struct phy_device *phydev)
>  		ctrl2 |= MDIO_PMA_CTRL2_1000BT;
>  		break;
>  	case SPEED_2500:
> -		ctrl1 |= MDIO_CTRL1_SPEED2_5G;
> +		ctrl1 |= MDIO_PMA_CTRL1_SPEED2_5G;
>  		/* Assume 2.5Gbase-T */
>  		ctrl2 |= MDIO_PMA_CTRL2_2_5GBT;
>  		break;
>  	case SPEED_5000:
> -		ctrl1 |= MDIO_CTRL1_SPEED5G;
> +		ctrl1 |= MDIO_PMA_CTRL1_SPEED5G;
>  		/* Assume 5Gbase-T */
>  		ctrl2 |= MDIO_PMA_CTRL2_5GBT;
>  		break;
> @@ -618,10 +618,10 @@ int genphy_c45_read_pma(struct phy_device *phydev)
>  	case MDIO_PMA_CTRL1_SPEED1000:
>  		phydev->speed = SPEED_1000;
>  		break;
> -	case MDIO_CTRL1_SPEED2_5G:
> +	case MDIO_PMA_CTRL1_SPEED2_5G:
>  		phydev->speed = SPEED_2500;
>  		break;
> -	case MDIO_CTRL1_SPEED5G:
> +	case MDIO_PMA_CTRL1_SPEED5G:
>  		phydev->speed = SPEED_5000;
>  		break;
>  	case MDIO_CTRL1_SPEED10G:
> diff --git a/include/uapi/linux/mdio.h b/include/uapi/linux/mdio.h
> index 75ed41fc46c6..c33aa864ef66 100644
> --- a/include/uapi/linux/mdio.h
> +++ b/include/uapi/linux/mdio.h
> @@ -123,9 +123,9 @@
>  /* 50 Gb/s */
>  #define MDIO_PMA_CTRL1_SPEED50G		(MDIO_CTRL1_SPEEDSELEXT | 0x14)
>  /* 2.5 Gb/s */
> -#define MDIO_CTRL1_SPEED2_5G		(MDIO_CTRL1_SPEEDSELEXT | 0x18)
> +#define MDIO_PMA_CTRL1_SPEED2_5G	(MDIO_CTRL1_SPEEDSELEXT | 0x18)
>  /* 5 Gb/s */
> -#define MDIO_CTRL1_SPEED5G		(MDIO_CTRL1_SPEEDSELEXT | 0x1c)
> +#define MDIO_PMA_CTRL1_SPEED5G		(MDIO_CTRL1_SPEEDSELEXT | 0x1c)
>  
>  /* Status register 1. */
>  #define MDIO_STAT1_LPOWERABLE		0x0002	/* Low-power ability */

This is UAPI, I guess it's too late to rename that :(

Maxime
> 
> 
>