catspeed-cc/openwrt
2
1
Fork 0
Code Issues Pull Requests Activity

realtek: pcs: rtl930x: improve error propagation

Browse Source 
Previous changes refactored the hardware mode configuration for RTL930x
a lot. Now that this is in a better shape, one issue persists: missing
error propagation. Only parts of this function really propagate an
error, others are silently dropped. While this is a known driver-wide
issue, at least make it good here. Propagate the errors from functions
which apply configuration sequences to the caller.

Single writes are still left out on purpose, they need and will be
addressed later.

Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/22582
Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
Jonas Jelonek 2026-03-25 13:51:09 +01:00 committed by Robert Marko
parent 6425d0f0c6
commit 9c4c83d331
1 changed files with 49 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2815,6 +2815,7 @@ static int rtpcs_930x_sds_config_hw_mode(struct rtpcs_serdes *sds, enum rtpcs_sd
int (*apply_fn)(struct rtpcs_serdes *, const struct rtpcs_sds_config *, size_t);
bool is_xsgmii = (hw_mode == RTPCS_SDS_MODE_XSGMII);
bool is_even_sds = (sds == rtpcs_sds_get_even(sds));
int ret;
apply_fn = is_xsgmii ? rtpcs_sds_apply_config_xsg : rtpcs_sds_apply_config;
@ -2840,13 +2841,18 @@ static int rtpcs_930x_sds_config_hw_mode(struct rtpcs_serdes *sds, enum rtpcs_sd
}
}
apply_fn(sds, rtpcs_930x_sds_cfg_ana_com, ARRAY_SIZE(rtpcs_930x_sds_cfg_ana_com));
ret = apply_fn(sds, rtpcs_930x_sds_cfg_ana_com, ARRAY_SIZE(rtpcs_930x_sds_cfg_ana_com));
if (ret < 0)
return ret;
switch (hw_mode) {
case RTPCS_SDS_MODE_1000BASEX:
case RTPCS_SDS_MODE_SGMII:
rtpcs_sds_apply_config(sds, rtpcs_930x_sds_cfg_ana_1g,
ARRAY_SIZE(rtpcs_930x_sds_cfg_ana_1g));
ret = rtpcs_sds_apply_config(sds, rtpcs_930x_sds_cfg_ana_1g,
ARRAY_SIZE(rtpcs_930x_sds_cfg_ana_1g));
if (ret < 0)
return ret;
break;
case RTPCS_SDS_MODE_10GBASER:
@ -2859,29 +2865,48 @@ static int rtpcs_930x_sds_config_hw_mode(struct rtpcs_serdes *sds, enum rtpcs_sd
* we switch the mode on demand so might only need to apply one sequence
* at a time.
*/
rtpcs_sds_apply_config(sds, rtpcs_930x_sds_cfg_ana_1g,
ARRAY_SIZE(rtpcs_930x_sds_cfg_ana_1g));
rtpcs_sds_apply_config(sds, rtpcs_930x_sds_cfg_ana_3g,
ARRAY_SIZE(rtpcs_930x_sds_cfg_ana_3g));
rtpcs_sds_apply_config(sds, rtpcs_930x_sds_cfg_ana_10g,
ARRAY_SIZE(rtpcs_930x_sds_cfg_ana_10g));
ret = rtpcs_sds_apply_config(sds, rtpcs_930x_sds_cfg_ana_1g,
ARRAY_SIZE(rtpcs_930x_sds_cfg_ana_1g));
if (ret < 0)
return ret;
ret = rtpcs_sds_apply_config(sds, rtpcs_930x_sds_cfg_ana_3g,
ARRAY_SIZE(rtpcs_930x_sds_cfg_ana_3g));
if (ret < 0)
return ret;
ret = rtpcs_sds_apply_config(sds, rtpcs_930x_sds_cfg_ana_10g,
ARRAY_SIZE(rtpcs_930x_sds_cfg_ana_10g));
if (ret < 0)
return ret;
rtpcs_sds_write(sds, 0x2F, 0x14, 0xE008);
break;
case RTPCS_SDS_MODE_2500BASEX:
rtpcs_sds_apply_config(sds, rtpcs_930x_sds_cfg_ana_1g,
ARRAY_SIZE(rtpcs_930x_sds_cfg_ana_1g));
rtpcs_sds_apply_config(sds, rtpcs_930x_sds_cfg_ana_3g,
ARRAY_SIZE(rtpcs_930x_sds_cfg_ana_3g));
ret = rtpcs_sds_apply_config(sds, rtpcs_930x_sds_cfg_ana_1g,
ARRAY_SIZE(rtpcs_930x_sds_cfg_ana_1g));
if (ret < 0)
return ret;
ret = rtpcs_sds_apply_config(sds, rtpcs_930x_sds_cfg_ana_3g,
ARRAY_SIZE(rtpcs_930x_sds_cfg_ana_3g));
if (ret < 0)
return ret;
break;
case RTPCS_SDS_MODE_XSGMII:
case RTPCS_SDS_MODE_USXGMII_10GSXGMII:
apply_fn(sds, rtpcs_930x_sds_cfg_ana_10g,
ARRAY_SIZE(rtpcs_930x_sds_cfg_ana_10g));
apply_fn(sds, rtpcs_930x_sds_cfg_usxgmii_xsgmii,
ARRAY_SIZE(rtpcs_930x_sds_cfg_usxgmii_xsgmii));
ret = apply_fn(sds, rtpcs_930x_sds_cfg_ana_10g,
ARRAY_SIZE(rtpcs_930x_sds_cfg_ana_10g));
if (ret < 0)
return ret;
ret = apply_fn(sds, rtpcs_930x_sds_cfg_usxgmii_xsgmii,
ARRAY_SIZE(rtpcs_930x_sds_cfg_usxgmii_xsgmii));
if (ret < 0)
return ret;
if (hw_mode == RTPCS_SDS_MODE_USXGMII_10GSXGMII)
/* opcode 0x03: standard/generic USXGMII mode */
@ -2893,11 +2918,14 @@ static int rtpcs_930x_sds_config_hw_mode(struct rtpcs_serdes *sds, enum rtpcs_sd
}
if (is_even_sds)
apply_fn(sds, rtpcs_930x_sds_cfg_final_even,
ARRAY_SIZE(rtpcs_930x_sds_cfg_final_even));
ret = apply_fn(sds, rtpcs_930x_sds_cfg_final_even,
ARRAY_SIZE(rtpcs_930x_sds_cfg_final_even));
else
apply_fn(sds, rtpcs_930x_sds_cfg_final_odd,
ARRAY_SIZE(rtpcs_930x_sds_cfg_final_odd));
ret = apply_fn(sds, rtpcs_930x_sds_cfg_final_odd,
ARRAY_SIZE(rtpcs_930x_sds_cfg_final_odd));
if (ret < 0)
return ret;
if (hw_mode == RTPCS_SDS_MODE_10GBASER && is_even_sds)
rtpcs_sds_write(sds, 0x2F, 0x1D, 0x76E1);