drm/amd/pm: add fan acoustic target OD setting support for SMU13

Add SMU13 fan acoustic target OD setting support.

Signed-off-by: Evan Quan <evan.quan@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/Documentation/gpu/amdgpu/thermal.rst b/Documentation/gpu/amdgpu/thermal.rst
index 8ed888f..26ca481 100644 (file)
--- a/Documentation/gpu/amdgpu/thermal.rst
+++ b/Documentation/gpu/amdgpu/thermal.rst
@@ -76,6 +76,12 @@ acoustic_limit_rpm_threshold
 .. kernel-doc:: drivers/gpu/drm/amd/pm/amdgpu_pm.c
    :doc: acoustic_limit_rpm_threshold
 
+acoustic_target_rpm_threshold
+-----------------------------
+
+.. kernel-doc:: drivers/gpu/drm/amd/pm/amdgpu_pm.c
+   :doc: acoustic_target_rpm_threshold
+
 GFXOFF
 ======
 

diff --git a/drivers/gpu/drm/amd/include/kgd_pp_interface.h b/drivers/gpu/drm/amd/include/kgd_pp_interface.h
index e3dcef8..a7bc81a 100644 (file)
--- a/drivers/gpu/drm/amd/include/kgd_pp_interface.h
+++ b/drivers/gpu/drm/amd/include/kgd_pp_interface.h
@@ -115,6 +115,7 @@ enum pp_clock_type {
        OD_CCLK,
        OD_FAN_CURVE,
        OD_ACOUSTIC_LIMIT,
+       OD_ACOUSTIC_TARGET,
 };
 
 enum amd_pp_sensors {
@@ -191,6 +192,7 @@ enum PP_OD_DPM_TABLE_COMMAND {
        PP_OD_EDIT_VDDGFX_OFFSET,
        PP_OD_EDIT_FAN_CURVE,
        PP_OD_EDIT_ACOUSTIC_LIMIT,
+       PP_OD_EDIT_ACOUSTIC_TARGET,
 };
 
 struct pp_states_info {

diff --git a/drivers/gpu/drm/amd/pm/amdgpu_pm.c b/drivers/gpu/drm/amd/pm/amdgpu_pm.c
index 1ec8a8c..0d63d31 100644 (file)
--- a/drivers/gpu/drm/amd/pm/amdgpu_pm.c
+++ b/drivers/gpu/drm/amd/pm/amdgpu_pm.c
@@ -3630,6 +3630,63 @@ static umode_t acoustic_limit_threshold_visible(struct amdgpu_device *adev)
        return umode;
 }
 
+/**
+ * DOC: acoustic_target_rpm_threshold
+ *
+ * The amdgpu driver provides a sysfs API for checking and adjusting the
+ * acoustic target in RPM for fan control.
+ *
+ * Reading back the file shows you the current setting and the permitted
+ * ranges if changable.
+ *
+ * Writing an integer to the file, change the setting accordingly.
+ *
+ * When you have finished the editing, write "c" (commit) to the file to commit
+ * your changes.
+ *
+ * This setting works under auto fan control mode only. It can co-exist with
+ * other settings which can work also under auto mode. It adjusts the PMFW's
+ * behavior about the maximum speed in RPM the fan can spin when ASIC
+ * temperature is not greater than target temperature. Setting via this
+ * interface will switch the fan control to auto mode implicitly.
+ */
+static ssize_t acoustic_target_threshold_show(struct kobject *kobj,
+                                             struct kobj_attribute *attr,
+                                             char *buf)
+{
+       struct od_kobj *container = container_of(kobj, struct od_kobj, kobj);
+       struct amdgpu_device *adev = (struct amdgpu_device *)container->priv;
+
+       return (ssize_t)amdgpu_retrieve_od_settings(adev, OD_ACOUSTIC_TARGET, buf);
+}
+
+static ssize_t acoustic_target_threshold_store(struct kobject *kobj,
+                                              struct kobj_attribute *attr,
+                                              const char *buf,
+                                              size_t count)
+{
+       struct od_kobj *container = container_of(kobj, struct od_kobj, kobj);
+       struct amdgpu_device *adev = (struct amdgpu_device *)container->priv;
+
+       return (ssize_t)amdgpu_distribute_custom_od_settings(adev,
+                                                            PP_OD_EDIT_ACOUSTIC_TARGET,
+                                                            buf,
+                                                            count);
+}
+
+static umode_t acoustic_target_threshold_visible(struct amdgpu_device *adev)
+{
+       umode_t umode = 0000;
+
+       if (adev->pm.od_feature_mask & OD_OPS_SUPPORT_ACOUSTIC_TARGET_THRESHOLD_RETRIEVE)
+               umode |= S_IRUSR | S_IRGRP | S_IROTH;
+
+       if (adev->pm.od_feature_mask & OD_OPS_SUPPORT_ACOUSTIC_TARGET_THRESHOLD_SET)
+               umode |= S_IWUSR;
+
+       return umode;
+}
+
 static struct od_feature_set amdgpu_od_set = {
        .containers = {
                [0] = {
@@ -3651,6 +3708,14 @@ static struct od_feature_set amdgpu_od_set = {
                                                .store = acoustic_limit_threshold_store,
                                        },
                                },
+                               [2] = {
+                                       .name = "acoustic_target_rpm_threshold",
+                                       .ops = {
+                                               .is_visible = acoustic_target_threshold_visible,
+                                               .show = acoustic_target_threshold_show,
+                                               .store = acoustic_target_threshold_store,
+                                       },
+                               },
                        },
                },
        },

