LinuxLists.cc - [PATCH 0/4] j721e-wiz/cadence-torrent: Support to skip SERDES configuration

2021-03-10 15:57:51

Subject: [PATCH 0/4] j721e-wiz/cadence-torrent: Support to skip SERDES configuration

Add support to skip SERDES configuration if it's already configured in
bootloader.

The wiz part was initially sent in [1] but that was sent more in the
context of Sierra but this is in context of Torrent. The Sierra part
would be sent later.

[1] -> http://lore.kernel.org/r/[email protected]

Faiz Abbas (1):
phy: ti: j721e-wiz: Do not configure wiz if its already configured

Kishon Vijay Abraham I (3):
phy: cadence-torrent: Group reset APIs and clock APIs
phy: cadence-torrent: Do not configure SERDES if it's already
configured
phy: cadence-torrent: Explicitly request exclusive reset control

drivers/phy/cadence/phy-cadence-torrent.c | 106 ++++++++++++++--------
drivers/phy/ti/phy-j721e-wiz.c | 21 ++++-
2 files changed, 86 insertions(+), 41 deletions(-)

--
2.17.1

2021-03-10 15:58:29

by Kishon Vijay Abraham I

[permalink] [raw]

Subject: [PATCH 3/4] phy: cadence-torrent: Do not configure SERDES if it's already configured

Do not configure torrent SERDES if it's already configured.

Signed-off-by: Kishon Vijay Abraham I <[email protected]>
---
drivers/phy/cadence/phy-cadence-torrent.c | 32 ++++++++++++++++-------
1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/drivers/phy/cadence/phy-cadence-torrent.c b/drivers/phy/cadence/phy-cadence-torrent.c
index ab51c4bf7b30..5ee1657f5a1c 100644
--- a/drivers/phy/cadence/phy-cadence-torrent.c
+++ b/drivers/phy/cadence/phy-cadence-torrent.c
@@ -371,6 +371,10 @@ static const struct phy_ops cdns_torrent_phy_ops = {
.owner = THIS_MODULE,
};

