]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
phy: ti-pipe3: improve DPLL stability for SATA & USB
authorRoger Quadros <rogerq@ti.com>
Wed, 6 Nov 2019 14:21:17 +0000 (16:21 +0200)
committerTom Rini <trini@konsulko.com>
Thu, 26 Dec 2019 14:06:54 +0000 (09:06 -0500)
For increased DPLL stability use the settings recommended in
the TRM [1] for PHY_RX registers for SATA and USB.

For SATA we need to use spread spectrum settings even
though we don't have spread spectrum enabled. The
suggested non-spread spectrum settings don't work.

[1] DRA75x, DRA74x TRM - http://www.ti.com/lit/ug/sprui30f/sprui30f.pdf

Signed-off-by: Roger Quadros <rogerq@ti.com>
drivers/phy/ti-pipe3-phy.c

index 935dc7afb672377ccfc44108b32bc0a317688b1e..b9c85914701e7af81fc16e45ccd52f21d2af2017 100644 (file)
 #define OMAP_CTRL_PIPE3_PHY_TX_RX_POWERON       0x3
 #define OMAP_CTRL_PIPE3_PHY_TX_RX_POWEROFF      0x0
 
+/* PHY RX Registers */
+#define PIPE3_PHY_RX_ANA_PROGRAMMABILITY       0x0000000C
+#define INTERFACE_MASK                 GENMASK(31, 27)
+#define INTERFACE_SHIFT                        27
+#define INTERFACE_MODE_USBSS           BIT(4)
+#define INTERFACE_MODE_SATA_1P5                BIT(3)
+#define INTERFACE_MODE_SATA_3P0                BIT(2)
+#define INTERFACE_MODE_PCIE            BIT(0)
+
+#define LOSD_MASK                      GENMASK(17, 14)
+#define LOSD_SHIFT                     14
+#define MEM_PLLDIV                     GENMASK(6, 5)
+
+#define PIPE3_PHY_RX_TRIM              0x0000001C
+#define MEM_DLL_TRIM_SEL_MASK          GENMASK(31, 30)
+#define MEM_DLL_TRIM_SHIFT             30
+
+#define PIPE3_PHY_RX_DLL               0x00000024
+#define MEM_DLL_PHINT_RATE_MASK                GENMASK(31, 30)
+#define MEM_DLL_PHINT_RATE_SHIFT       30
+
+#define PIPE3_PHY_RX_DIGITAL_MODES             0x00000028
+#define MEM_HS_RATE_MASK               GENMASK(28, 27)
+#define MEM_HS_RATE_SHIFT              27
+#define MEM_OVRD_HS_RATE               BIT(26)
+#define MEM_OVRD_HS_RATE_SHIFT         26
+#define MEM_CDR_FASTLOCK               BIT(23)
+#define MEM_CDR_FASTLOCK_SHIFT         23
+#define MEM_CDR_LBW_MASK               GENMASK(22, 21)
+#define MEM_CDR_LBW_SHIFT              21
+#define MEM_CDR_STEPCNT_MASK           GENMASK(20, 19)
+#define MEM_CDR_STEPCNT_SHIFT          19
+#define MEM_CDR_STL_MASK               GENMASK(18, 16)
+#define MEM_CDR_STL_SHIFT              16
+#define MEM_CDR_THR_MASK               GENMASK(15, 13)
+#define MEM_CDR_THR_SHIFT              13
+#define MEM_CDR_THR_MODE               BIT(12)
+#define MEM_CDR_THR_MODE_SHIFT         12
+#define MEM_CDR_2NDO_SDM_MODE          BIT(11)
+#define MEM_CDR_2NDO_SDM_MODE_SHIFT    11
+
+#define PIPE3_PHY_RX_EQUALIZER         0x00000038
+#define MEM_EQLEV_MASK                 GENMASK(31, 16)
+#define MEM_EQLEV_SHIFT                        16
+#define MEM_EQFTC_MASK                 GENMASK(15, 11)
+#define MEM_EQFTC_SHIFT                        11
+#define MEM_EQCTL_MASK                 GENMASK(10, 7)
+#define MEM_EQCTL_SHIFT                        7
+#define MEM_OVRD_EQLEV                 BIT(2)
+#define MEM_OVRD_EQLEV_SHIFT           2
+#define MEM_OVRD_EQFTC                 BIT(1)
+#define MEM_OVRD_EQFTC_SHIFT           1
+
+#define SATA_PHY_RX_IO_AND_A2D_OVERRIDES       0x44
+#define MEM_CDR_LOS_SOURCE_MASK                GENMASK(10, 9)
+#define MEM_CDR_LOS_SOURCE_SHIFT       9
 
 #define PLL_IDLE_TIME   100     /* in milliseconds */
 #define PLL_LOCK_TIME   100     /* in milliseconds */
@@ -58,12 +114,35 @@ enum pipe3_mode { PIPE3_MODE_PCIE = 1,
                  PIPE3_MODE_SATA,
                  PIPE3_MODE_USBSS };
 
