From: Jonas Jelonek <jelonek.jonas@gmail.com>
Date: Sun, 5 Jul 2026 10:42:35 +0000 (+0000)
Subject: realtek: pcs: rtl930x: cleanup VTH helpers
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=75de4464faece5bc210b2e524423fa8cf92f1123;p=thirdparty%2Fopenwrt.git

realtek: pcs: rtl930x: cleanup VTH helpers

Split vth_manual() into vth_set_adapt() and vth_set_value(), separating
mode control from value writes, consistent with DCVS and LEQ helpers.
Rename vth_get() to match and switch from an array parameter to
individual pointers. Invert the manual boolean to 'enable' (true means
auto-adapt is running). Add error propagation throughout and demote the
read-out print from pr_info to pr_debug.

Remove the usleep from vth_set_adapt(enable=true). The only caller is
vth_tap0_adapt_lock which already has an explicit msleep(200) to wait
for adaptation to complete, making the embedded 10ms redundant. Delay
belongs at the call site, not baked into the setter.

Link: https://github.com/openwrt/openwrt/pull/24091
Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>
---

diff --git a/target/linux/realtek/files-6.18/drivers/net/pcs/pcs-rtl-otto.c b/target/linux/realtek/files-6.18/drivers/net/pcs/pcs-rtl-otto.c
index f0a2cf1b2a9..26633b62141 100644
--- a/target/linux/realtek/files-6.18/drivers/net/pcs/pcs-rtl-otto.c
+++ b/target/linux/realtek/files-6.18/drivers/net/pcs/pcs-rtl-otto.c
@@ -2183,36 +2183,53 @@ static int rtpcs_930x_sds_rxcal_leq_get_coef(struct rtpcs_serdes *sds)
 	return bin;
 }
 
-static void rtpcs_930x_sds_rxcal_vth_manual(struct rtpcs_serdes *sds,
-					    bool manual, u32 vth_list[])
+static int rtpcs_930x_sds_rxcal_vth_set_adapt(struct rtpcs_serdes *sds, bool enable)
 {
-	/* REG0_LOAD_IN_INIT, [13:13] = VTH */
-	rtpcs_sds_write_bits(sds, PAGE_ANA_10G, 0x0f, 13, 13, manual ? 0x1 : 0x0);
+	return rtpcs_sds_write_bits(sds, PAGE_ANA_10G, 0x0f, 13, 13, enable ? 0 : 1);
+}
 
-	if (manual) {
-		rtpcs_sds_write_bits(sds, PAGE_ANA_10G, 0x13,  5,  3, vth_list[0]);
-		rtpcs_sds_write_bits(sds, PAGE_ANA_10G, 0x13,  2,  0, vth_list[1]);
-	} else
-		mdelay(10);
+static int rtpcs_930x_sds_rxcal_vth_set_value(struct rtpcs_serdes *sds, unsigned int vth_p,
+					      unsigned int vth_n)
+{
+	int ret;
+
+	ret = rtpcs_sds_write_bits(sds, PAGE_ANA_10G, 0x13,  5,  3, vth_p);
+	if (ret < 0)
+		return ret;
+
+	ret = rtpcs_sds_write_bits(sds, PAGE_ANA_10G, 0x13,  2,  0, vth_n);
+	if (ret < 0)
+		return ret;
+
+	return 0;
 }
 
-static void rtpcs_930x_sds_rxcal_vth_get(struct rtpcs_serdes *sds,
-					 u32 vth_list[])
+static int rtpcs_930x_sds_rxcal_vth_get(struct rtpcs_serdes *sds, unsigned int *vth_p,
+					unsigned int *vth_n)
 {
-	int vth_manual;
+	int manual, ret, val;
 
-	rtpcs_930x_sds_set_debug(sds, 0x20);
-	rtpcs_sds_write_bits(sds, PAGE_ANA_10G_EXT, 0x0c, 5, 0, 0xc); /* COEF_SEL */
+	ret = rtpcs_930x_sds_set_debug(sds, 0x20);
+	if (ret < 0)
+		return ret;
 
+	ret = rtpcs_sds_write_bits(sds, PAGE_ANA_10G_EXT, 0x0c, 5, 0, 0xc); /* COEF_SEL */
+	if (ret < 0)
+		return ret;
 	mdelay(1);
 
 	/* ##VthP & VthN Read Out */
-	vth_list[0] = rtpcs_sds_read_bits(sds, PAGE_WDIG, 0x14, 2, 0); /* v_thp set bin */
-	vth_list[1] = rtpcs_sds_read_bits(sds, PAGE_WDIG, 0x14, 5, 3); /* v_thn set bin */
-	vth_manual = rtpcs_sds_read_bits(sds, PAGE_ANA_10G, 0x0f, 13, 13);
+	val = rtpcs_sds_read_bits(sds, PAGE_WDIG, 0x14, 5, 0);
+	if (val < 0)
+		return val;
 
-	pr_info("vthp_set_bin = %d, vthn_set_bin = %d, manual = %d\n", vth_list[0], vth_list[1],
-		vth_manual);
+	*vth_p = FIELD_GET(GENMASK(2, 0), val);
+	*vth_n = FIELD_GET(GENMASK(5, 3), val);
+	manual = rtpcs_sds_read_bits(sds, PAGE_ANA_10G, 0x0f, 13, 13);
+
+	pr_debug("vth_p = %d, vth_n = %d, manual = %d\n", *vth_p, *vth_n,
+		manual);
+	return 0;
 }
 
 static void rtpcs_930x_sds_rxcal_tap_manual(struct rtpcs_serdes *sds,
@@ -2524,17 +2541,19 @@ static void rtpcs_930x_sds_rxcal_leq_adapt_lock(struct rtpcs_serdes *sds)
 
 static void rtpcs_930x_sds_rxcal_vth_tap0_adapt_lock(struct rtpcs_serdes *sds)
 {
+	unsigned int vth_p, vth_n;
 	u32 tap0_list[4] = {0};
-	u32 vth_list[2] = {0};
 
 	/* run VTH/TAP auto-adapt */
-	rtpcs_930x_sds_rxcal_vth_manual(sds, false, vth_list);
+	rtpcs_930x_sds_rxcal_vth_set_adapt(sds, true);
 	rtpcs_930x_sds_rxcal_tap_manual(sds, 0, false, tap0_list);
 	mdelay(200);
 
 	/* manually set learned VTH */
-	rtpcs_930x_sds_rxcal_vth_get(sds, vth_list);
-	rtpcs_930x_sds_rxcal_vth_manual(sds, true, vth_list);
+	if (rtpcs_930x_sds_rxcal_vth_get(sds, &vth_p, &vth_n) < 0)
+		return;
+	rtpcs_930x_sds_rxcal_vth_set_value(sds, vth_p, vth_n);
+	rtpcs_930x_sds_rxcal_vth_set_adapt(sds, false);
 
 	mdelay(100);