diff --git a/drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h b/drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h
index 984fda2..bcb37ba 100644 (file)
--- a/drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h
+++ b/drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h
@@ -318,6 +318,8 @@ struct config_table_setting
 #define OD_OPS_SUPPORT_FAN_CURVE_SET                   BIT(1)
 #define OD_OPS_SUPPORT_ACOUSTIC_LIMIT_THRESHOLD_RETRIEVE       BIT(2)
 #define OD_OPS_SUPPORT_ACOUSTIC_LIMIT_THRESHOLD_SET            BIT(3)
+#define OD_OPS_SUPPORT_ACOUSTIC_TARGET_THRESHOLD_RETRIEVE      BIT(4)
+#define OD_OPS_SUPPORT_ACOUSTIC_TARGET_THRESHOLD_SET           BIT(5)
 
 struct amdgpu_pm {
        struct mutex            mutex;

diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
index ca41cfd..0f1e805 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
@@ -2485,6 +2485,8 @@ static enum smu_clk_type smu_convert_to_smuclk(enum pp_clock_type type)
                clk_type = SMU_OD_FAN_CURVE; break;
        case OD_ACOUSTIC_LIMIT:
                clk_type = SMU_OD_ACOUSTIC_LIMIT; break;
+       case OD_ACOUSTIC_TARGET:
+               clk_type = SMU_OD_ACOUSTIC_TARGET; break;
        default:
                clk_type = SMU_CLK_COUNT; break;
        }

diff --git a/drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h b/drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h
index 76bb1cb..b2e9874 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h
+++ b/drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h
@@ -282,6 +282,7 @@ enum smu_clk_type {
        SMU_OD_VDDGFX_OFFSET,
        SMU_OD_FAN_CURVE,
        SMU_OD_ACOUSTIC_LIMIT,
+       SMU_OD_ACOUSTIC_TARGET,
        SMU_CLK_COUNT,
 };
 

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
index 021cff1..c5f958d 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
@@ -104,6 +104,7 @@
 #define PP_OD_FEATURE_FAN_CURVE_TEMP                   5
 #define PP_OD_FEATURE_FAN_CURVE_PWM                    6
 #define PP_OD_FEATURE_FAN_ACOUSTIC_LIMIT               7
+#define PP_OD_FEATURE_FAN_ACOUSTIC_TARGET              8
 
 #define LINK_SPEED_MAX                                 3
 