+struct pipe3_settings {
+       u8 ana_interface;
+       u8 ana_losd;
+       u8 dig_fastlock;
+       u8 dig_lbw;
+       u8 dig_stepcnt;
+       u8 dig_stl;
+       u8 dig_thr;
+       u8 dig_thr_mode;
+       u8 dig_2ndo_sdm_mode;
+       u8 dig_hs_rate;
+       u8 dig_ovrd_hs_rate;
+       u8 dll_trim_sel;
+       u8 dll_phint_rate;
+       u8 eq_lev;
+       u8 eq_ftc;
+       u8 eq_ctl;
+       u8 eq_ovrd_lev;
+       u8 eq_ovrd_ftc;
+};
+
 struct omap_pipe3 {
        void __iomem            *pll_ctrl_base;
+       void __iomem            *phy_rx;
        void __iomem            *power_reg;
        void __iomem            *pll_reset_reg;
        struct pipe3_dpll_map   *dpll_map;
        enum pipe3_mode         mode;
+       struct pipe3_settings   settings;
 };
 
 struct pipe3_dpll_params {
@@ -82,6 +161,7 @@ struct pipe3_dpll_map {
 struct pipe3_data {
        enum pipe3_mode mode;
        struct pipe3_dpll_map *dpll_map;
+       struct pipe3_settings settings;
 };
 
 static inline u32 omap_pipe3_readl(void __iomem *addr, unsigned offset)
@@ -199,6 +279,60 @@ static void omap_control_pipe3_power(struct omap_pipe3 *pipe3, int on)
        writel(val, pipe3->power_reg);
 }
 
+static void ti_pipe3_calibrate(struct omap_pipe3 *phy)
+{
+       u32 val;
+       struct pipe3_settings *s = &phy->settings;
+
+       val = omap_pipe3_readl(phy->phy_rx, PIPE3_PHY_RX_ANA_PROGRAMMABILITY);
+       val &= ~(INTERFACE_MASK | LOSD_MASK | MEM_PLLDIV);
+       val = (s->ana_interface << INTERFACE_SHIFT | s->ana_losd << LOSD_SHIFT);
+       omap_pipe3_writel(phy->phy_rx, PIPE3_PHY_RX_ANA_PROGRAMMABILITY, val);
+
+       val = omap_pipe3_readl(phy->phy_rx, PIPE3_PHY_RX_DIGITAL_MODES);
+       val &= ~(MEM_HS_RATE_MASK | MEM_OVRD_HS_RATE | MEM_CDR_FASTLOCK |
+                MEM_CDR_LBW_MASK | MEM_CDR_STEPCNT_MASK | MEM_CDR_STL_MASK |
+                MEM_CDR_THR_MASK | MEM_CDR_THR_MODE | MEM_CDR_2NDO_SDM_MODE);
+       val |= s->dig_hs_rate << MEM_HS_RATE_SHIFT |
+               s->dig_ovrd_hs_rate << MEM_OVRD_HS_RATE_SHIFT |
+               s->dig_fastlock << MEM_CDR_FASTLOCK_SHIFT |
+               s->dig_lbw << MEM_CDR_LBW_SHIFT |
+               s->dig_stepcnt << MEM_CDR_STEPCNT_SHIFT |
+               s->dig_stl << MEM_CDR_STL_SHIFT |
+               s->dig_thr << MEM_CDR_THR_SHIFT |
+               s->dig_thr_mode << MEM_CDR_THR_MODE_SHIFT |
+               s->dig_2ndo_sdm_mode << MEM_CDR_2NDO_SDM_MODE_SHIFT;
+       omap_pipe3_writel(phy->phy_rx, PIPE3_PHY_RX_DIGITAL_MODES, val);
+
+       val = omap_pipe3_readl(phy->phy_rx, PIPE3_PHY_RX_TRIM);
+       val &= ~MEM_DLL_TRIM_SEL_MASK;
+       val |= s->dll_trim_sel << MEM_DLL_TRIM_SHIFT;
+       omap_pipe3_writel(phy->phy_rx, PIPE3_PHY_RX_TRIM, val);
+
+       val = omap_pipe3_readl(phy->phy_rx, PIPE3_PHY_RX_DLL);
+       val &= ~MEM_DLL_PHINT_RATE_MASK;
+       val |= s->dll_phint_rate << MEM_DLL_PHINT_RATE_SHIFT;
+       omap_pipe3_writel(phy->phy_rx, PIPE3_PHY_RX_DLL, val);
+
+       val = omap_pipe3_readl(phy->phy_rx, PIPE3_PHY_RX_EQUALIZER);
+       val &= ~(MEM_EQLEV_MASK | MEM_EQFTC_MASK | MEM_EQCTL_MASK |
+                MEM_OVRD_EQLEV | MEM_OVRD_EQFTC);
+       val |= s->eq_lev << MEM_EQLEV_SHIFT |
+               s->eq_ftc << MEM_EQFTC_SHIFT |
+               s->eq_ctl << MEM_EQCTL_SHIFT |
+               s->eq_ovrd_lev << MEM_OVRD_EQLEV_SHIFT |
+               s->eq_ovrd_ftc << MEM_OVRD_EQFTC_SHIFT;
+       omap_pipe3_writel(phy->phy_rx, PIPE3_PHY_RX_EQUALIZER, val);
+
+       if (phy->mode == PIPE3_MODE_SATA) {
+               val = omap_pipe3_readl(phy->phy_rx,
+                                      SATA_PHY_RX_IO_AND_A2D_OVERRIDES);
+               val &= ~MEM_CDR_LOS_SOURCE_MASK;
+               omap_pipe3_writel(phy->phy_rx, SATA_PHY_RX_IO_AND_A2D_OVERRIDES,
+                                 val);
+       }
+}
+
 static int pipe3_init(struct phy *phy)
 {
        int ret;
@@ -211,6 +345,8 @@ static int pipe3_init(struct phy *phy)
                ret = omap_pipe3_dpll_program(pipe3);
                if (ret)
                        return ret;
+
+               ti_pipe3_calibrate(pipe3);
        } else {
                /* else just bring it out of IDLE mode */
                val = omap_pipe3_readl(pipe3->pll_ctrl_base,
@@ -328,6 +464,20 @@ static int pipe3_phy_probe(struct udevice *dev)
        struct omap_pipe3 *pipe3 = dev_get_priv(dev);
        struct pipe3_data *data;
 
+       /* PHY_RX */
+       addr = devfdt_get_addr_size_index(dev, 0, &sz);
+       if (addr == FDT_ADDR_T_NONE) {
+               pr_err("missing phy_rx address\n");
+               return -EINVAL;
+       }
+
+       pipe3->phy_rx = map_physmem(addr, sz, MAP_NOCACHE);
+       if (!pipe3->phy_rx) {
+               pr_err("unable to remap phy_rx\n");
+               return -EINVAL;
+       }
+
+       /* PLLCTRL */
        addr = devfdt_get_addr_size_index(dev, 2, &sz);
        if (addr == FDT_ADDR_T_NONE) {
                pr_err("missing pll ctrl address\n");
@@ -347,6 +497,7 @@ static int pipe3_phy_probe(struct udevice *dev)
        data = (struct pipe3_data *)dev_get_driver_data(dev);
        pipe3->mode = data->mode;
        pipe3->dpll_map = data->dpll_map;
+       pipe3->settings = data->settings;
 
        if (pipe3->mode == PIPE3_MODE_SATA) {
                pipe3->pll_reset_reg = get_reg(dev, "syscon-pllreset");
@@ -380,11 +531,53 @@ static struct pipe3_dpll_map dpll_map_usb[] = {
 static struct pipe3_data data_usb = {
        .mode = PIPE3_MODE_USBSS,
        .dpll_map = dpll_map_usb,
+       .settings = {
+       /* DRA75x TRM Table 26-17. Preferred USB3_PHY_RX SCP Register Settings */
+               .ana_interface = INTERFACE_MODE_USBSS,
+               .ana_losd = 0xa,
+               .dig_fastlock = 1,
+               .dig_lbw = 3,
+               .dig_stepcnt = 0,
+               .dig_stl = 0x3,
+               .dig_thr = 1,
+               .dig_thr_mode = 1,
+               .dig_2ndo_sdm_mode = 0,
+               .dig_hs_rate = 0,
+               .dig_ovrd_hs_rate = 1,
+               .dll_trim_sel = 0x2,
+               .dll_phint_rate = 0x3,
+               .eq_lev = 0,
+               .eq_ftc = 0,
+               .eq_ctl = 0x9,
+               .eq_ovrd_lev = 0,
+               .eq_ovrd_ftc = 0,
+       },
 };
 
 static struct pipe3_data data_sata = {
        .mode = PIPE3_MODE_SATA,
        .dpll_map = dpll_map_sata,
+       .settings = {
+       /* DRA75x TRM Table 26-9. Preferred SATA_PHY_RX SCP Register Settings */
+               .ana_interface = INTERFACE_MODE_SATA_3P0,
+               .ana_losd = 0x5,
+               .dig_fastlock = 1,
+               .dig_lbw = 3,
+               .dig_stepcnt = 0,
+               .dig_stl = 0x3,
+               .dig_thr = 1,
+               .dig_thr_mode = 1,
+               .dig_2ndo_sdm_mode = 0,
+               .dig_hs_rate = 0,       /* Not in TRM preferred settings */
+               .dig_ovrd_hs_rate = 0,  /* Not in TRM preferred settings */
+               .dll_trim_sel = 0x1,
+               .dll_phint_rate = 0x2,  /* for 1.5 GHz DPLL clock */
+               .eq_lev = 0,
+               .eq_ftc = 0x1f,
+               .eq_ctl = 0,
+               .eq_ovrd_lev = 1,
+               .eq_ovrd_ftc = 1,
+       },
 };
 
 static const struct udevice_id pipe3_phy_ids[] = {