[PATCH net-next] net: phy: Modify register address from decimal to hexadecimal

[PATCH net-next] net: phy: Modify register address from decimal to hexadecimal

[Yajun Deng]

Most datasheets will use hexadecimal for register address, modify it
and make it fit the datasheet better.

Signed-off-by: Yajun Deng <yajun.deng@linux.dev>
---
 include/uapi/linux/mdio.h | 98 +++++++++++++++++++--------------------
 1 file changed, 49 insertions(+), 49 deletions(-)

diff --git a/include/uapi/linux/mdio.h b/include/uapi/linux/mdio.h
index c0c8ec995b06..2f6022bef535 100644
--- a/include/uapi/linux/mdio.h
+++ b/include/uapi/linux/mdio.h
@@ -32,58 +32,58 @@
 #define MDIO_STAT1		MII_BMSR
 #define MDIO_DEVID1		MII_PHYSID1
 #define MDIO_DEVID2		MII_PHYSID2
-#define MDIO_SPEED		4	/* Speed ability */
-#define MDIO_DEVS1		5	/* Devices in package */
-#define MDIO_DEVS2		6
-#define MDIO_CTRL2		7	/* 10G control 2 */
-#define MDIO_STAT2		8	/* 10G status 2 */
-#define MDIO_PMA_TXDIS		9	/* 10G PMA/PMD transmit disable */
-#define MDIO_PMA_RXDET		10	/* 10G PMA/PMD receive signal detect */
-#define MDIO_PMA_EXTABLE	11	/* 10G PMA/PMD extended ability */
-#define MDIO_PKGID1		14	/* Package identifier */
-#define MDIO_PKGID2		15
-#define MDIO_AN_ADVERTISE	16	/* AN advertising (base page) */
-#define MDIO_AN_LPA		19	/* AN LP abilities (base page) */
-#define MDIO_PCS_EEE_ABLE	20	/* EEE Capability register */
-#define MDIO_PCS_EEE_ABLE2	21	/* EEE Capability register 2 */
-#define MDIO_PMA_NG_EXTABLE	21	/* 2.5G/5G PMA/PMD extended ability */
-#define MDIO_PCS_EEE_WK_ERR	22	/* EEE wake error counter */
-#define MDIO_PHYXS_LNSTAT	24	/* PHY XGXS lane state */
-#define MDIO_AN_EEE_ADV		60	/* EEE advertisement */
-#define MDIO_AN_EEE_LPABLE	61	/* EEE link partner ability */
-#define MDIO_AN_EEE_ADV2	62	/* EEE advertisement 2 */
-#define MDIO_AN_EEE_LPABLE2	63	/* EEE link partner ability 2 */
-#define MDIO_AN_CTRL2		64	/* AN THP bypass request control */
+#define MDIO_SPEED		0x0004	/* Speed ability */
+#define MDIO_DEVS1		0x0005	/* Devices in package */
+#define MDIO_DEVS2		0x0006
+#define MDIO_CTRL2		0x0007	/* 10G control 2 */
+#define MDIO_STAT2		0x0008	/* 10G status 2 */
+#define MDIO_PMA_TXDIS		0x0009	/* 10G PMA/PMD transmit disable */
+#define MDIO_PMA_RXDET		0x000A	/* 10G PMA/PMD receive signal detect */
+#define MDIO_PMA_EXTABLE	0x000B	/* 10G PMA/PMD extended ability */
+#define MDIO_PKGID1		0x000E	/* Package identifier */
+#define MDIO_PKGID2		0x000F
+#define MDIO_AN_ADVERTISE	0x0010	/* AN advertising (base page) */
+#define MDIO_AN_LPA		0x0013	/* AN LP abilities (base page) */
+#define MDIO_PCS_EEE_ABLE	0x0014	/* EEE Capability register */
+#define MDIO_PCS_EEE_ABLE2	0x0015	/* EEE Capability register 2 */
+#define MDIO_PMA_NG_EXTABLE	0x0015	/* 2.5G/5G PMA/PMD extended ability */
+#define MDIO_PCS_EEE_WK_ERR	0x0016	/* EEE wake error counter */
+#define MDIO_PHYXS_LNSTAT	0x0018	/* PHY XGXS lane state */
+#define MDIO_AN_EEE_ADV		0x003C	/* EEE advertisement */
+#define MDIO_AN_EEE_LPABLE	0x003D	/* EEE link partner ability */
+#define MDIO_AN_EEE_ADV2	0x003E	/* EEE advertisement 2 */
+#define MDIO_AN_EEE_LPABLE2	0x003F	/* EEE link partner ability 2 */
+#define MDIO_AN_CTRL2		0x0040	/* AN THP bypass request control */
 
 /* Media-dependent registers. */
