phy: cadence: Sierra: Prepare driver to add support for multilink configurations

Sierra driver currently supports single link configurations only. Prepare
driver to support multilink multiprotocol configurations along with
different SSC modes.

Signed-off-by: Swapnil Jakhade <sjakhade@cadence.com>
Reviewed-by: Aswath Govindraju <a-govindraju@ti.com>
Link: https://lore.kernel.org/r/20211223060137.9252-3-sjakhade@cadence.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/phy/cadence/phy-cadence-sierra.c b/drivers/phy/cadence/phy-cadence-sierra.c
index 54d1c63932ac67db1051015a0baa7e1465b5918e..c82ac6716f5e6941ee0dc86a2edeaff4b9354642 100644 (file)
--- a/drivers/phy/cadence/phy-cadence-sierra.c
+++ b/drivers/phy/cadence/phy-cadence-sierra.c
@@ -23,6 +23,9 @@
 #include <dt-bindings/phy/phy.h>
 #include <dt-bindings/phy/phy-cadence.h>
 
+#define NUM_SSC_MODE           3
+#define NUM_PHY_TYPE           3
+
 /* PHY register offsets */
 #define SIERRA_COMMON_CDB_OFFSET                       0x0
 #define SIERRA_MACRO_ID_REG                            0x0
@@ -217,9 +220,21 @@ static const int pll_mux_parent_index[][SIERRA_NUM_CMN_PLLC_PARENTS] = {
 
 static u32 cdns_sierra_pll_mux_table[] = { 0, 1 };
 
+enum cdns_sierra_phy_type {
+       TYPE_NONE,
+       TYPE_PCIE,
+       TYPE_USB
+};
+
+enum cdns_sierra_ssc_mode {
+       NO_SSC,
+       EXTERNAL_SSC,
+       INTERNAL_SSC
+};
+
 struct cdns_sierra_inst {
        struct phy *phy;
-       u32 phy_type;
+       enum cdns_sierra_phy_type phy_type;
        u32 num_lanes;
        u32 mlane;
        struct reset_control *lnk_rst;
@@ -230,18 +245,19 @@ struct cdns_reg_pairs {
        u32 off;
 };
 
+struct cdns_sierra_vals {
+       const struct cdns_reg_pairs *reg_pairs;
+       u32 num_regs;
+};
+
 struct cdns_sierra_data {
-               u32 id_value;
-               u8 block_offset_shift;
-               u8 reg_offset_shift;
-               u32 pcie_cmn_regs;
-               u32 pcie_ln_regs;
-               u32 usb_cmn_regs;
-               u32 usb_ln_regs;
-               const struct cdns_reg_pairs *pcie_cmn_vals;
-               const struct cdns_reg_pairs *pcie_ln_vals;
-               const struct cdns_reg_pairs *usb_cmn_vals;
-               const struct cdns_reg_pairs *usb_ln_vals;
+       u32 id_value;
+       u8 block_offset_shift;
+       u8 reg_offset_shift;
+       struct cdns_sierra_vals *pma_cmn_vals[NUM_PHY_TYPE][NUM_PHY_TYPE]
+                                            [NUM_SSC_MODE];
+       struct cdns_sierra_vals *pma_ln_vals[NUM_PHY_TYPE][NUM_PHY_TYPE]
+                                           [NUM_SSC_MODE];
 };
 
 struct cdns_regmap_cdb_context {
@@ -341,10 +357,14 @@ static int cdns_sierra_phy_init(struct phy *gphy)
 {
        struct cdns_sierra_inst *ins = phy_get_drvdata(gphy);
        struct cdns_sierra_phy *phy = dev_get_drvdata(gphy->dev.parent);
+       const struct cdns_sierra_data *init_data = phy->init_data;
+       struct cdns_sierra_vals *pma_cmn_vals, *pma_ln_vals;
+       enum cdns_sierra_phy_type phy_type = ins->phy_type;
+       enum cdns_sierra_ssc_mode ssc = EXTERNAL_SSC;
+       const struct cdns_reg_pairs *reg_pairs;
        struct regmap *regmap;
+       u32 num_regs;
        int i, j;
-       const struct cdns_reg_pairs *cmn_vals, *ln_vals;
-       u32 num_cmn_regs, num_ln_regs;
 
        /* Initialise the PHY registers, unless auto configured */
        if (phy->autoconf)
@@ -352,28 +372,26 @@ static int cdns_sierra_phy_init(struct phy *gphy)
 
        clk_set_rate(phy->input_clks[CMN_REFCLK_DIG_DIV], 25000000);
        clk_set_rate(phy->input_clks[CMN_REFCLK1_DIG_DIV], 25000000);
-       if (ins->phy_type == PHY_TYPE_PCIE) {
-               num_cmn_regs = phy->init_data->pcie_cmn_regs;
-               num_ln_regs = phy->init_data->pcie_ln_regs;
-               cmn_vals = phy->init_data->pcie_cmn_vals;
-               ln_vals = phy->init_data->pcie_ln_vals;
-       } else if (ins->phy_type == PHY_TYPE_USB3) {
-               num_cmn_regs = phy->init_data->usb_cmn_regs;
-               num_ln_regs = phy->init_data->usb_ln_regs;
-               cmn_vals = phy->init_data->usb_cmn_vals;
-               ln_vals = phy->init_data->usb_ln_vals;
-       } else {
-               return -EINVAL;
-       }
 
-       regmap = phy->regmap_common_cdb;
-       for (j = 0; j < num_cmn_regs ; j++)
-               regmap_write(regmap, cmn_vals[j].off, cmn_vals[j].val);
+       /* PMA common registers configurations */
+       pma_cmn_vals = init_data->pma_cmn_vals[phy_type][TYPE_NONE][ssc];
+       if (pma_cmn_vals) {
+               reg_pairs = pma_cmn_vals->reg_pairs;
+               num_regs = pma_cmn_vals->num_regs;
+               regmap = phy->regmap_common_cdb;
+               for (i = 0; i < num_regs; i++)
+                       regmap_write(regmap, reg_pairs[i].off, reg_pairs[i].val);
+       }
 
-       for (i = 0; i < ins->num_lanes; i++) {
-               for (j = 0; j < num_ln_regs ; j++) {
+       /* PMA lane registers configurations */
+       pma_ln_vals = init_data->pma_ln_vals[phy_type][TYPE_NONE][ssc];
+       if (pma_ln_vals) {
+               reg_pairs = pma_ln_vals->reg_pairs;
+               num_regs = pma_ln_vals->num_regs;
+               for (i = 0; i < ins->num_lanes; i++) {
                        regmap = phy->regmap_lane_cdb[i + ins->mlane];
-                       regmap_write(regmap, ln_vals[j].off, ln_vals[j].val);
+                       for (j = 0; j < num_regs; j++)
+                               regmap_write(regmap, reg_pairs[j].off, reg_pairs[j].val);
                }
        }
 
@@ -583,15 +601,28 @@ static int cdns_sierra_clk_register(struct cdns_sierra_phy *sp)
 static int cdns_sierra_get_optional(struct cdns_sierra_inst *inst,
                                    struct device_node *child)
 {
+       u32 phy_type;
+
        if (of_property_read_u32(child, "reg", &inst->mlane))
                return -EINVAL;
 
        if (of_property_read_u32(child, "cdns,num-lanes", &inst->num_lanes))
                return -EINVAL;
 
-       if (of_property_read_u32(child, "cdns,phy-type", &inst->phy_type))
+       if (of_property_read_u32(child, "cdns,phy-type", &phy_type))
                return -EINVAL;
 
+       switch (phy_type) {
+       case PHY_TYPE_PCIE:
+               inst->phy_type = TYPE_PCIE;
+               break;
+       case PHY_TYPE_USB3:
+               inst->phy_type = TYPE_USB;
+               break;
+       default:
+               return -EINVAL;
+       }
+
        return 0;
 }
 
@@ -1006,6 +1037,16 @@ static const struct cdns_reg_pairs cdns_pcie_ln_regs_ext_ssc[] = {
        {0x44CC, SIERRA_CREQ_EQ_OPEN_EYE_THRESH_PREG}
 };
 
+static struct cdns_sierra_vals pcie_100_ext_ssc_cmn_vals = {
+       .reg_pairs = cdns_pcie_cmn_regs_ext_ssc,
+       .num_regs = ARRAY_SIZE(cdns_pcie_cmn_regs_ext_ssc),
+};
+
+static struct cdns_sierra_vals pcie_100_ext_ssc_ln_vals = {
+       .reg_pairs = cdns_pcie_ln_regs_ext_ssc,
+       .num_regs = ARRAY_SIZE(cdns_pcie_ln_regs_ext_ssc),
+};
+
 /* refclk100MHz_20b_USB_cmn_pll_ext_ssc */
 static const struct cdns_reg_pairs cdns_usb_cmn_regs_ext_ssc[] = {
        {0x2085, SIERRA_CMN_PLLLC_LF_COEFF_MODE1_PREG},
@@ -1113,32 +1154,74 @@ static const struct cdns_reg_pairs cdns_usb_ln_regs_ext_ssc[] = {
        {0x4243, SIERRA_RXBUFFER_DFECTRL_PREG}
 };
 
+static struct cdns_sierra_vals usb_100_ext_ssc_cmn_vals = {
+       .reg_pairs = cdns_usb_cmn_regs_ext_ssc,
+       .num_regs = ARRAY_SIZE(cdns_usb_cmn_regs_ext_ssc),
+};
+
+static struct cdns_sierra_vals usb_100_ext_ssc_ln_vals = {
+       .reg_pairs = cdns_usb_ln_regs_ext_ssc,
+       .num_regs = ARRAY_SIZE(cdns_usb_ln_regs_ext_ssc),
+};
+
 static const struct cdns_sierra_data cdns_map_sierra = {
-       SIERRA_MACRO_ID,
-       0x2,
-       0x2,
-       ARRAY_SIZE(cdns_pcie_cmn_regs_ext_ssc),
-       ARRAY_SIZE(cdns_pcie_ln_regs_ext_ssc),
-       ARRAY_SIZE(cdns_usb_cmn_regs_ext_ssc),
-       ARRAY_SIZE(cdns_usb_ln_regs_ext_ssc),
-       cdns_pcie_cmn_regs_ext_ssc,
-       cdns_pcie_ln_regs_ext_ssc,
-       cdns_usb_cmn_regs_ext_ssc,
-       cdns_usb_ln_regs_ext_ssc,
+       .id_value = SIERRA_MACRO_ID,
+       .block_offset_shift = 0x2,
+       .reg_offset_shift = 0x2,
+       .pma_cmn_vals = {
+               [TYPE_PCIE] = {
+                       [TYPE_NONE] = {
+                               [EXTERNAL_SSC] = &pcie_100_ext_ssc_cmn_vals,
+                       },
+               },
+               [TYPE_USB] = {
+                       [TYPE_NONE] = {
+                               [EXTERNAL_SSC] = &usb_100_ext_ssc_cmn_vals,
+                       },
+               },
+       },
+       .pma_ln_vals = {
+               [TYPE_PCIE] = {
+                       [TYPE_NONE] = {
+                               [EXTERNAL_SSC] = &pcie_100_ext_ssc_ln_vals,
+                       },
+               },
+               [TYPE_USB] = {
+                       [TYPE_NONE] = {
+                               [EXTERNAL_SSC] = &usb_100_ext_ssc_ln_vals,
+                       },
+               },
+       },
 };
 
 static const struct cdns_sierra_data cdns_ti_map_sierra = {
-       SIERRA_MACRO_ID,
-       0x0,
-       0x1,
-       ARRAY_SIZE(cdns_pcie_cmn_regs_ext_ssc),
-       ARRAY_SIZE(cdns_pcie_ln_regs_ext_ssc),
-       ARRAY_SIZE(cdns_usb_cmn_regs_ext_ssc),
-       ARRAY_SIZE(cdns_usb_ln_regs_ext_ssc),
-       cdns_pcie_cmn_regs_ext_ssc,
-       cdns_pcie_ln_regs_ext_ssc,
-       cdns_usb_cmn_regs_ext_ssc,
-       cdns_usb_ln_regs_ext_ssc,
+       .id_value = SIERRA_MACRO_ID,
+       .block_offset_shift = 0x0,
+       .reg_offset_shift = 0x1,
+       .pma_cmn_vals = {
+               [TYPE_PCIE] = {
+                       [TYPE_NONE] = {
+                               [EXTERNAL_SSC] = &pcie_100_ext_ssc_cmn_vals,
+                       },
+               },
+               [TYPE_USB] = {
+                       [TYPE_NONE] = {
+                               [EXTERNAL_SSC] = &usb_100_ext_ssc_cmn_vals,
+                       },
+               },
+       },
+       .pma_ln_vals = {
+               [TYPE_PCIE] = {
+                       [TYPE_NONE] = {
+                               [EXTERNAL_SSC] = &pcie_100_ext_ssc_ln_vals,
+                       },
+               },
+               [TYPE_USB] = {
+                       [TYPE_NONE] = {
+                               [EXTERNAL_SSC] = &usb_100_ext_ssc_ln_vals,
+                       },
+               },
+       },
 };
 
 static const struct of_device_id cdns_sierra_id_table[] = {