+static const struct phy_ops noop_ops = {
+ .owner = THIS_MODULE,
+};
+
struct cdns_reg_pairs {
u32 val;
u32 off;
@@ -2306,6 +2310,7 @@ static int cdns_torrent_phy_probe(struct platform_device *pdev)
struct device_node *child;
int ret, subnodes, node = 0, i;
u32 total_num_lanes = 0;
+ int already_configured;
u8 init_dp_regmap = 0;
u32 phy_type;

@@ -2344,16 +2349,20 @@ static int cdns_torrent_phy_probe(struct platform_device *pdev)
if (ret)
return ret;

- ret = cdns_torrent_reset(cdns_phy);
- if (ret)
- goto clk_cleanup;
+ regmap_field_read(cdns_phy->phy_pma_cmn_ctrl_1, &already_configured);

- ret = cdns_torrent_clk(cdns_phy);
- if (ret)
- goto clk_cleanup;
+ if (!already_configured) {
+ ret = cdns_torrent_reset(cdns_phy);
+ if (ret)
+ goto clk_cleanup;
+
+ ret = cdns_torrent_clk(cdns_phy);
+ if (ret)
+ goto clk_cleanup;

- /* Enable APB */
- reset_control_deassert(cdns_phy->apb_rst);
+ /* Enable APB */
+ reset_control_deassert(cdns_phy->apb_rst);
+ }

for_each_available_child_of_node(dev->of_node, child) {
struct phy *gphy;
@@ -2423,7 +2432,10 @@ static int cdns_torrent_phy_probe(struct platform_device *pdev)
of_property_read_u32(child, "cdns,ssc-mode",
&cdns_phy->phys[node].ssc_mode);

- gphy = devm_phy_create(dev, child, &cdns_torrent_phy_ops);
+ if (!already_configured)
+ gphy = devm_phy_create(dev, child, &cdns_torrent_phy_ops);
+ else
+ gphy = devm_phy_create(dev, child, &noop_ops);
if (IS_ERR(gphy)) {
ret = PTR_ERR(gphy);
goto put_child;
@@ -2507,7 +2519,7 @@ static int cdns_torrent_phy_probe(struct platform_device *pdev)
goto put_lnk_rst;
}

- if (cdns_phy->nsubnodes > 1) {
+ if (cdns_phy->nsubnodes > 1 && !already_configured) {
ret = cdns_torrent_phy_configure_multilink(cdns_phy);
if (ret)
goto put_lnk_rst;
--
2.17.1

2021-03-10 15:59:04

by Kishon Vijay Abraham I

[permalink] [raw]

Subject: [PATCH 4/4] phy: cadence-torrent: Explicitly request exclusive reset control

No functional change. Since the reset controls obtained in
Torrent is exclusively used by the Torrent device, use
exclusive reset control request API calls.

Signed-off-by: Kishon Vijay Abraham I <[email protected]>
---
drivers/phy/cadence/phy-cadence-torrent.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/phy/cadence/phy-cadence-torrent.c b/drivers/phy/cadence/phy-cadence-torrent.c
index 5ee1657f5a1c..ff8bb4b724c0 100644
--- a/drivers/phy/cadence/phy-cadence-torrent.c
+++ b/drivers/phy/cadence/phy-cadence-torrent.c
@@ -2264,7 +2264,7 @@ static int cdns_torrent_reset(struct cdns_torrent_phy *cdns_phy)
return PTR_ERR(cdns_phy->phy_rst);
}

- cdns_phy->apb_rst = devm_reset_control_get_optional(dev, "torrent_apb");
+ cdns_phy->apb_rst = devm_reset_control_get_optional_exclusive(dev, "torrent_apb");
if (IS_ERR(cdns_phy->apb_rst)) {
dev_err(dev, "%s: failed to get apb reset\n",
dev->of_node->full_name);
--
2.17.1

2021-03-18 09:59:47

by Swapnil Kashinath Jakhade

[permalink] [raw]

Subject: RE: [PATCH 3/4] phy: cadence-torrent: Do not configure SERDES if it's already configured

> -----Original Message-----
> From: Kishon Vijay Abraham I <[email protected]>
> Sent: Wednesday, March 10, 2021 9:25 PM
> To: Kishon Vijay Abraham I <[email protected]>; Vinod Koul
> <[email protected]>; Rob Herring <[email protected]>; Philipp Zabel
> <[email protected]>; Swapnil Kashinath Jakhade
> <[email protected]>
> Cc: [email protected]; [email protected]; Lokesh Vutla
> <[email protected]>; [email protected]
> Subject: [PATCH 3/4] phy: cadence-torrent: Do not configure SERDES if it's
> already configured
>
> EXTERNAL MAIL
>
>
> Do not configure torrent SERDES if it's already configured.
>
> Signed-off-by: Kishon Vijay Abraham I <[email protected]>
> ---
> drivers/phy/cadence/phy-cadence-torrent.c | 32 ++++++++++++++++-------
> 1 file changed, 22 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/phy/cadence/phy-cadence-torrent.c
> b/drivers/phy/cadence/phy-cadence-torrent.c
> index ab51c4bf7b30..5ee1657f5a1c 100644
> --- a/drivers/phy/cadence/phy-cadence-torrent.c
> +++ b/drivers/phy/cadence/phy-cadence-torrent.c
> @@ -371,6 +371,10 @@ static const struct phy_ops cdns_torrent_phy_ops =
> {
> .owner = THIS_MODULE,
> };
>
> +static const struct phy_ops noop_ops = {
> + .owner = THIS_MODULE,
> +};
> +
> struct cdns_reg_pairs {
> u32 val;
> u32 off;
> @@ -2306,6 +2310,7 @@ static int cdns_torrent_phy_probe(struct
> platform_device *pdev)
> struct device_node *child;
> int ret, subnodes, node = 0, i;
> u32 total_num_lanes = 0;
> + int already_configured;
> u8 init_dp_regmap = 0;
> u32 phy_type;
>
> @@ -2344,16 +2349,20 @@ static int cdns_torrent_phy_probe(struct
> platform_device *pdev)
> if (ret)
> return ret;
>
> - ret = cdns_torrent_reset(cdns_phy);
> - if (ret)
> - goto clk_cleanup;
> + regmap_field_read(cdns_phy->phy_pma_cmn_ctrl_1,
> &already_configured);
>
> - ret = cdns_torrent_clk(cdns_phy);
> - if (ret)
> - goto clk_cleanup;
> + if (!already_configured) {
> + ret = cdns_torrent_reset(cdns_phy);
> + if (ret)
> + goto clk_cleanup;
> +
> + ret = cdns_torrent_clk(cdns_phy);
> + if (ret)
> + goto clk_cleanup;
>
Should if (!already_configured) be checked while calling clk_disable_unprepare()?
Otherwise,
Reviewed-by: Swapnil Jakhade <[email protected]>

Thanks & regards,
Swapnil

> - /* Enable APB */
> - reset_control_deassert(cdns_phy->apb_rst);
> + /* Enable APB */
> + reset_control_deassert(cdns_phy->apb_rst);
> + }
>
> for_each_available_child_of_node(dev->of_node, child) {
> struct phy *gphy;
> @@ -2423,7 +2432,10 @@ static int cdns_torrent_phy_probe(struct
> platform_device *pdev)
> of_property_read_u32(child, "cdns,ssc-mode",
> &cdns_phy->phys[node].ssc_mode);
>
> - gphy = devm_phy_create(dev, child,
> &cdns_torrent_phy_ops);
> + if (!already_configured)
> + gphy = devm_phy_create(dev, child,
> &cdns_torrent_phy_ops);
> + else
> + gphy = devm_phy_create(dev, child, &noop_ops);
> if (IS_ERR(gphy)) {
> ret = PTR_ERR(gphy);
> goto put_child;
> @@ -2507,7 +2519,7 @@ static int cdns_torrent_phy_probe(struct
> platform_device *pdev)
> goto put_lnk_rst;
> }
>
> - if (cdns_phy->nsubnodes > 1) {
> + if (cdns_phy->nsubnodes > 1 && !already_configured) {
> ret = cdns_torrent_phy_configure_multilink(cdns_phy);
> if (ret)
> goto put_lnk_rst;
> --
> 2.17.1

2021-03-18 10:00:03

by Swapnil Kashinath Jakhade

[permalink] [raw]

Subject: RE: [PATCH 4/4] phy: cadence-torrent: Explicitly request exclusive reset control

2021-03-30 09:59:51

by Kishon Vijay Abraham I

[permalink] [raw]

Subject: Re: [PATCH 3/4] phy: cadence-torrent: Do not configure SERDES if it's already configured

Hi Swapnil,

On 18/03/21 3:25 pm, Swapnil Kashinath Jakhade wrote:
>
>
>> -----Original Message-----
>> From: Kishon Vijay Abraham I <[email protected]>
>> Sent: Wednesday, March 10, 2021 9:25 PM
>> To: Kishon Vijay Abraham I <[email protected]>; Vinod Koul
>> <[email protected]>; Rob Herring <[email protected]>; Philipp Zabel
>> <[email protected]>; Swapnil Kashinath Jakhade
>> <[email protected]>
>> Cc: [email protected]; [email protected]; Lokesh Vutla
>> <[email protected]>; [email protected]
>> Subject: [PATCH 3/4] phy: cadence-torrent: Do not configure SERDES if it's
>> already configured
>>
>> EXTERNAL MAIL
>>
>>
>> Do not configure torrent SERDES if it's already configured.
>>
>> Signed-off-by: Kishon Vijay Abraham I <[email protected]>
>> ---
>> drivers/phy/cadence/phy-cadence-torrent.c | 32 ++++++++++++++++-------
>> 1 file changed, 22 insertions(+), 10 deletions(-)
>>
>> diff --git a/drivers/phy/cadence/phy-cadence-torrent.c
>> b/drivers/phy/cadence/phy-cadence-torrent.c
>> index ab51c4bf7b30..5ee1657f5a1c 100644
>> --- a/drivers/phy/cadence/phy-cadence-torrent.c
>> +++ b/drivers/phy/cadence/phy-cadence-torrent.c
>> @@ -371,6 +371,10 @@ static const struct phy_ops cdns_torrent_phy_ops =
>> {
>> .owner = THIS_MODULE,
>> };
>>
>> +static const struct phy_ops noop_ops = {
>> + .owner = THIS_MODULE,
>> +};
>> +
>> struct cdns_reg_pairs {
>> u32 val;
>> u32 off;
>> @@ -2306,6 +2310,7 @@ static int cdns_torrent_phy_probe(struct
>> platform_device *pdev)
>> struct device_node *child;
>> int ret, subnodes, node = 0, i;
>> u32 total_num_lanes = 0;
>> + int already_configured;
>> u8 init_dp_regmap = 0;
>> u32 phy_type;
>>
>> @@ -2344,16 +2349,20 @@ static int cdns_torrent_phy_probe(struct
>> platform_device *pdev)
>> if (ret)
>> return ret;
>>
>> - ret = cdns_torrent_reset(cdns_phy);
>> - if (ret)
>> - goto clk_cleanup;
>> + regmap_field_read(cdns_phy->phy_pma_cmn_ctrl_1,
>> &already_configured);
>>
>> - ret = cdns_torrent_clk(cdns_phy);
>> - if (ret)
>> - goto clk_cleanup;
>> + if (!already_configured) {
>> + ret = cdns_torrent_reset(cdns_phy);
>> + if (ret)
>> + goto clk_cleanup;
>> +
>> + ret = cdns_torrent_clk(cdns_phy);
>> + if (ret)
>> + goto clk_cleanup;
>>
> Should if (!already_configured) be checked while calling clk_disable_unprepare()?

Both clk_unprepare() and clk_disable() checks for passed clk for ERR or
NULL. So don't think it's necessary to have !already_configured check.
> Otherwise,
> Reviewed-by: Swapnil Jakhade <[email protected]>

Thanks
Kishon

>
> Thanks & regards,
> Swapnil
>
>> - /* Enable APB */
>> - reset_control_deassert(cdns_phy->apb_rst);
>> + /* Enable APB */
>> + reset_control_deassert(cdns_phy->apb_rst);
>> + }
>>
>> for_each_available_child_of_node(dev->of_node, child) {
>> struct phy *gphy;
>> @@ -2423,7 +2432,10 @@ static int cdns_torrent_phy_probe(struct
>> platform_device *pdev)
>> of_property_read_u32(child, "cdns,ssc-mode",
>> &cdns_phy->phys[node].ssc_mode);
>>
>> - gphy = devm_phy_create(dev, child,
>> &cdns_torrent_phy_ops);
>> + if (!already_configured)
>> + gphy = devm_phy_create(dev, child,
>> &cdns_torrent_phy_ops);
>> + else
>> + gphy = devm_phy_create(dev, child, &noop_ops);
>> if (IS_ERR(gphy)) {
>> ret = PTR_ERR(gphy);
>> goto put_child;
>> @@ -2507,7 +2519,7 @@ static int cdns_torrent_phy_probe(struct
>> platform_device *pdev)
>> goto put_lnk_rst;
>> }
>>
>> - if (cdns_phy->nsubnodes > 1) {
>> + if (cdns_phy->nsubnodes > 1 && !already_configured) {
>> ret = cdns_torrent_phy_configure_multilink(cdns_phy);
>> if (ret)
>> goto put_lnk_rst;
>> --
>> 2.17.1
>