From 7a1e66e7f1d07a4a5dae7e9f009fcb1b1c1e72e4 Mon Sep 17 00:00:00 2001 From: Jonas Jelonek Date: Tue, 24 Feb 2026 22:00:43 +0000 Subject: [PATCH] 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 Link: https://github.com/openwrt/openwrt/pull/22198 Signed-off-by: Hauke Mehrtens --- .../files-6.12/drivers/net/pcs/pcs-rtl-otto.c | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/target/linux/realtek/files-6.12/drivers/net/pcs/pcs-rtl-otto.c b/target/linux/realtek/files-6.12/drivers/net/pcs/pcs-rtl-otto.c index 198794f1fe..f93715a46d 100644 --- a/target/linux/realtek/files-6.12/drivers/net/pcs/pcs-rtl-otto.c +++ b/target/linux/realtek/files-6.12/drivers/net/pcs/pcs-rtl-otto.c @@ -3427,21 +3427,24 @@ static int rtpcs_931x_sds_cmu_page_get(enum rtpcs_sds_mode hw_mode) { switch (hw_mode) { case RTPCS_SDS_MODE_SGMII: - case RTPCS_SDS_MODE_1000BASEX: /* MII_1000BX_FIBER / 100BX_FIBER / 1000BX100BX_AUTO */ - return 0x24; - case RTPCS_SDS_MODE_2500BASEX: /* MII_2500Base_X: */ - return 0x28; -/* case MII_HISGMII_5G: */ -/* return 0x2a; */ + case RTPCS_SDS_MODE_1000BASEX: + return 0x24; /* ANA_1G */ + case RTPCS_SDS_MODE_2500BASEX: + return 0x28; /* ANA_3G */ case RTPCS_SDS_MODE_QSGMII: - return 0x2a; /* Code also has 0x34 */ -/* case MII_RXAUI_LITE: */ -/* return 0x2c; */ - case RTPCS_SDS_MODE_XSGMII: /* MII_XSGMII */ - case RTPCS_SDS_MODE_10GBASER: /* MII_10GR */ - return 0x2e; + return 0x2a; /* ANA_5G/6G */ + // return 0x34; + case RTPCS_SDS_MODE_XSGMII: + case RTPCS_SDS_MODE_USXGMII_10GSXGMII: + case RTPCS_SDS_MODE_USXGMII_10GDXGMII: + case RTPCS_SDS_MODE_USXGMII_10GQXGMII: + case RTPCS_SDS_MODE_USXGMII_5GSXGMII: + case RTPCS_SDS_MODE_USXGMII_5GDXGMII: + case RTPCS_SDS_MODE_USXGMII_2_5GSXGMII: + case RTPCS_SDS_MODE_10GBASER: + return 0x2e; /* ANA_10G */ default: - return -EINVAL; + return -ENOTSUPP; } }