Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
MIME-Version: 1.0
References: <20191221181855.31380-1-tiny.windzz@gmail.com>
In-Reply-To: <20191221181855.31380-1-tiny.windzz@gmail.com>
From:   Chanwoo Choi <chanwoo@kernel.org>
Date:   Mon, 23 Dec 2019 01:49:00 +0900
Message-ID: <CAGTfZH1aObSb5oWnVzp_WaGALFfC9VQpRKQ+AWTauPVL7VPOSg@mail.gmail.com>
Subject: Re: [PATCH 1/2] PM / devfreq: rk3399_dmc: Add missing devfreq_event_disable_edev
To:     Yangtao Li <tiny.windzz@gmail.com>
Cc:     Chanwoo Choi <cw00.choi@samsung.com>,
        MyungJoo Ham <myungjoo.ham@samsung.com>,
        Kyungmin Park <kyungmin.park@samsung.com>,
        Kukjin Kim <kgene@kernel.org>,
        Krzysztof Kozlowski <krzk@kernel.org>,
        Linux PM list <linux-pm@vger.kernel.org>,
        linux-samsung-soc <linux-samsung-soc@vger.kernel.org>,
        linux-arm-kernel <linux-arm-kernel@lists.infradead.org>,
        linux-kernel <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Hi,

2019=EB=85=84 12=EC=9B=94 22=EC=9D=BC (=EC=9D=BC) =EC=98=A4=EC=A0=84 3:21, =
Yangtao Li <tiny.windzz@gmail.com>=EB=8B=98=EC=9D=B4 =EC=9E=91=EC=84=B1:
>
> The probe process may fail, but the devfreq event device remains
> enabled. Call devfreq_event_disable_edev on the error return path.
>
> Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
> ---
>  drivers/devfreq/rk3399_dmc.c | 17 ++++++++++++-----
>  1 file changed, 12 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/devfreq/rk3399_dmc.c b/drivers/devfreq/rk3399_dmc.c
> index 2f1027c5b647..4f4e7c041888 100644
> --- a/drivers/devfreq/rk3399_dmc.c
> +++ b/drivers/devfreq/rk3399_dmc.c
> @@ -364,7 +364,8 @@ static int rk3399_dmcfreq_probe(struct platform_devic=
e *pdev)
>                         if (res.a0) {
>                                 dev_err(dev, "Failed to set dram param: %=
ld\n",
>                                         res.a0);
> -                               return -EINVAL;
> +                               ret =3D -EINVAL;
> +                               goto err_disable_edev;

After jumping err_disable_edev, it calls the dev_pm_opp_of_remove_table().
it is wrong. It doesn't need to remove the table.

>                         }
>                 }
>         }
> @@ -373,8 +374,10 @@ static int rk3399_dmcfreq_probe(struct platform_devi=
ce *pdev)
>         if (node) {
>                 data->regmap_pmu =3D syscon_node_to_regmap(node);
>                 of_node_put(node);
> -               if (IS_ERR(data->regmap_pmu))
> -                       return PTR_ERR(data->regmap_pmu);
> +               if (IS_ERR(data->regmap_pmu)) {
> +                       ret =3D PTR_ERR(data->regmap_pmu);
> +                       goto err_disable_edev;

ditto.

After jumping err_disable_edev, it calls the dev_pm_opp_of_remove_table().
it is wrong. It doesn't need to remove the table.

> +               }
>         }
>
>         regmap_read(data->regmap_pmu, RK3399_PMUGRF_OS_REG2, &val);
> @@ -392,7 +395,8 @@ static int rk3399_dmcfreq_probe(struct platform_devic=
e *pdev)
>                 data->odt_dis_freq =3D data->timing.lpddr4_odt_dis_freq;
>                 break;
>         default:
> -               return -EINVAL;
> +               ret =3D -EINVAL;
> +               goto err_disable_edev;

ditto.

>         };
>
>         arm_smccc_smc(ROCKCHIP_SIP_DRAM_FREQ, 0, 0,
> @@ -426,7 +430,8 @@ static int rk3399_dmcfreq_probe(struct platform_devic=
e *pdev)
>          */
>         if (dev_pm_opp_of_add_table(dev)) {
>                 dev_err(dev, "Invalid operating-points in device tree.\n"=
);
> -               return -EINVAL;
> +               ret =3D -EINVAL;
> +               goto err_disable_edev;

ditto.

>         }
>
>         of_property_read_u32(np, "upthreshold",
> @@ -464,6 +469,8 @@ static int rk3399_dmcfreq_probe(struct platform_devic=
e *pdev)
>
>         return 0;
>
> +err_disable_edev:
> +       devfreq_event_disable_edev(data->edev);

It is wrong. It have to be called under dev_pm_opp_of_remove_table().
It ignores the sequence of exception handling.

>  err_free_opp:
>         dev_pm_opp_of_remove_table(&pdev->dev);
>         return ret;
> --
> 2.17.1
>


--=20
Best Regards,
Chanwoo Choi