realtek: pcs: move mode mapping to generic pcs_config

All variant-specific setup_serdes functions currently make equal use of
the mapping from the interface mode to the hardware mode. To reduce
redundancy, move this mapping to the generic pcs_config, from where the
setup_serdes implementations are called.

This includes slightly changing the setup_serdes signature and some
debug messages.

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

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 24b94a4952a3bbecd1e2649fc4cecedb1843f8cb..0628a8d4a04b3447afdf63f2596fea14b232c611 100644 (file)
--- 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
@@ -207,7 +207,7 @@ struct rtpcs_config {
        const struct rtpcs_serdes_ops *sds_ops;
        int (*init_serdes_common)(struct rtpcs_ctrl *ctrl);
        int (*set_autoneg)(struct rtpcs_serdes *sds, unsigned int neg_mode);
-       int (*setup_serdes)(struct rtpcs_serdes *sds, phy_interface_t mode);
+       int (*setup_serdes)(struct rtpcs_serdes *sds, enum rtpcs_sds_mode hw_mode);
 };
 
 struct rtpcs_sds_config {
@@ -688,15 +688,10 @@ static int rtpcs_838x_init_serdes_common(struct rtpcs_ctrl *ctrl)
 }
 
 static int rtpcs_838x_setup_serdes(struct rtpcs_serdes *sds,
-                                  phy_interface_t mode)
+                                  enum rtpcs_sds_mode hw_mode)
 {
-       enum rtpcs_sds_mode hw_mode;
        int ret;
 
-       ret = rtpcs_sds_determine_hw_mode(sds, mode, &hw_mode);
-       if (ret < 0)
-               return -ENOTSUPP;
-
        if (!rtpcs_838x_sds_is_hw_mode_supported(sds, hw_mode))
                return -ENOTSUPP;
 
@@ -927,9 +922,8 @@ static int rtpcs_839x_init_serdes_common(struct rtpcs_ctrl *ctrl)
 }
 
 static int rtpcs_839x_setup_serdes(struct rtpcs_serdes *sds,
-                                  phy_interface_t if_mode)
+                                  enum rtpcs_sds_mode hw_mode)
 {
-       enum rtpcs_sds_mode hw_mode;
        int ret;
 
        /* Don't touch 5G SerDes, they are already properly configured
@@ -939,10 +933,6 @@ static int rtpcs_839x_setup_serdes(struct rtpcs_serdes *sds,
        if (sds->id != 8 && sds->id != 9 && sds->id != 12 && sds->id != 13)
                return 0;
 
-       ret = rtpcs_sds_determine_hw_mode(sds, if_mode, &hw_mode);
-       if (ret < 0)
-               return ret;
-
        ret = rtpcs_839x_sds_set_mode(sds, hw_mode);
        if (ret < 0)
                return ret;
@@ -2730,15 +2720,10 @@ static int rtpcs_930x_sds_cmu_band_get(struct rtpcs_serdes *sds)
 }
 
 static int rtpcs_930x_setup_serdes(struct rtpcs_serdes *sds,
-                                  phy_interface_t if_mode)
+                                  enum rtpcs_sds_mode hw_mode)
 {
-       enum rtpcs_sds_mode hw_mode;
        int calib_tries = 0, ret;
 
-       ret = rtpcs_sds_determine_hw_mode(sds, if_mode, &hw_mode);
-       if (ret < 0)
-               return -ENOTSUPP;
-
        /* Rely on setup from U-boot for some modes, e.g. USXGMII */
        switch (hw_mode) {
        case RTPCS_SDS_MODE_1000BASEX:
@@ -3507,7 +3492,7 @@ static int rtpcs_931x_sds_config_hw_mode(struct rtpcs_serdes *sds,
 }
 
 static int rtpcs_931x_setup_serdes(struct rtpcs_serdes *sds,
-                                  phy_interface_t mode)
+                                  enum rtpcs_sds_mode hw_mode)
 {
        u32 board_sds_tx_type1[] = {
                0x01c3, 0x01c3, 0x01c3, 0x01a3, 0x01a3, 0x01a3,
@@ -3523,18 +3508,10 @@ static int rtpcs_931x_setup_serdes(struct rtpcs_serdes *sds,
        };
        struct rtpcs_serdes *even_sds = rtpcs_sds_get_even(sds);
        struct rtpcs_ctrl *ctrl = sds->ctrl;
-       enum rtpcs_sds_mode hw_mode;
        u32 band, model_info, val;
        u32 sds_id = sds->id;
        int ret, chiptype = 0;
 
-       ret = rtpcs_sds_determine_hw_mode(sds, mode, &hw_mode);
-       if (ret < 0) {
-               dev_err(ctrl->dev, "SerDes %u doesn't support %s mode\n", sds_id,
-                       phy_modes(mode));
-               return -ENOTSUPP;
-       }
-
        /*
         * TODO: USXGMII is currently the swiss army knife to declare 10G
         * multi port PHYs. Real devices use other modes instead. Especially
@@ -3550,7 +3527,6 @@ static int rtpcs_931x_setup_serdes(struct rtpcs_serdes *sds,
            hw_mode == RTPCS_SDS_MODE_XSGMII)
                return 0;
 
-       pr_info("%s: set sds %d to mode %d\n", __func__, sds_id, mode);
        val = rtpcs_sds_read_bits(sds, 0x1F, 0x9, 11, 6);
 
        pr_info("%s: fibermode %08X stored mode 0x%x", __func__,
@@ -3714,25 +3690,35 @@ static int rtpcs_pcs_config(struct phylink_pcs *pcs, unsigned int neg_mode,
 {
        struct rtpcs_link *link = rtpcs_phylink_pcs_to_link(pcs);
        struct rtpcs_ctrl *ctrl = link->ctrl;
-       int ret = 0;
+       struct rtpcs_serdes *sds = link->sds;
+       enum rtpcs_sds_mode hw_mode;
+       int ret;
+
+       ret = rtpcs_sds_determine_hw_mode(sds, interface, &hw_mode);
+       if (ret < 0) {
+               dev_err(ctrl->dev, "SerDes %u doesn't support %s mode\n", sds->id,
+                       phy_modes(interface));
+               return -ENOTSUPP;
+       }
 
-       dev_info(ctrl->dev, "configure SerDes %u for mode %s\n", link->sds->id,
+       dev_info(ctrl->dev, "configure SerDes %u for mode %s\n", sds->id,
                 phy_modes(interface));
 
        mutex_lock(&ctrl->lock);
 
        if (ctrl->cfg->setup_serdes) {
-               ret = ctrl->cfg->setup_serdes(link->sds, interface);
+               ret = ctrl->cfg->setup_serdes(sds, hw_mode);
                if (ret < 0)
                        goto out;
        }
 
        if (ctrl->cfg->set_autoneg) {
-               ret = ctrl->cfg->set_autoneg(link->sds, neg_mode);
+               ret = ctrl->cfg->set_autoneg(sds, neg_mode);
                if (ret < 0)
                        goto out;
        }
 
+       ret = 0;
 out:
        mutex_unlock(&ctrl->lock);