Skip to content

Commit 03002d4

Browse files
jonasjelonekrobimarko
authored andcommitted
realtek: pcs: rtl930x: enable USXGMII-QX configuration
The RTL8224 driver now puts the PHY into the proper mode, but the SerDes side is still missing. It was deactivated due to a known regression. Thus, allow USXGMII-QX configuration since both sides should be properly configured now. Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com> Link: openwrt#22609 Signed-off-by: Robert Marko <robimarko@gmail.com>
1 parent 3e42e34 commit 03002d4

1 file changed

Lines changed: 2 additions & 5 deletions

File tree

target/linux/realtek/files-6.18/drivers/net/pcs/pcs-rtl-otto.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2814,10 +2814,6 @@ static int rtpcs_930x_sds_config_hw_mode(struct rtpcs_serdes *sds, enum rtpcs_sd
28142814

28152815
apply_fn = is_xsgmii ? rtpcs_sds_apply_config_xsg : rtpcs_sds_apply_config;
28162816

2817-
/* USXGMII-QX broken, rely on bootloader setup */
2818-
if (hw_mode == RTPCS_SDS_MODE_USXGMII_10GQXGMII)
2819-
return 0;
2820-
28212817
if (hw_mode == RTPCS_SDS_MODE_QSGMII) {
28222818
if (sds->id >= 2)
28232819
return -ENOTSUPP;
@@ -2893,6 +2889,7 @@ static int rtpcs_930x_sds_config_hw_mode(struct rtpcs_serdes *sds, enum rtpcs_sd
28932889

28942890
case RTPCS_SDS_MODE_XSGMII:
28952891
case RTPCS_SDS_MODE_USXGMII_10GSXGMII:
2892+
case RTPCS_SDS_MODE_USXGMII_10GQXGMII:
28962893
ret = apply_fn(sds, rtpcs_930x_sds_cfg_ana_10g,
28972894
ARRAY_SIZE(rtpcs_930x_sds_cfg_ana_10g));
28982895
if (ret < 0)
@@ -2903,7 +2900,7 @@ static int rtpcs_930x_sds_config_hw_mode(struct rtpcs_serdes *sds, enum rtpcs_sd
29032900
if (ret < 0)
29042901
return ret;
29052902

2906-
if (hw_mode == RTPCS_SDS_MODE_USXGMII_10GSXGMII)
2903+
if (!is_xsgmii)
29072904
/* opcode 0x03: standard/generic USXGMII mode */
29082905
rtpcs_930x_sds_usxgmii_config(sds, true, 0x03, 0xa4, 0, 1, 0x1);
29092906
break;

0 commit comments

Comments
 (0)