@@ -1137,6 +1138,10 @@ static void smu_v13_0_0_get_od_setting_limits(struct smu_context *smu,
                od_min_setting = overdrive_lowerlimits->AcousticLimitRpmThreshold;
                od_max_setting = overdrive_upperlimits->AcousticLimitRpmThreshold;
                break;
+       case PP_OD_FEATURE_FAN_ACOUSTIC_TARGET:
+               od_min_setting = overdrive_lowerlimits->AcousticTargetRpmThreshold;
+               od_max_setting = overdrive_upperlimits->AcousticTargetRpmThreshold;
+               break;
        default:
                od_min_setting = od_max_setting = INT_MAX;
                break;
@@ -1403,6 +1408,24 @@ static int smu_v13_0_0_print_clk_levels(struct smu_context *smu,
                                      min_value, max_value);
                break;
 
+       case SMU_OD_ACOUSTIC_TARGET:
+               if (!smu_v13_0_0_is_od_feature_supported(smu,
+                                                        PP_OD_FEATURE_FAN_CURVE_BIT))
+                       break;
+
+               size += sysfs_emit_at(buf, size, "OD_ACOUSTIC_TARGET:\n");
+               size += sysfs_emit_at(buf, size, "%d\n",
+                                       (int)od_table->OverDriveTable.AcousticTargetRpmThreshold);
+
+               size += sysfs_emit_at(buf, size, "%s:\n", "OD_RANGE");
+               smu_v13_0_0_get_od_setting_limits(smu,
+                                                 PP_OD_FEATURE_FAN_ACOUSTIC_TARGET,
+                                                 &min_value,
+                                                 &max_value);
+               size += sysfs_emit_at(buf, size, "ACOUSTIC_TARGET: %u %u\n",
+                                     min_value, max_value);
+               break;
+
        case SMU_OD_RANGE:
                if (!smu_v13_0_0_is_od_feature_supported(smu, PP_OD_FEATURE_GFXCLK_BIT) &&
                    !smu_v13_0_0_is_od_feature_supported(smu, PP_OD_FEATURE_UCLK_BIT) &&
@@ -1673,6 +1696,28 @@ static int smu_v13_0_0_od_edit_dpm_table(struct smu_context *smu,
                od_table->OverDriveTable.FeatureCtrlMask |= BIT(PP_OD_FEATURE_FAN_CURVE_BIT);
                break;
 
+       case PP_OD_EDIT_ACOUSTIC_TARGET:
+               if (!smu_v13_0_0_is_od_feature_supported(smu, PP_OD_FEATURE_FAN_CURVE_BIT)) {
+                       dev_warn(adev->dev, "Fan curve setting not supported!\n");
+                       return -ENOTSUPP;
+               }
+
+               smu_v13_0_0_get_od_setting_limits(smu,
+                                                 PP_OD_FEATURE_FAN_ACOUSTIC_TARGET,
+                                                 &minimum,
+                                                 &maximum);
+               if (input[0] < minimum ||
+                   input[0] > maximum) {
+                       dev_info(adev->dev, "acoustic target threshold setting(%ld) must be within [%d, %d]!\n",
+                                input[0], minimum, maximum);
+                       return -EINVAL;
+               }
+
+               od_table->OverDriveTable.AcousticTargetRpmThreshold = input[0];
+               od_table->OverDriveTable.FanMode = FAN_MODE_AUTO;
+               od_table->OverDriveTable.FeatureCtrlMask |= BIT(PP_OD_FEATURE_FAN_CURVE_BIT);
+               break;
+
        case PP_OD_RESTORE_DEFAULT_TABLE:
                feature_ctrlmask = od_table->OverDriveTable.FeatureCtrlMask;
                memcpy(od_table,
@@ -1932,7 +1977,9 @@ static void smu_v13_0_0_set_supported_od_feature_mask(struct smu_context *smu)
                adev->pm.od_feature_mask |= OD_OPS_SUPPORT_FAN_CURVE_RETRIEVE |
                                            OD_OPS_SUPPORT_FAN_CURVE_SET |
                                            OD_OPS_SUPPORT_ACOUSTIC_LIMIT_THRESHOLD_RETRIEVE |
-                                           OD_OPS_SUPPORT_ACOUSTIC_LIMIT_THRESHOLD_SET;
+                                           OD_OPS_SUPPORT_ACOUSTIC_LIMIT_THRESHOLD_SET |
+                                           OD_OPS_SUPPORT_ACOUSTIC_TARGET_THRESHOLD_RETRIEVE |
+                                           OD_OPS_SUPPORT_ACOUSTIC_TARGET_THRESHOLD_SET;
 }
 
 static int smu_v13_0_0_set_default_od_settings(struct smu_context *smu)
@@ -1992,6 +2039,8 @@ static int smu_v13_0_0_set_default_od_settings(struct smu_context *smu)
                }
                user_od_table->OverDriveTable.AcousticLimitRpmThreshold =
                        user_od_table_bak.OverDriveTable.AcousticLimitRpmThreshold;
+               user_od_table->OverDriveTable.AcousticTargetRpmThreshold =
+                       user_od_table_bak.OverDriveTable.AcousticTargetRpmThreshold;
        }
 
        smu_v13_0_0_set_supported_od_feature_mask(smu);

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
index f9486c7..55571de 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
@@ -80,6 +80,7 @@
 #define PP_OD_FEATURE_FAN_CURVE_TEMP                   5
 #define PP_OD_FEATURE_FAN_CURVE_PWM                    6
 #define PP_OD_FEATURE_FAN_ACOUSTIC_LIMIT               7
+#define PP_OD_FEATURE_FAN_ACOUSTIC_TARGET              8
 
 #define LINK_SPEED_MAX                                 3
 
@@ -1117,6 +1118,10 @@ static void smu_v13_0_7_get_od_setting_limits(struct smu_context *smu,
                od_min_setting = overdrive_lowerlimits->AcousticLimitRpmThreshold;
                od_max_setting = overdrive_upperlimits->AcousticLimitRpmThreshold;
                break;
+       case PP_OD_FEATURE_FAN_ACOUSTIC_TARGET:
+               od_min_setting = overdrive_lowerlimits->AcousticTargetRpmThreshold;
+               od_max_setting = overdrive_upperlimits->AcousticTargetRpmThreshold;
+               break;
        default:
                od_min_setting = od_max_setting = INT_MAX;
                break;
@@ -1383,6 +1388,24 @@ static int smu_v13_0_7_print_clk_levels(struct smu_context *smu,
                                      min_value, max_value);
                break;
 
+       case SMU_OD_ACOUSTIC_TARGET:
+               if (!smu_v13_0_7_is_od_feature_supported(smu,
+                                                        PP_OD_FEATURE_FAN_CURVE_BIT))
+                       break;
+
+               size += sysfs_emit_at(buf, size, "OD_ACOUSTIC_TARGET:\n");
+               size += sysfs_emit_at(buf, size, "%d\n",
+                                       (int)od_table->OverDriveTable.AcousticTargetRpmThreshold);
+
+               size += sysfs_emit_at(buf, size, "%s:\n", "OD_RANGE");
+               smu_v13_0_7_get_od_setting_limits(smu,
+                                                 PP_OD_FEATURE_FAN_ACOUSTIC_TARGET,
+                                                 &min_value,
+                                                 &max_value);
+               size += sysfs_emit_at(buf, size, "ACOUSTIC_TARGET: %u %u\n",
+                                     min_value, max_value);
+               break;
+
        case SMU_OD_RANGE:
                if (!smu_v13_0_7_is_od_feature_supported(smu, PP_OD_FEATURE_GFXCLK_BIT) &&
                    !smu_v13_0_7_is_od_feature_supported(smu, PP_OD_FEATURE_UCLK_BIT) &&
@@ -1653,6 +1676,28 @@ static int smu_v13_0_7_od_edit_dpm_table(struct smu_context *smu,
                od_table->OverDriveTable.FeatureCtrlMask |= BIT(PP_OD_FEATURE_FAN_CURVE_BIT);
                break;
 
+       case PP_OD_EDIT_ACOUSTIC_TARGET:
+               if (!smu_v13_0_7_is_od_feature_supported(smu, PP_OD_FEATURE_FAN_CURVE_BIT)) {
+                       dev_warn(adev->dev, "Fan curve setting not supported!\n");
+                       return -ENOTSUPP;
+               }
+
+               smu_v13_0_7_get_od_setting_limits(smu,
+                                                 PP_OD_FEATURE_FAN_ACOUSTIC_TARGET,
+                                                 &minimum,
+                                                 &maximum);
+               if (input[0] < minimum ||
+                   input[0] > maximum) {
+                       dev_info(adev->dev, "acoustic target threshold setting(%ld) must be within [%d, %d]!\n",
+                                input[0], minimum, maximum);
+                       return -EINVAL;
+               }
+
+               od_table->OverDriveTable.AcousticTargetRpmThreshold = input[0];
+               od_table->OverDriveTable.FanMode = FAN_MODE_AUTO;
+               od_table->OverDriveTable.FeatureCtrlMask |= BIT(PP_OD_FEATURE_FAN_CURVE_BIT);
+               break;
+
        case PP_OD_RESTORE_DEFAULT_TABLE:
                feature_ctrlmask = od_table->OverDriveTable.FeatureCtrlMask;
                memcpy(od_table,
@@ -1907,7 +1952,9 @@ static void smu_v13_0_7_set_supported_od_feature_mask(struct smu_context *smu)
                adev->pm.od_feature_mask |= OD_OPS_SUPPORT_FAN_CURVE_RETRIEVE |
                                            OD_OPS_SUPPORT_FAN_CURVE_SET |
                                            OD_OPS_SUPPORT_ACOUSTIC_LIMIT_THRESHOLD_RETRIEVE |
-                                           OD_OPS_SUPPORT_ACOUSTIC_LIMIT_THRESHOLD_SET;
+                                           OD_OPS_SUPPORT_ACOUSTIC_LIMIT_THRESHOLD_SET |
+                                           OD_OPS_SUPPORT_ACOUSTIC_TARGET_THRESHOLD_RETRIEVE |
+                                           OD_OPS_SUPPORT_ACOUSTIC_TARGET_THRESHOLD_SET;
 }
 
 static int smu_v13_0_7_set_default_od_settings(struct smu_context *smu)
@@ -1967,6 +2014,8 @@ static int smu_v13_0_7_set_default_od_settings(struct smu_context *smu)
                }
                user_od_table->OverDriveTable.AcousticLimitRpmThreshold =
                        user_od_table_bak.OverDriveTable.AcousticLimitRpmThreshold;
+               user_od_table->OverDriveTable.AcousticTargetRpmThreshold =
+                       user_od_table_bak.OverDriveTable.AcousticTargetRpmThreshold;
        }
 
        smu_v13_0_7_set_supported_od_feature_mask(smu);