2020-11-12 11:12:25

by Zhang Changzhong

Subject: [PATCH net] net: dsa: lantiq_gswip: add missed clk_disable_unprepare() in gswip_gphy_fw_load()

Fix missing clk_disable_unprepare() before return from
gswip_gphy_fw_load() in the error handling case.

Fixes: 14fceff4771e ("net: dsa: Add Lantiq / Intel DSA driver for vrx200")
Reported-by: Hulk Robot <[email protected]>
Signed-off-by: Zhang Changzhong <[email protected]>
---
drivers/net/dsa/lantiq_gswip.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/net/dsa/lantiq_gswip.c b/drivers/net/dsa/lantiq_gswip.c
index 74db81d..8936d65 100644
--- a/drivers/net/dsa/lantiq_gswip.c
+++ b/drivers/net/dsa/lantiq_gswip.c
@@ -1682,6 +1682,7 @@ static int gswip_gphy_fw_load(struct gswip_priv *priv, struct gswip_gphy_fw *gph
if (ret) {
dev_err(dev, "failed to load firmware: %s, error: %i\n",
gphy_fw->fw_name, ret);
+ clk_disable_unprepare(gphy_fw->clk_gate);
return ret;
}

@@ -1698,14 +1699,17 @@ static int gswip_gphy_fw_load(struct gswip_priv *priv, struct gswip_gphy_fw *gph
} else {
dev_err(dev, "failed to alloc firmware memory\n");
release_firmware(fw);
+ clk_disable_unprepare(gphy_fw->clk_gate);
return -ENOMEM;
}

release_firmware(fw);

ret = regmap_write(priv->rcu_regmap, gphy_fw->fw_addr_offset, dev_addr);
- if (ret)
+ if (ret) {
+ clk_disable_unprepare(gphy_fw->clk_gate);
return ret;
+ }

reset_control_deassert(gphy_fw->reset);

--
2.9.5

2020-11-12 12:45:00

by Vladimir Oltean

Subject: Re: [PATCH net] net: dsa: lantiq_gswip: add missed clk_disable_unprepare() in gswip_gphy_fw_load()

On Thu, Nov 12, 2020 at 07:11:35PM +0800, Zhang Changzhong wrote:
> Fix missing clk_disable_unprepare() before return from
> gswip_gphy_fw_load() in the error handling case.
>
> Fixes: 14fceff4771e ("net: dsa: Add Lantiq / Intel DSA driver for vrx200")
> Reported-by: Hulk Robot <[email protected]>
> Signed-off-by: Zhang Changzhong <[email protected]>
> ---
> drivers/net/dsa/lantiq_gswip.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/dsa/lantiq_gswip.c b/drivers/net/dsa/lantiq_gswip.c
> index 74db81d..8936d65 100644
> --- a/drivers/net/dsa/lantiq_gswip.c
> +++ b/drivers/net/dsa/lantiq_gswip.c
> @@ -1682,6 +1682,7 @@ static int gswip_gphy_fw_load(struct gswip_priv *priv, struct gswip_gphy_fw *gph
> if (ret) {
> dev_err(dev, "failed to load firmware: %s, error: %i\n",
> gphy_fw->fw_name, ret);
> + clk_disable_unprepare(gphy_fw->clk_gate);
> return ret;
> }
>
> @@ -1698,14 +1699,17 @@ static int gswip_gphy_fw_load(struct gswip_priv *priv, struct gswip_gphy_fw *gph
> } else {
> dev_err(dev, "failed to alloc firmware memory\n");
> release_firmware(fw);
> + clk_disable_unprepare(gphy_fw->clk_gate);
> return -ENOMEM;
> }
>
> release_firmware(fw);
>
> ret = regmap_write(priv->rcu_regmap, gphy_fw->fw_addr_offset, dev_addr);
> - if (ret)
> + if (ret) {
> + clk_disable_unprepare(gphy_fw->clk_gate);
> return ret;
> + }
>
> reset_control_deassert(gphy_fw->reset);
>
> --
> 2.9.5
>

gswip_gphy_fw_list
-> gswip_gphy_fw_probe
-> gswip_gphy_fw_load
-> clk_prepare_enable
-> then fails

Then gswip_gphy_fw_list does this:
for_each_available_child_of_node(gphy_fw_list_np, gphy_fw_np) {
err = gswip_gphy_fw_probe(priv, &priv->gphy_fw[i],
gphy_fw_np, i);
if (err)
goto remove_gphy;
i++;
}

return 0;

remove_gphy:
for (i = 0; i < priv->num_gphy_fw; i++)
gswip_gphy_fw_remove(priv, &priv->gphy_fw[i]);


Then gswip_gphy_fw_remove does this:
gswip_gphy_fw_remove
-> clk_disable_unprepare

What's wrong with this?

2020-11-13 02:37:17

by Zhang Changzhong

Subject: Re: [PATCH net] net: dsa: lantiq_gswip: add missed clk_disable_unprepare() in gswip_gphy_fw_load()

On 2020/11/12 20:41, Vladimir Oltean wrote:
>
> gswip_gphy_fw_list
> -> gswip_gphy_fw_probe
> -> gswip_gphy_fw_load
> -> clk_prepare_enable
> -> then fails
>
> Then gswip_gphy_fw_list does this:
> for_each_available_child_of_node(gphy_fw_list_np, gphy_fw_np) {
> err = gswip_gphy_fw_probe(priv, &priv->gphy_fw[i],
> gphy_fw_np, i);
> if (err)
> goto remove_gphy;
> i++;
> }
>
> return 0;
>
> remove_gphy:
> for (i = 0; i < priv->num_gphy_fw; i++)
> gswip_gphy_fw_remove(priv, &priv->gphy_fw[i]);
>
>
> Then gswip_gphy_fw_remove does this:
> gswip_gphy_fw_remove
> -> clk_disable_unprepare
>
> What's wrong with this?
> .
>
Thanks for reminding, I got it wrong.