]> www.infradead.org Git - users/hch/configfs.git/commitdiff
drm/xe/hwmon: Fix PL1 disable flow in xe_hwmon_power_max_write
authorKarthik Poosa <karthik.poosa@intel.com>
Thu, 1 Aug 2024 11:24:24 +0000 (16:54 +0530)
committerMatt Roper <matthew.d.roper@intel.com>
Thu, 1 Aug 2024 14:36:54 +0000 (07:36 -0700)
In xe_hwmon_power_max_write, for PL1 disable supported case, instead of
returning after PL1 disable, PL1 enable path was also being run.
Fixed it by returning after disable.

v2: Correct typo and grammar in commit message. (Jonathan)

Signed-off-by: Karthik Poosa <karthik.poosa@intel.com>
Fixes: fef6dd12b45a ("drm/xe/hwmon: Protect hwmon rw attributes with hwmon_lock")
Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240801112424.1841766-1-karthik.poosa@intel.com
drivers/gpu/drm/xe/xe_hwmon.c

index 0c8ce09e5025055f14941eca518fff9f9c87525b..832ea81faeee509811cd0e312045715ba048136f 100644 (file)
@@ -203,9 +203,10 @@ static int xe_hwmon_power_max_write(struct xe_hwmon *hwmon, int channel, long va
                reg_val = xe_mmio_rmw32(hwmon->gt, rapl_limit, PKG_PWR_LIM_1_EN, 0);
                reg_val = xe_mmio_read32(hwmon->gt, rapl_limit);
                if (reg_val & PKG_PWR_LIM_1_EN) {
+                       drm_warn(&gt_to_xe(hwmon->gt)->drm, "PL1 disable is not supported!\n");
                        ret = -EOPNOTSUPP;
-                       goto unlock;
                }
+               goto unlock;
        }
 
        /* Computation in 64-bits to avoid overflow. Round to nearest. */