-#define MDIO_PMA_10GBT_SWAPPOL	130	/* 10GBASE-T pair swap & polarity */
-#define MDIO_PMA_10GBT_TXPWR	131	/* 10GBASE-T TX power control */
-#define MDIO_PMA_10GBT_SNR	133	/* 10GBASE-T SNR margin, lane A.
+#define MDIO_PMA_10GBT_SWAPPOL	0x0082	/* 10GBASE-T pair swap & polarity */
+#define MDIO_PMA_10GBT_TXPWR	0x0083	/* 10GBASE-T TX power control */
+#define MDIO_PMA_10GBT_SNR	0x0085	/* 10GBASE-T SNR margin, lane A.
 					 * Lanes B-D are numbered 134-136. */
-#define MDIO_PMA_10GBR_FSRT_CSR	147	/* 10GBASE-R fast retrain status and control */
-#define MDIO_PMA_10GBR_FECABLE	170	/* 10GBASE-R FEC ability */
-#define MDIO_PCS_10GBX_STAT1	24	/* 10GBASE-X PCS status 1 */
-#define MDIO_PCS_10GBRT_STAT1	32	/* 10GBASE-R/-T PCS status 1 */
-#define MDIO_PCS_10GBRT_STAT2	33	/* 10GBASE-R/-T PCS status 2 */
-#define MDIO_AN_10GBT_CTRL	32	/* 10GBASE-T auto-negotiation control */
-#define MDIO_AN_10GBT_STAT	33	/* 10GBASE-T auto-negotiation status */
-#define MDIO_B10L_PMA_CTRL	2294	/* 10BASE-T1L PMA control */
-#define MDIO_PMA_10T1L_STAT	2295	/* 10BASE-T1L PMA status */
-#define MDIO_PCS_10T1L_CTRL	2278	/* 10BASE-T1L PCS control */
-#define MDIO_PMA_PMD_BT1	18	/* BASE-T1 PMA/PMD extended ability */
-#define MDIO_AN_T1_CTRL		512	/* BASE-T1 AN control */
-#define MDIO_AN_T1_STAT		513	/* BASE-T1 AN status */
-#define MDIO_AN_T1_ADV_L	514	/* BASE-T1 AN advertisement register [15:0] */
-#define MDIO_AN_T1_ADV_M	515	/* BASE-T1 AN advertisement register [31:16] */
-#define MDIO_AN_T1_ADV_H	516	/* BASE-T1 AN advertisement register [47:32] */
-#define MDIO_AN_T1_LP_L		517	/* BASE-T1 AN LP Base Page ability register [15:0] */
-#define MDIO_AN_T1_LP_M		518	/* BASE-T1 AN LP Base Page ability register [31:16] */
-#define MDIO_AN_T1_LP_H		519	/* BASE-T1 AN LP Base Page ability register [47:32] */
-#define MDIO_AN_10BT1_AN_CTRL	526	/* 10BASE-T1 AN control register */
-#define MDIO_AN_10BT1_AN_STAT	527	/* 10BASE-T1 AN status register */
-#define MDIO_PMA_PMD_BT1_CTRL	2100	/* BASE-T1 PMA/PMD control register */
-#define MDIO_PCS_1000BT1_CTRL	2304	/* 1000BASE-T1 PCS control register */
-#define MDIO_PCS_1000BT1_STAT	2305	/* 1000BASE-T1 PCS status register */
+#define MDIO_PMA_10GBR_FSRT_CSR	0x0093	/* 10GBASE-R fast retrain status and control */
+#define MDIO_PMA_10GBR_FECABLE	0x00AA	/* 10GBASE-R FEC ability */
+#define MDIO_PCS_10GBX_STAT1	0x0018	/* 10GBASE-X PCS status 1 */
+#define MDIO_PCS_10GBRT_STAT1	0x0020	/* 10GBASE-R/-T PCS status 1 */
+#define MDIO_PCS_10GBRT_STAT2	0x0021	/* 10GBASE-R/-T PCS status 2 */
+#define MDIO_AN_10GBT_CTRL	0x0020	/* 10GBASE-T auto-negotiation control */
+#define MDIO_AN_10GBT_STAT	0x0021	/* 10GBASE-T auto-negotiation status */
+#define MDIO_B10L_PMA_CTRL	0x08F6	/* 10BASE-T1L PMA control */
+#define MDIO_PMA_10T1L_STAT	0x08F7	/* 10BASE-T1L PMA status */
+#define MDIO_PCS_10T1L_CTRL	0x08E6	/* 10BASE-T1L PCS control */
+#define MDIO_PMA_PMD_BT1	0x0012	/* BASE-T1 PMA/PMD extended ability */
+#define MDIO_AN_T1_CTRL		0x0200	/* BASE-T1 AN control */
+#define MDIO_AN_T1_STAT		0x0201	/* BASE-T1 AN status */
+#define MDIO_AN_T1_ADV_L	0x0202	/* BASE-T1 AN advertisement register [15:0] */
+#define MDIO_AN_T1_ADV_M	0x0203	/* BASE-T1 AN advertisement register [31:16] */
+#define MDIO_AN_T1_ADV_H	0x0204	/* BASE-T1 AN advertisement register [47:32] */
+#define MDIO_AN_T1_LP_L		0x0205	/* BASE-T1 AN LP Base Page ability register [15:0] */
+#define MDIO_AN_T1_LP_M		0x0206	/* BASE-T1 AN LP Base Page ability register [31:16] */
+#define MDIO_AN_T1_LP_H		0x0207	/* BASE-T1 AN LP Base Page ability register [47:32] */
+#define MDIO_AN_10BT1_AN_CTRL	0x020E	/* 10BASE-T1 AN control register */
+#define MDIO_AN_10BT1_AN_STAT	0x020F	/* 10BASE-T1 AN status register */
+#define MDIO_PMA_PMD_BT1_CTRL	0x0834	/* BASE-T1 PMA/PMD control register */
+#define MDIO_PCS_1000BT1_CTRL	0x0900	/* 1000BASE-T1 PCS control register */
+#define MDIO_PCS_1000BT1_STAT	0x0901	/* 1000BASE-T1 PCS status register */
 
 /* LASI (Link Alarm Status Interrupt) registers, defined by XENPAK MSA. */
 #define MDIO_PMA_LASI_RXCTRL	0x9000	/* RX_ALARM control */
-- 
2.25.1

Re: [PATCH net-next] net: phy: Modify register address from decimal to hexadecimal

[Russell King (Oracle)]

On Wed, Aug 28, 2024 at 08:59:32PM +0800, Yajun Deng wrote:
> Most datasheets will use hexadecimal for register address, modify it
> and make it fit the datasheet better.

NAK. IEEE 802.3 uses decimal.

-- 
*** please note that I probably will only be occasionally responsive
*** for an unknown period of time due to recent eye surgery making
*** reading quite difficult.

RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!

Re: [PATCH net-next] net: phy: Modify register address from decimal to hexadecimal

[Andrew Lunn]

On Wed, Aug 28, 2024 at 08:59:32PM +0800, Yajun Deng wrote:
> Most datasheets will use hexadecimal for register address, modify it
> and make it fit the datasheet better.

802.3 uses decimal. Since these are all 802.3 registers, that is what
you should mostly be looking at. You only need the datasheet when the
device breaks the standard.

This is just pointless churn, so NACK.

In a driver, when there are proprietary registers, feel free to use
hex.

	Andrew