[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <1527d8b6-6976-e37e-746f-88ea0f8f7688@ti.com>
Date: Thu, 13 May 2021 13:25:49 +0530
From: Kishon Vijay Abraham I <kishon@...com>
To: Swapnil Jakhade <sjakhade@...ence.com>, <vkoul@...nel.org>,
<p.zabel@...gutronix.de>, <linux-phy@...ts.infradead.org>,
<linux-kernel@...r.kernel.org>
CC: <mparab@...ence.com>, <lokeshvutla@...com>
Subject: Re: [PATCH 14/14] phy: cadence-torrent: Check PIPE mode PHY status to
be ready for operation
Hi Swapnil,
On 09/04/21 11:04 am, Swapnil Jakhade wrote:
> PIPE PHY status is used to communicate the completion of several PHY
> functions. Check if PHY is ready for operation while configured for
> PIPE mode during startup.
>
> Signed-off-by: Swapnil Jakhade <sjakhade@...ence.com>
> ---
> drivers/phy/cadence/phy-cadence-torrent.c | 60 +++++++++++++++++++++++
> 1 file changed, 60 insertions(+)
>
> diff --git a/drivers/phy/cadence/phy-cadence-torrent.c b/drivers/phy/cadence/phy-cadence-torrent.c
> index 39145e56e061..42a1bdfd18d5 100644
> --- a/drivers/phy/cadence/phy-cadence-torrent.c
> +++ b/drivers/phy/cadence/phy-cadence-torrent.c
> @@ -51,6 +51,10 @@
> #define TORRENT_PHY_PCS_COMMON_OFFSET(block_offset) \
> (0xC000 << (block_offset))
>
> +#define TORRENT_PHY_PCS_LANE_CDB_OFFSET(ln, block_offset, reg_offset) \
> + ((0xD000 << (block_offset)) + \
> + (((ln) << 9) << (reg_offset)))
> +
> #define TORRENT_PHY_PMA_COMMON_OFFSET(block_offset) \
> (0xE000 << (block_offset))
>
> @@ -218,6 +222,9 @@
> #define PHY_PIPE_USB3_GEN2_POST_CFG0 0x0022U
> #define PHY_PIPE_USB3_GEN2_POST_CFG1 0x0023U
>
> +/* PHY PCS lane registers */
> +#define PHY_PCS_ISO_LINK_CTRL 0x000BU
> +
> /* PHY PMA common registers */
> #define PHY_PMA_CMN_CTRL1 0x0000U
> #define PHY_PMA_CMN_CTRL2 0x0001U
> @@ -242,6 +249,9 @@ static const struct reg_field phy_pma_pll_raw_ctrl =
> static const struct reg_field phy_reset_ctrl =
> REG_FIELD(PHY_RESET, 8, 8);
>
> +static const struct reg_field phy_pcs_iso_link_ctrl_1 =
> + REG_FIELD(PHY_PCS_ISO_LINK_CTRL, 1, 1);
> +
> static const struct reg_field phy_pipe_cmn_ctrl1_0 = REG_FIELD(PHY_PIPE_CMN_CTRL1, 0, 0);
>
> #define REFCLK_OUT_NUM_CMN_CONFIG 5
> @@ -316,12 +326,14 @@ struct cdns_torrent_phy {
> struct regmap *regmap_phy_pma_common_cdb;
> struct regmap *regmap_tx_lane_cdb[MAX_NUM_LANES];
> struct regmap *regmap_rx_lane_cdb[MAX_NUM_LANES];
> + struct regmap *regmap_phy_pcs_lane_cdb[MAX_NUM_LANES];
> struct regmap *regmap_dptx_phy_reg;
> struct regmap_field *phy_pll_cfg;
> struct regmap_field *phy_pma_cmn_ctrl_1;
> struct regmap_field *phy_pma_cmn_ctrl_2;
> struct regmap_field *phy_pma_pll_raw_ctrl;
> struct regmap_field *phy_reset_ctrl;
> + struct regmap_field *phy_pcs_iso_link_ctrl_1[MAX_NUM_LANES];
> struct clk *clks[CDNS_TORRENT_REFCLK_DRIVER + 1];
> struct clk_onecell_data clk_data;
> };
> @@ -456,6 +468,22 @@ static const struct regmap_config cdns_torrent_common_cdb_config = {
> .reg_read = cdns_regmap_read,
> };
>
> +#define TORRENT_PHY_PCS_LANE_CDB_REGMAP_CONF(n) \
> +{ \
> + .name = "torrent_phy_pcs_lane" n "_cdb", \
> + .reg_stride = 1, \
> + .fast_io = true, \
> + .reg_write = cdns_regmap_write, \
> + .reg_read = cdns_regmap_read, \
> +}
> +
> +static const struct regmap_config cdns_torrent_phy_pcs_lane_cdb_config[] = {
> + TORRENT_PHY_PCS_LANE_CDB_REGMAP_CONF("0"),
> + TORRENT_PHY_PCS_LANE_CDB_REGMAP_CONF("1"),
> + TORRENT_PHY_PCS_LANE_CDB_REGMAP_CONF("2"),
> + TORRENT_PHY_PCS_LANE_CDB_REGMAP_CONF("3"),
> +};
> +
> static const struct regmap_config cdns_torrent_phy_pcs_cmn_cdb_config = {
> .name = "torrent_phy_pcs_cmn_cdb",
> .reg_stride = 1,
> @@ -1546,6 +1574,16 @@ static int cdns_torrent_phy_on(struct phy *phy)
> return ret;
> }
>
> + if (inst->phy_type == TYPE_PCIE || inst->phy_type == TYPE_USB) {
> + ret = regmap_field_read_poll_timeout(cdns_phy->phy_pcs_iso_link_ctrl_1[inst->mlane],
> + read_val, !read_val, 1000,
> + PLL_LOCK_TIMEOUT);
> + if (ret == -ETIMEDOUT) {
> + dev_err(cdns_phy->dev, "Timeout waiting for PHY status ready\n");
> + return ret;
> + }
> + }
> +
> mdelay(10);
With the above polling, this mdelay() shouldn't be required.
Thanks
Kishon
Powered by blists - more mailing lists