Skip to content

Commit 7a1e66e

Browse files
jonasjelonekhauke
authored andcommitted
realtek: pcs: rtl931x: improve CMU page mapping
Improve the RTL931x mapper to infer the CMU page from the hardware mode by replace unneeded with useful comments, returning a better error code and dropping irrelevant parts. Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com> Link: openwrt/openwrt#22198 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
1 parent 7c7bdd8 commit 7a1e66e

1 file changed

Lines changed: 16 additions & 13 deletions

File tree

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

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3427,21 +3427,24 @@ static int rtpcs_931x_sds_cmu_page_get(enum rtpcs_sds_mode hw_mode)
34273427
{
34283428
switch (hw_mode) {
34293429
case RTPCS_SDS_MODE_SGMII:
3430-
case RTPCS_SDS_MODE_1000BASEX: /* MII_1000BX_FIBER / 100BX_FIBER / 1000BX100BX_AUTO */
3431-
return 0x24;
3432-
case RTPCS_SDS_MODE_2500BASEX: /* MII_2500Base_X: */
3433-
return 0x28;
3434-
/* case MII_HISGMII_5G: */
3435-
/* return 0x2a; */
3430+
case RTPCS_SDS_MODE_1000BASEX:
3431+
return 0x24; /* ANA_1G */
3432+
case RTPCS_SDS_MODE_2500BASEX:
3433+
return 0x28; /* ANA_3G */
34363434
case RTPCS_SDS_MODE_QSGMII:
3437-
return 0x2a; /* Code also has 0x34 */
3438-
/* case MII_RXAUI_LITE: */
3439-
/* return 0x2c; */
3440-
case RTPCS_SDS_MODE_XSGMII: /* MII_XSGMII */
3441-
case RTPCS_SDS_MODE_10GBASER: /* MII_10GR */
3442-
return 0x2e;
3435+
return 0x2a; /* ANA_5G/6G */
3436+
// return 0x34;
3437+
case RTPCS_SDS_MODE_XSGMII:
3438+
case RTPCS_SDS_MODE_USXGMII_10GSXGMII:
3439+
case RTPCS_SDS_MODE_USXGMII_10GDXGMII:
3440+
case RTPCS_SDS_MODE_USXGMII_10GQXGMII:
3441+
case RTPCS_SDS_MODE_USXGMII_5GSXGMII:
3442+
case RTPCS_SDS_MODE_USXGMII_5GDXGMII:
3443+
case RTPCS_SDS_MODE_USXGMII_2_5GSXGMII:
3444+
case RTPCS_SDS_MODE_10GBASER:
3445+
return 0x2e; /* ANA_10G */
34433446
default:
3444-
return -EINVAL;
3447+
return -ENOTSUPP;
34453448
}
34463449
}
34473450

0 commit comments

Comments
 (0)