Re: [PATCH] thermal: intel: int340x: clean up RFIM groups on DVFS failure

[Rafael J. Wysocki (Intel)]

On Mon, Jun 15, 2026 at 8:53 AM Pengpeng Hou <pengpeng@xxxxxxxxxxx> wrote:
>
> proc_thermal_rfim_add() can create the FIVR and DLVR sysfs groups
> before creating the DVFS group.
>
> If DVFS group creation fails while both earlier groups are enabled, the
> current error handling removes only one group: the FIVR branch returns
> before the DLVR cleanup branch can run.  This leaves the DLVR group
> behind even though RFIM setup fails.
>
> Use one DVFS failure path that removes all previously created RFIM
> groups before returning the error.
>
> Signed-off-by: Pengpeng Hou <pengpeng@xxxxxxxxxxx>
> ---
>  .../intel/int340x_thermal/processor_thermal_rfim.c    | 11 +++++------
>  1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/thermal/intel/int340x_thermal/processor_thermal_rfim.c b/drivers/thermal/intel/int340x_thermal/processor_thermal_rfim.c
> index 1a7e134dfcf8..96279756177f 100644
> --- a/drivers/thermal/intel/int340x_thermal/processor_thermal_rfim.c
> +++ b/drivers/thermal/intel/int340x_thermal/processor_thermal_rfim.c
> @@ -491,12 +491,11 @@ int proc_thermal_rfim_add(struct pci_dev *pdev, struct proc_thermal_device *proc
>
>         if (proc_priv->mmio_feature_mask & PROC_THERMAL_FEATURE_DVFS) {
>                 ret = sysfs_create_group(&pdev->dev.kobj, &dvfs_attribute_group);
> -               if (ret && proc_priv->mmio_feature_mask & PROC_THERMAL_FEATURE_FIVR) {
> -                       sysfs_remove_group(&pdev->dev.kobj, &fivr_attribute_group);
> -                       return ret;
> -               }
> -               if (ret && proc_priv->mmio_feature_mask & PROC_THERMAL_FEATURE_DLVR) {
> -                       sysfs_remove_group(&pdev->dev.kobj, &dlvr_attribute_group);
> +               if (ret) {
> +                       if (proc_priv->mmio_feature_mask & PROC_THERMAL_FEATURE_DLVR)
> +                               sysfs_remove_group(&pdev->dev.kobj, &dlvr_attribute_group);
> +                       if (proc_priv->mmio_feature_mask & PROC_THERMAL_FEATURE_FIVR)
> +                               sysfs_remove_group(&pdev->dev.kobj, &fivr_attribute_group);
>                         return ret;
>                 }
>         }
> --

Applied as 7.3 material, thanks!