94
94
#define RTL_VND2_PHYSR_MASTER BIT(11)
95
95
#define RTL_VND2_PHYSR_SPEED_MASK (RTL_VND2_PHYSR_SPEEDL | RTL_VND2_PHYSR_SPEEDH)
96
96
97
+ #define RTL_MDIO_PCS_EEE_ABLE 0xa5c4
98
+ #define RTL_MDIO_AN_EEE_ADV 0xa5d0
99
+ #define RTL_MDIO_AN_EEE_LPABLE 0xa5d2
100
+ #define RTL_MDIO_AN_10GBT_CTRL 0xa5d4
101
+ #define RTL_MDIO_AN_10GBT_STAT 0xa5d6
102
+ #define RTL_MDIO_PMA_SPEED 0xa616
103
+ #define RTL_MDIO_AN_EEE_LPABLE2 0xa6d0
104
+ #define RTL_MDIO_AN_EEE_ADV2 0xa6d4
105
+ #define RTL_MDIO_PCS_EEE_ABLE2 0xa6ec
106
+
97
107
#define RTL_GENERIC_PHYID 0x001cc800
98
108
#define RTL_8211FVD_PHYID 0x001cc878
99
109
#define RTL_8221B 0x001cc840
@@ -751,11 +761,11 @@ static int rtlgen_read_mmd(struct phy_device *phydev, int devnum, u16 regnum)
751
761
if (devnum == MDIO_MMD_VEND2 )
752
762
ret = rtlgen_read_vend2 (phydev , regnum );
753
763
else if (devnum == MDIO_MMD_PCS && regnum == MDIO_PCS_EEE_ABLE )
754
- ret = rtlgen_read_vend2 (phydev , 0xa5c4 );
764
+ ret = rtlgen_read_vend2 (phydev , RTL_MDIO_PCS_EEE_ABLE );
755
765
else if (devnum == MDIO_MMD_AN && regnum == MDIO_AN_EEE_ADV )
756
- ret = rtlgen_read_vend2 (phydev , 0xa5d0 );
766
+ ret = rtlgen_read_vend2 (phydev , RTL_MDIO_AN_EEE_ADV );
757
767
else if (devnum == MDIO_MMD_AN && regnum == MDIO_AN_EEE_LPABLE )
758
- ret = rtlgen_read_vend2 (phydev , 0xa5d2 );
768
+ ret = rtlgen_read_vend2 (phydev , RTL_MDIO_AN_EEE_LPABLE );
759
769
else
760
770
ret = - EOPNOTSUPP ;
761
771
@@ -770,7 +780,7 @@ static int rtlgen_write_mmd(struct phy_device *phydev, int devnum, u16 regnum,
770
780
if (devnum == MDIO_MMD_VEND2 )
771
781
ret = rtlgen_write_vend2 (phydev , regnum , val );
772
782
else if (devnum == MDIO_MMD_AN && regnum == MDIO_AN_EEE_ADV )
773
- ret = rtlgen_write_vend2 (phydev , regnum , 0xa5d0 );
783
+ ret = rtlgen_write_vend2 (phydev , regnum , RTL_MDIO_AN_EEE_ADV );
774
784
else
775
785
ret = - EOPNOTSUPP ;
776
786
@@ -785,11 +795,11 @@ static int rtl822x_read_mmd(struct phy_device *phydev, int devnum, u16 regnum)
785
795
return ret ;
786
796
787
797
if (devnum == MDIO_MMD_PCS && regnum == MDIO_PCS_EEE_ABLE2 )
788
- ret = rtlgen_read_vend2 (phydev , 0xa6ec );
798
+ ret = rtlgen_read_vend2 (phydev , RTL_MDIO_PCS_EEE_ABLE2 );
789
799
else if (devnum == MDIO_MMD_AN && regnum == MDIO_AN_EEE_ADV2 )
790
- ret = rtlgen_read_vend2 (phydev , 0xa6d4 );
800
+ ret = rtlgen_read_vend2 (phydev , RTL_MDIO_AN_EEE_ADV2 );
791
801
else if (devnum == MDIO_MMD_AN && regnum == MDIO_AN_EEE_LPABLE2 )
792
- ret = rtlgen_read_vend2 (phydev , 0xa6d0 );
802
+ ret = rtlgen_read_vend2 (phydev , RTL_MDIO_AN_EEE_LPABLE2 );
793
803
794
804
return ret ;
795
805
}
@@ -803,7 +813,7 @@ static int rtl822x_write_mmd(struct phy_device *phydev, int devnum, u16 regnum,
803
813
return ret ;
804
814
805
815
if (devnum == MDIO_MMD_AN && regnum == MDIO_AN_EEE_ADV2 )
806
- ret = rtlgen_write_vend2 (phydev , 0xa6d4 , val );
816
+ ret = rtlgen_write_vend2 (phydev , RTL_MDIO_AN_EEE_ADV2 , val );
807
817
808
818
return ret ;
809
819
}
@@ -899,7 +909,7 @@ static int rtl822x_get_features(struct phy_device *phydev)
899
909
{
900
910
int val ;
901
911
902
- val = phy_read_mmd (phydev , MDIO_MMD_VEND2 , 0xa616 );
912
+ val = phy_read_mmd (phydev , MDIO_MMD_VEND2 , RTL_MDIO_PMA_SPEED );
903
913
if (val < 0 )
904
914
return val ;
905
915
@@ -920,7 +930,8 @@ static int rtl822x_config_aneg(struct phy_device *phydev)
920
930
if (phydev -> autoneg == AUTONEG_ENABLE ) {
921
931
u16 adv = linkmode_adv_to_mii_10gbt_adv_t (phydev -> advertising );
922
932
923
- ret = phy_modify_mmd_changed (phydev , MDIO_MMD_VEND2 , 0xa5d4 ,
933
+ ret = phy_modify_mmd_changed (phydev , MDIO_MMD_VEND2 ,
934
+ RTL_MDIO_AN_10GBT_CTRL ,
924
935
MDIO_AN_10GBT_CTRL_ADV2_5G |
925
936
MDIO_AN_10GBT_CTRL_ADV5G , adv );
926
937
if (ret < 0 )
@@ -966,7 +977,7 @@ static int rtl822x_read_status(struct phy_device *phydev)
966
977
!phydev -> autoneg_complete )
967
978
return 0 ;
968
979
969
- lpadv = phy_read_mmd (phydev , MDIO_MMD_VEND2 , 0xa5d6 );
980
+ lpadv = phy_read_mmd (phydev , MDIO_MMD_VEND2 , RTL_MDIO_AN_10GBT_STAT );
970
981
if (lpadv < 0 )
971
982
return lpadv ;
972
983
0 commit comments