]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
phy: marvell: cp110: let the firmware configure comphy for RXAUI
authorGrzegorz Jaszczyk <jaz@semihalf.com>
Tue, 27 Mar 2018 10:52:24 +0000 (12:52 +0200)
committerStefan Roese <sr@denx.de>
Thu, 29 Apr 2021 05:45:24 +0000 (07:45 +0200)
Replace the comphy initialization for RXAUI with appropriate SMC call,
so the firmware will execute required serdes configuration.

Change-Id: Iedae0285fb283e05bb263a8b4ce46e8e7451a309
Signed-off-by: Grzegorz Jaszczyk <jaz@semihalf.com>
Reviewed-by: Igal Liberman <igall@marvell.com>
drivers/phy/marvell/comphy_cp110.c

index 620a749bb1f89bc28eba41fdf49cbfc40cb75942..9f80a3fda4b1ebb2a509df7c4ed54c6e06240425 100644 (file)
@@ -559,184 +559,6 @@ static int comphy_sata_power_up(u32 lane, void __iomem *hpipe_base,
        return ret;
 }
 
-static int comphy_rxauii_power_up(u32 lane, void __iomem *hpipe_base,
-                                 void __iomem *comphy_base)
-{
-       u32 mask, data, ret = 1;
-       void __iomem *hpipe_addr = HPIPE_ADDR(hpipe_base, lane);
-       void __iomem *sd_ip_addr = SD_ADDR(hpipe_base, lane);
-       void __iomem *comphy_addr = COMPHY_ADDR(comphy_base, lane);
-       void __iomem *addr;
-
-       debug_enter();
-       debug("stage: RFU configurations - hard reset comphy\n");
-       /* RFU configurations - hard reset comphy */
-       mask = COMMON_PHY_CFG1_PWR_UP_MASK;
-       data = 0x1 << COMMON_PHY_CFG1_PWR_UP_OFFSET;
-       mask |= COMMON_PHY_CFG1_PIPE_SELECT_MASK;
-       data |= 0x0 << COMMON_PHY_CFG1_PIPE_SELECT_OFFSET;
-       reg_set(comphy_addr + COMMON_PHY_CFG1_REG, data, mask);
-
-       if (lane == 2) {
-               reg_set(comphy_base + COMMON_PHY_SD_CTRL1,
-                       0x1 << COMMON_PHY_SD_CTRL1_RXAUI0_OFFSET,
-                       COMMON_PHY_SD_CTRL1_RXAUI0_MASK);
-       }
-       if (lane == 4) {
-               reg_set(comphy_base + COMMON_PHY_SD_CTRL1,
-                       0x1 << COMMON_PHY_SD_CTRL1_RXAUI1_OFFSET,
-                       COMMON_PHY_SD_CTRL1_RXAUI1_MASK);
-       }
-
-       /* Select Baud Rate of Comphy And PD_PLL/Tx/Rx */
-       mask = SD_EXTERNAL_CONFIG0_SD_PU_PLL_MASK;
-       data = 0x0 << SD_EXTERNAL_CONFIG0_SD_PU_PLL_OFFSET;
-       mask |= SD_EXTERNAL_CONFIG0_SD_PHY_GEN_RX_MASK;
-       data |= 0xB << SD_EXTERNAL_CONFIG0_SD_PHY_GEN_RX_OFFSET;
-       mask |= SD_EXTERNAL_CONFIG0_SD_PHY_GEN_TX_MASK;
-       data |= 0xB << SD_EXTERNAL_CONFIG0_SD_PHY_GEN_TX_OFFSET;
-       mask |= SD_EXTERNAL_CONFIG0_SD_PU_RX_MASK;
-       data |= 0x0 << SD_EXTERNAL_CONFIG0_SD_PU_RX_OFFSET;
-       mask |= SD_EXTERNAL_CONFIG0_SD_PU_TX_MASK;
-       data |= 0x0 << SD_EXTERNAL_CONFIG0_SD_PU_TX_OFFSET;
-       mask |= SD_EXTERNAL_CONFIG0_HALF_BUS_MODE_MASK;
-       data |= 0x0 << SD_EXTERNAL_CONFIG0_HALF_BUS_MODE_OFFSET;
-       mask |= SD_EXTERNAL_CONFIG0_MEDIA_MODE_MASK;
-       data |= 0x1 << SD_EXTERNAL_CONFIG0_MEDIA_MODE_OFFSET;
-       reg_set(sd_ip_addr + SD_EXTERNAL_CONFIG0_REG, data, mask);
-
-       /* release from hard reset */
-       mask = SD_EXTERNAL_CONFIG1_RESET_IN_MASK;
-       data = 0x0 << SD_EXTERNAL_CONFIG1_RESET_IN_OFFSET;
-       mask |= SD_EXTERNAL_CONFIG1_RESET_CORE_MASK;
-       data |= 0x0 << SD_EXTERNAL_CONFIG1_RESET_CORE_OFFSET;
-       mask |= SD_EXTERNAL_CONFIG1_RF_RESET_IN_MASK;
-       data |= 0x0 << SD_EXTERNAL_CONFIG1_RF_RESET_IN_OFFSET;
-       reg_set(sd_ip_addr + SD_EXTERNAL_CONFIG1_REG, data, mask);
-
-       mask = SD_EXTERNAL_CONFIG1_RESET_IN_MASK;
-       data = 0x1 << SD_EXTERNAL_CONFIG1_RESET_IN_OFFSET;
-       mask |= SD_EXTERNAL_CONFIG1_RESET_CORE_MASK;
-       data |= 0x1 << SD_EXTERNAL_CONFIG1_RESET_CORE_OFFSET;
-       reg_set(sd_ip_addr + SD_EXTERNAL_CONFIG1_REG, data, mask);
-
-       /* Wait 1ms - until band gap and ref clock ready */
-       mdelay(1);
-
-       /* Start comphy Configuration */
-       debug("stage: Comphy configuration\n");
-       /* set reference clock */
-       reg_set(hpipe_addr + HPIPE_MISC_REG,
-               0x0 << HPIPE_MISC_REFCLK_SEL_OFFSET,
-               HPIPE_MISC_REFCLK_SEL_MASK);
-       /* Power and PLL Control */
-       mask = HPIPE_PWR_PLL_REF_FREQ_MASK;
-       data = 0x1 << HPIPE_PWR_PLL_REF_FREQ_OFFSET;
-       mask |= HPIPE_PWR_PLL_PHY_MODE_MASK;
-       data |= 0x4 << HPIPE_PWR_PLL_PHY_MODE_OFFSET;
-       reg_set(hpipe_addr + HPIPE_PWR_PLL_REG, data, mask);
-       /* Loopback register */
-       reg_set(hpipe_addr + HPIPE_LOOPBACK_REG,
-               0x1 << HPIPE_LOOPBACK_SEL_OFFSET, HPIPE_LOOPBACK_SEL_MASK);
-       /* rx control 1 */
-       mask = HPIPE_RX_CONTROL_1_RXCLK2X_SEL_MASK;
-       data = 0x1 << HPIPE_RX_CONTROL_1_RXCLK2X_SEL_OFFSET;
-       mask |= HPIPE_RX_CONTROL_1_CLK8T_EN_MASK;
-       data |= 0x1 << HPIPE_RX_CONTROL_1_CLK8T_EN_OFFSET;
-       reg_set(hpipe_addr + HPIPE_RX_CONTROL_1_REG, data, mask);
-       /* DTL Control */
-       reg_set(hpipe_addr + HPIPE_PWR_CTR_DTL_REG,
-               0x0 << HPIPE_PWR_CTR_DTL_FLOOP_EN_OFFSET,
-               HPIPE_PWR_CTR_DTL_FLOOP_EN_MASK);
-
-       /* Set analog paramters from ETP(HW) */
-       debug("stage: Analog paramters from ETP(HW)\n");
-       /* SERDES External Configuration 2 */
-       reg_set(sd_ip_addr + SD_EXTERNAL_CONFIG2_REG,
-               0x1 << SD_EXTERNAL_CONFIG2_PIN_DFE_EN_OFFSET,
-               SD_EXTERNAL_CONFIG2_PIN_DFE_EN_MASK);
-       /* 0x7-DFE Resolution control */
-       reg_set(hpipe_addr + HPIPE_DFE_REG0, 0x1 << HPIPE_DFE_RES_FORCE_OFFSET,
-               HPIPE_DFE_RES_FORCE_MASK);
-       /* 0xd-G1_Setting_0 */
-       reg_set(hpipe_addr + HPIPE_G1_SET_0_REG,
-               0xd << HPIPE_G1_SET_0_G1_TX_EMPH1_OFFSET,
-               HPIPE_G1_SET_0_G1_TX_EMPH1_MASK);
-       /* 0xE-G1_Setting_1 */
-       mask = HPIPE_G1_SET_1_G1_RX_SELMUPI_MASK;
-       data = 0x1 << HPIPE_G1_SET_1_G1_RX_SELMUPI_OFFSET;
-       mask |= HPIPE_G1_SET_1_G1_RX_SELMUPP_MASK;
-       data |= 0x1 << HPIPE_G1_SET_1_G1_RX_SELMUPP_OFFSET;
-       mask |= HPIPE_G1_SET_1_G1_RX_DFE_EN_MASK;
-       data |= 0x1 << HPIPE_G1_SET_1_G1_RX_DFE_EN_OFFSET;
-       reg_set(hpipe_addr + HPIPE_G1_SET_1_REG, data, mask);
-       /* 0xA-DFE_Reg3 */
-       mask = HPIPE_DFE_F3_F5_DFE_EN_MASK;
-       data = 0x0 << HPIPE_DFE_F3_F5_DFE_EN_OFFSET;
-       mask |= HPIPE_DFE_F3_F5_DFE_CTRL_MASK;
-       data |= 0x0 << HPIPE_DFE_F3_F5_DFE_CTRL_OFFSET;
-       reg_set(hpipe_addr + HPIPE_DFE_F3_F5_REG, data, mask);
-
-       /* 0x111-G1_Setting_4 */
-       mask = HPIPE_G1_SETTINGS_4_G1_DFE_RES_MASK;
-       data = 0x1 << HPIPE_G1_SETTINGS_4_G1_DFE_RES_OFFSET;
-       reg_set(hpipe_addr + HPIPE_G1_SETTINGS_4_REG, data, mask);
-
-       debug("stage: RFU configurations- Power Up PLL,Tx,Rx\n");
-       /* SERDES External Configuration */
-       mask = SD_EXTERNAL_CONFIG0_SD_PU_PLL_MASK;
-       data = 0x1 << SD_EXTERNAL_CONFIG0_SD_PU_PLL_OFFSET;
-       mask |= SD_EXTERNAL_CONFIG0_SD_PU_RX_MASK;
-       data |= 0x1 << SD_EXTERNAL_CONFIG0_SD_PU_RX_OFFSET;
-       mask |= SD_EXTERNAL_CONFIG0_SD_PU_TX_MASK;
-       data |= 0x1 << SD_EXTERNAL_CONFIG0_SD_PU_TX_OFFSET;
-       reg_set(sd_ip_addr + SD_EXTERNAL_CONFIG0_REG, data, mask);
-
-
-       /* check PLL rx & tx ready */
-       addr = sd_ip_addr + SD_EXTERNAL_STATUS0_REG;
-       data = SD_EXTERNAL_STATUS0_PLL_RX_MASK |
-               SD_EXTERNAL_STATUS0_PLL_TX_MASK;
-       mask = data;
-       data = polling_with_timeout(addr, data, mask, 15000);
-       if (data != 0) {
-               debug("Read from reg = %p - value = 0x%x\n",
-                     sd_ip_addr + SD_EXTERNAL_STATUS0_REG, data);
-               pr_err("SD_EXTERNAL_STATUS0_PLL_RX is %d, SD_EXTERNAL_STATUS0_PLL_TX is %d\n",
-                     (data & SD_EXTERNAL_STATUS0_PLL_RX_MASK),
-                     (data & SD_EXTERNAL_STATUS0_PLL_TX_MASK));
-               ret = 0;
-       }
-
-       /* RX init */
-       reg_set(sd_ip_addr + SD_EXTERNAL_CONFIG1_REG,
-               0x1 << SD_EXTERNAL_CONFIG1_RX_INIT_OFFSET,
-               SD_EXTERNAL_CONFIG1_RX_INIT_MASK);
-
-       /* check that RX init done */
-       addr = sd_ip_addr + SD_EXTERNAL_STATUS0_REG;
-       data = SD_EXTERNAL_STATUS0_RX_INIT_MASK;
-       mask = data;
-       data = polling_with_timeout(addr, data, mask, 100);
-       if (data != 0) {
-               debug("Read from reg = %p - value = 0x%x\n",
-                     sd_ip_addr + SD_EXTERNAL_STATUS0_REG, data);
-               pr_err("SD_EXTERNAL_STATUS0_RX_INIT is 0\n");
-               ret = 0;
-       }
-
-       debug("stage: RF Reset\n");
-       /* RF Reset */
-       mask =  SD_EXTERNAL_CONFIG1_RX_INIT_MASK;
-       data = 0x0 << SD_EXTERNAL_CONFIG1_RX_INIT_OFFSET;
-       mask |= SD_EXTERNAL_CONFIG1_RF_RESET_IN_MASK;
-       data |= 0x1 << SD_EXTERNAL_CONFIG1_RF_RESET_IN_OFFSET;
-       reg_set(sd_ip_addr + SD_EXTERNAL_CONFIG1_REG, data, mask);
-
-       debug_exit();
-       return ret;
-}
-
 static void comphy_utmi_power_down(u32 utmi_index, void __iomem *utmi_base_addr,
                                   void __iomem *usb_cfg_addr,
                                   void __iomem *utmi_cfg_addr,
@@ -1187,8 +1009,10 @@ int comphy_cp110_init(struct chip_serdes_phy_config *ptr_chip_cfg,
                        break;
                case COMPHY_TYPE_RXAUI0:
                case COMPHY_TYPE_RXAUI1:
-                       ret = comphy_rxauii_power_up(lane, hpipe_base_addr,
-                                                    comphy_base_addr);
+                       mode = COMPHY_FW_MODE_FORMAT(COMPHY_RXAUI_MODE);
+                       ret = comphy_smc(MV_SIP_COMPHY_POWER_ON,
+                                        ptr_chip_cfg->comphy_base_addr, lane,
+                                        mode);
                        break;
                default:
                        debug("Unknown SerDes type, skip initialize SerDes %d\n",