Skip to contentSkip to conversation

drm/amd/pm: correct the fan speed RPM setting

PATCH Superseded Evan Quan 4 participants 20 messages Jul 7, 2021 – Aug 11, 2021

Subsystems (3)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Evan Quan

author
#0 lore raw

PATCH 1/7 drm/amd/pm: correct the fan speed RPM setting

The relationship "PWM = RPM / smu->fan_max_rpm" between fan speed PWM and RPM is not true for SMU11 ASICs. So, we need a new way to perform the fan speed RPM setting.

Change-Id I1afe8102f02ead9a8a07c7105f689ac60a85b0d8
---
 drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h       |  5 +++
 drivers/gpu/drm/amd/pm/inc/smu_v11_0.h        |  3 ++
 drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c     |  9 ++---
 .../gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c |  1 +
 .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c   |  1 +
 .../amd/pm/swsmu/smu11/sienna_cichlid_ppt.c   |  1 +
 .../gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c    | 36 +++++++++++++++++++
 7 files changed, 52 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +5 -0
index 3e89852e4820..6301e4cb3c2a 100644
@@ -1039,6 +1039,11 @@ struct pptable_funcs {
 	 */
 	int (*set_fan_speed_percent)(struct smu_context *smu, uint32_t speed);
 
+	/**
+	 * @set_fan_speed_rpm: Set a static fan speed in rpm.
+	 */
+	int (*set_fan_speed_rpm)(struct smu_context *smu, uint32_t speed);
+
 	/**
 	 * @set_xgmi_pstate: Set inter-chip global memory interconnect pstate.
 	 * &pstate: Pstate to set. D0 if Nonzero, D3 otherwise.
drivers/gpu/drm/amd/pm/inc/smu_v11_0.h +3 -0
index b89e7dca8906..134a33e3de91 100644
@@ -223,6 +223,9 @@ smu_v11_0_set_fan_control_mode(struct smu_context *smu,
 int smu_v11_0_set_fan_speed_percent(struct smu_context *smu,
 				    uint32_t speed);
 
+int smu_v11_0_set_fan_speed_rpm(struct smu_context *smu,
+				uint32_t speed);
+
 int smu_v11_0_set_xgmi_pstate(struct smu_context *smu,
 				     uint32_t pstate);
 
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +5 -4
index ebe672142808..576e9ea68fd1 100644
@@ -2174,11 +2174,12 @@ static int smu_set_fan_speed_rpm(void *handle, uint32_t speed)
 
 	mutex_lock(&smu->mutex);
 
-	if (smu->ppt_funcs->set_fan_speed_percent) {
-		percent = speed * 100 / smu->fan_max_rpm;
-		ret = smu->ppt_funcs->set_fan_speed_percent(smu, percent);
-		if (!ret && !(smu->user_dpm_profile.flags & SMU_DPM_USER_PROFILE_RESTORE))
+	if (smu->ppt_funcs->set_fan_speed_rpm) {
+		ret = smu->ppt_funcs->set_fan_speed_rpm(smu, speed);
+		if (!ret && smu->user_dpm_profile.flags & SMU_DPM_USER_PROFILE_RESTORE) {
+			percent = speed * 100 / smu->fan_max_rpm;
 			smu->user_dpm_profile.fan_speed_percent = percent;
+		}
 	}
 
 	mutex_unlock(&smu->mutex);
drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c +1 -0
index 6b3e0ea10163..047adf6dd444 100644
@@ -2314,6 +2314,7 @@ static const struct pptable_funcs arcturus_ppt_funcs = {
 	.get_fan_control_mode = smu_v11_0_get_fan_control_mode,
 	.set_fan_control_mode = smu_v11_0_set_fan_control_mode,
 	.set_fan_speed_percent = smu_v11_0_set_fan_speed_percent,
+	.set_fan_speed_rpm = smu_v11_0_set_fan_speed_rpm,
 	.set_xgmi_pstate = smu_v11_0_set_xgmi_pstate,
 	.gfx_off_control = smu_v11_0_gfx_off_control,
 	.register_irq_handler = smu_v11_0_register_irq_handler,
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1 -0
index 59ea59acfb00..d8a011483dcf 100644
@@ -3248,6 +3248,7 @@ static const struct pptable_funcs navi10_ppt_funcs = {
 	.get_fan_control_mode = smu_v11_0_get_fan_control_mode,
 	.set_fan_control_mode = smu_v11_0_set_fan_control_mode,
 	.set_fan_speed_percent = smu_v11_0_set_fan_speed_percent,
+	.set_fan_speed_rpm = smu_v11_0_set_fan_speed_rpm,
 	.set_xgmi_pstate = smu_v11_0_set_xgmi_pstate,
 	.gfx_off_control = smu_v11_0_gfx_off_control,
 	.register_irq_handler = smu_v11_0_register_irq_handler,
drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +1 -0
index 83d8e53ca1f8..dad120294c19 100644
@@ -3886,6 +3886,7 @@ static const struct pptable_funcs sienna_cichlid_ppt_funcs = {
 	.get_fan_control_mode = smu_v11_0_get_fan_control_mode,
 	.set_fan_control_mode = smu_v11_0_set_fan_control_mode,
 	.set_fan_speed_percent = smu_v11_0_set_fan_speed_percent,
+	.set_fan_speed_rpm = smu_v11_0_set_fan_speed_rpm,
 	.set_xgmi_pstate = smu_v11_0_set_xgmi_pstate,
 	.gfx_off_control = smu_v11_0_gfx_off_control,
 	.register_irq_handler = smu_v11_0_register_irq_handler,
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +36 -0
index 388c5cb5c647..fefc8e93fdc6 100644
@@ -1213,6 +1213,42 @@ smu_v11_0_set_fan_speed_percent(struct smu_context *smu, uint32_t speed)
 	return smu_v11_0_set_fan_static_mode(smu, FDO_PWM_MODE_STATIC);
 }
 
+int smu_v11_0_set_fan_speed_rpm(struct smu_context *smu,
+				uint32_t speed)
+{
+	struct amdgpu_device *adev = smu->adev;
+	uint32_t tach_period, crystal_clock_freq;
+	int ret;
+
+	ret = smu_v11_0_auto_fan_control(smu, 0);
+	if (ret)
+		return ret;
+
+	/*
+	 * crystal_clock_freq div by 4 is required since the fan control
+	 * module refers to 25MHz
+	 */
+	crystal_clock_freq = amdgpu_asic_get_xclk(adev) / 4;
+
+	/*
+	 * To prevent from possible overheat, some ASICs may have requirement
+	 * for minimum fan speed:
+	 * - For some NV10 SKU, the fan speed cannot be set lower than
+	 *   700 RPM.
+	 * - For some Sienna Cichlid SKU, the fan speed cannot be set
+	 *   lower than 500 RPM.
+	 */
+	tach_period = 60 * crystal_clock_freq * 10000 / (8 * speed);
+	WREG32_SOC15(THM, 0, mmCG_TACH_CTRL,
+		     REG_SET_FIELD(RREG32_SOC15(THM, 0, mmCG_TACH_CTRL),
+				   CG_TACH_CTRL, TARGET_PERIOD,
+				   tach_period));
+
+	ret = smu_v11_0_set_fan_static_mode(smu, FDO_PWM_MODE_STATIC_RPM);
+
+	return ret;
+}
+
 int
 smu_v11_0_set_fan_control_mode(struct smu_context *smu,
 			       uint32_t mode)
Signature · 6 lines
2.29.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
author
#1 lore raw

PATCH 2/7 drm/amd/pm: record the RPM and PWM based fan speed settings

As the relationship "PWM = RPM / smu->fan_max_rpm" between fan speed PWM and RPM is not true for SMU11 ASICs. So, both the RPM and PWM settings need to be saved.

Change-Id I318c134d442273d518b805339cdf383e151b935d
---
 drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h   |  8 ++++++++
 drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 20 +++++++++++++++-----
 2 files changed, 23 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +8 -0
index 6301e4cb3c2a..fa585f0be530 100644
@@ -226,10 +226,18 @@ enum smu_memory_pool_size
     SMU_MEMORY_POOL_SIZE_2_GB   = 0x80000000,
 };
 
+enum custom_fan_speed_mode
+{
+	SMU_CUSTOM_FAN_SPEED_RPM = 1 << 0,
+	SMU_CUSTOM_FAN_SPEED_PWM = 1 << 1,
+};
+
 struct smu_user_dpm_profile {
 	uint32_t fan_mode;
 	uint32_t power_limit;
+	uint32_t custom_fan_speed;
 	uint32_t fan_speed_percent;
+	uint32_t fan_speed_rpm;
 	uint32_t flags;
 
 	/* user clock state information */
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +15 -5
index 576e9ea68fd1..9a25443988e3 100644
@@ -414,6 +414,12 @@ static void smu_restore_dpm_user_profile(struct smu_context *smu)
 			if (ret)
 				dev_err(smu->adev->dev, "Failed to set manual fan speed\n");
 		}
+
+		if (!ret && smu->user_dpm_profile.fan_speed_rpm) {
+			ret = smu_set_fan_speed_rpm(smu, smu->user_dpm_profile.fan_speed_rpm);
+			if (ret)
+				dev_err(smu->adev->dev, "Failed to set manual fan speed\n");
+		}
 	}
 
 	/* Disable restore flag */
@@ -2166,7 +2172,6 @@ static int smu_set_gfx_cgpg(struct smu_context *smu, bool enabled)
 static int smu_set_fan_speed_rpm(void *handle, uint32_t speed)
 {
 	struct smu_context *smu = handle;
-	u32 percent;
 	int ret = 0;
 
 	if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled)
@@ -2177,8 +2182,8 @@ static int smu_set_fan_speed_rpm(void *handle, uint32_t speed)
 	if (smu->ppt_funcs->set_fan_speed_rpm) {
 		ret = smu->ppt_funcs->set_fan_speed_rpm(smu, speed);
 		if (!ret && smu->user_dpm_profile.flags & SMU_DPM_USER_PROFILE_RESTORE) {
-			percent = speed * 100 / smu->fan_max_rpm;
-			smu->user_dpm_profile.fan_speed_percent = percent;
+			smu->user_dpm_profile.custom_fan_speed |= SMU_CUSTOM_FAN_SPEED_RPM;
+			smu->user_dpm_profile.fan_speed_rpm = speed;
 		}
 	}
 
@@ -2539,8 +2544,11 @@ static int smu_set_fan_control_mode(struct smu_context *smu, int value)
 
 	/* reset user dpm fan speed */
 	if (!ret && value != AMD_FAN_CTRL_MANUAL &&
-			!(smu->user_dpm_profile.flags & SMU_DPM_USER_PROFILE_RESTORE))
+			!(smu->user_dpm_profile.flags & SMU_DPM_USER_PROFILE_RESTORE)) {
 		smu->user_dpm_profile.fan_speed_percent = 0;
+		smu->user_dpm_profile.fan_speed_rpm = 0;
+		smu->user_dpm_profile.custom_fan_speed = 0;
+	}
 
 	return ret;
 }
@@ -2591,8 +2599,10 @@ static int smu_set_fan_speed_percent(void *handle, u32 speed)
 		if (speed > 100)
 			speed = 100;
 		ret = smu->ppt_funcs->set_fan_speed_percent(smu, speed);
-		if (!ret && !(smu->user_dpm_profile.flags & SMU_DPM_USER_PROFILE_RESTORE))
+		if (!ret && !(smu->user_dpm_profile.flags & SMU_DPM_USER_PROFILE_RESTORE)) {
+			smu->user_dpm_profile.custom_fan_speed |= SMU_CUSTOM_FAN_SPEED_PWM;
 			smu->user_dpm_profile.fan_speed_percent = speed;
+		}
 	}
 
 	mutex_unlock(&smu->mutex);
Signature · 6 lines
2.29.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#2 lore raw

RE: [PATCH 2/7] drm/amd/pm: record the RPM and PWM based fan speed settings

[Public]

Two nit-picks.

Regards,
Guchun

-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Evan Quan
Sent: Wednesday, July 7, 2021 9:57 AM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; Quan, Evan <[email protected]>
Subject: [PATCH 2/7] drm/amd/pm: record the RPM and PWM based fan speed settings

As the relationship "PWM = RPM / smu->fan_max_rpm" between fan speed PWM and RPM is not true for SMU11 ASICs. So, both the RPM and PWM settings need to be saved.

Change-Id I318c134d442273d518b805339cdf383e151b935d
---
 drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h   |  8 ++++++++
 drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 20 +++++++++++++++-----
 2 files changed, 23 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +6 -0
index 6301e4cb3c2a..fa585f0be530 100644
@@ -226,10 +226,18 @@ enum smu_memory_pool_size
     SMU_MEMORY_POOL_SIZE_2_GB   = 0x80000000,
 };
 
+enum custom_fan_speed_mode
+{
+	SMU_CUSTOM_FAN_SPEED_RPM = 1 << 0,
+	SMU_CUSTOM_FAN_SPEED_PWM = 1 << 1,
+};
+

[Guchun]A coding style problem. Put '{' on the same line as custom_fan_speed_mode.

struct smu_user_dpm_profile {
uint32_t fan_mode;
uint32_t power_limit;
+ uint32_t custom_fan_speed;
uint32_t fan_speed_percent;
+ uint32_t fan_speed_rpm;
uint32_t flags;

/* user clock state information */

drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +5 -0
index 576e9ea68fd1..9a25443988e3 100644
@@ -414,6 +414,12 @@ static void smu_restore_dpm_user_profile(struct smu_context *smu)
 			if (ret)
 				dev_err(smu->adev->dev, "Failed to set manual fan speed\n");
 		}
+
+		if (!ret && smu->user_dpm_profile.fan_speed_rpm) {
+			ret = smu_set_fan_speed_rpm(smu, smu->user_dpm_profile.fan_speed_rpm);
+			if (ret)
+				dev_err(smu->adev->dev, "Failed to set manual fan speed\n");

[Guchun] The error log is the same as above error case. It should help debug if we can improve it a bit to be well distinguished.

+ }
}

/* Disable restore flag */
@@ -2166,7 +2172,6 @@ static int smu_set_gfx_cgpg(struct smu_context *smu, bool enabled) static int smu_set_fan_speed_rpm(void *handle, uint32_t speed) {
struct smu_context *smu = handle;
- u32 percent;
int ret = 0;

if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled) @@ -2177,8 +2182,8 @@ static int smu_set_fan_speed_rpm(void *handle, uint32_t speed) if (smu->ppt_funcs->set_fan_speed_rpm) {
ret = smu->ppt_funcs->set_fan_speed_rpm(smu, speed);
if (!ret && smu->user_dpm_profile.flags & SMU_DPM_USER_PROFILE_RESTORE) {
- percent = speed * 100 / smu->fan_max_rpm;
- smu->user_dpm_profile.fan_speed_percent = percent;
+ smu->user_dpm_profile.custom_fan_speed |= SMU_CUSTOM_FAN_SPEED_RPM;
+ smu->user_dpm_profile.fan_speed_rpm = speed;
}
}

@@ -2539,8 +2544,11 @@ static int smu_set_fan_control_mode(struct smu_context *smu, int value)

/* reset user dpm fan speed */
if (!ret && value != AMD_FAN_CTRL_MANUAL &&
- !(smu->user_dpm_profile.flags & SMU_DPM_USER_PROFILE_RESTORE))
+ !(smu->user_dpm_profile.flags & SMU_DPM_USER_PROFILE_RESTORE)) {
smu->user_dpm_profile.fan_speed_percent = 0;
+ smu->user_dpm_profile.fan_speed_rpm = 0;
+ smu->user_dpm_profile.custom_fan_speed = 0;
+ }

return ret;
}
@@ -2591,8 +2599,10 @@ static int smu_set_fan_speed_percent(void *handle, u32 speed)
if (speed > 100)
speed = 100;
ret = smu->ppt_funcs->set_fan_speed_percent(smu, speed);
- if (!ret && !(smu->user_dpm_profile.flags & SMU_DPM_USER_PROFILE_RESTORE))
+ if (!ret && !(smu->user_dpm_profile.flags & SMU_DPM_USER_PROFILE_RESTORE)) {
+ smu->user_dpm_profile.custom_fan_speed |= SMU_CUSTOM_FAN_SPEED_PWM;
smu->user_dpm_profile.fan_speed_percent = speed;
+ }
}

mutex_unlock(&smu->mutex);
--
2.29.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&amp;data=04%7C01%7Cguchun.chen%40amd.com%7C4a4ff7eeef7a40c12be008d940ead96d%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637612199692523088%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=y%2Fk78g%2FRdJ7kEjzHHpfo7DeEUo0hfCOVOH24aTiqG4g%3D&amp;reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#3 lore raw

Re: [PATCH 2/7] drm/amd/pm: record the RPM and PWM based fan speed settings

In reply to Evan Quan
Quoted 19 lines · Evan Quan

As the relationship "PWM = RPM / smu->fan_max_rpm" between fan speed PWM and RPM is not true for SMU11 ASICs. So, both the RPM and PWM settings need to be saved.

Change-Id I318c134d442273d518b805339cdf383e151b935d
---
  drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h   |  8 ++++++++
  drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 20 +++++++++++++++-----
  2 files changed, 23 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +0 -0
index 6301e4cb3c2a..fa585f0be530 100644
@@ -226,10 +226,18 @@ enum smu_memory_pool_size
      SMU_MEMORY_POOL_SIZE_2_GB   = 0x80000000,
  };
 

drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h enum smu_memory_pool_size · line 238

Quoted 10 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +7 -0
+enum custom_fan_speed_mode
+{
+	SMU_CUSTOM_FAN_SPEED_RPM = 1 << 0,
+	SMU_CUSTOM_FAN_SPEED_PWM = 1 << 1,
+};
+
  struct smu_user_dpm_profile {
  	uint32_t fan_mode;
  	uint32_t power_limit;
+	uint32_t custom_fan_speed;

Use the flags field to indicate if custom mode uses PWM or RPM, no need to have a separate field.

Thanks,
Lijo

Quoted 57 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +1 -0
  	uint32_t fan_speed_percent;
+	uint32_t fan_speed_rpm;
  	uint32_t flags;
 
  	/* user clock state information */
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +12 -4
index 576e9ea68fd1..9a25443988e3 100644
@@ -414,6 +414,12 @@ static void smu_restore_dpm_user_profile(struct smu_context *smu)
  			if (ret)
  				dev_err(smu->adev->dev, "Failed to set manual fan speed\n");
  		}
+
+		if (!ret && smu->user_dpm_profile.fan_speed_rpm) {
+			ret = smu_set_fan_speed_rpm(smu, smu->user_dpm_profile.fan_speed_rpm);
+			if (ret)
+				dev_err(smu->adev->dev, "Failed to set manual fan speed\n");
+		}
  	}
 
  	/* Disable restore flag */
@@ -2166,7 +2172,6 @@ static int smu_set_gfx_cgpg(struct smu_context *smu, bool enabled)
  static int smu_set_fan_speed_rpm(void *handle, uint32_t speed)
  {
  	struct smu_context *smu = handle;
-	u32 percent;
  	int ret = 0;
 
  	if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled)
@@ -2177,8 +2182,8 @@ static int smu_set_fan_speed_rpm(void *handle, uint32_t speed)
  	if (smu->ppt_funcs->set_fan_speed_rpm) {
  		ret = smu->ppt_funcs->set_fan_speed_rpm(smu, speed);
  		if (!ret && smu->user_dpm_profile.flags & SMU_DPM_USER_PROFILE_RESTORE) {
-			percent = speed * 100 / smu->fan_max_rpm;
-			smu->user_dpm_profile.fan_speed_percent = percent;
+			smu->user_dpm_profile.custom_fan_speed |= SMU_CUSTOM_FAN_SPEED_RPM;
+			smu->user_dpm_profile.fan_speed_rpm = speed;
  		}
  	}
 
@@ -2539,8 +2544,11 @@ static int smu_set_fan_control_mode(struct smu_context *smu, int value)
 
  	/* reset user dpm fan speed */
  	if (!ret && value != AMD_FAN_CTRL_MANUAL &&
-			!(smu->user_dpm_profile.flags & SMU_DPM_USER_PROFILE_RESTORE))
+			!(smu->user_dpm_profile.flags & SMU_DPM_USER_PROFILE_RESTORE)) {
  		smu->user_dpm_profile.fan_speed_percent = 0;
+		smu->user_dpm_profile.fan_speed_rpm = 0;
+		smu->user_dpm_profile.custom_fan_speed = 0;
+	}
 
  	return ret;
  }
@@ -2591,8 +2599,10 @@ static int smu_set_fan_speed_percent(void *handle, u32 speed)
  		if (speed > 100)

drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c static int smu_set_fan_speed_percent(void *handle, u32 speed) · line 2608

Quoted 10 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +3 -1
  			speed = 100;
  		ret = smu->ppt_funcs->set_fan_speed_percent(smu, speed);
-		if (!ret && !(smu->user_dpm_profile.flags & SMU_DPM_USER_PROFILE_RESTORE))
+		if (!ret && !(smu->user_dpm_profile.flags & SMU_DPM_USER_PROFILE_RESTORE)) {
+			smu->user_dpm_profile.custom_fan_speed |= SMU_CUSTOM_FAN_SPEED_PWM;
  			smu->user_dpm_profile.fan_speed_percent = speed;
+		}
  	}
 
  	mutex_unlock(&smu->mutex);

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

author
#4 lore raw

PATCH 3/7 drm/amd/pm: correct the fan speed PWM retrieving

In reply to Evan Quan

The relationship "PWM = RPM / smu->fan_max_rpm" between fan speed PWM and RPM is not true for SMU11 ASICs. So, we need a new way to retrieving the fan speed PWM.

Change-Id Idfe0276d7113b9c921b88fa08085a33fd971d621
---
 .../include/asic_reg/thm/thm_11_0_2_offset.h  |  3 ++
 .../include/asic_reg/thm/thm_11_0_2_sh_mask.h |  3 ++
 drivers/gpu/drm/amd/pm/inc/smu_v11_0.h        |  3 ++
 .../amd/pm/powerplay/hwmgr/vega20_thermal.c   | 24 ++++++++-----
 .../gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 25 +------------
 .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c   | 25 +------------
 .../amd/pm/swsmu/smu11/sienna_cichlid_ppt.c   | 25 +------------
 .../gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c    | 35 +++++++++++++++++++
 8 files changed, 62 insertions(+), 81 deletions(-)
drivers/gpu/drm/amd/include/asic_reg/thm/thm_11_0_2_offset.h +3 -0
index a485526f3a51..eca96abef445 100644
@@ -49,4 +49,7 @@
 #define mmTHM_BACO_CNTL                                                                                0x0081
 #define mmTHM_BACO_CNTL_BASE_IDX                                                                       0
 
+#define mmCG_THERMAL_STATUS                                                                            0x006C
+#define mmCG_THERMAL_STATUS_BASE_IDX                                                                   0
+
 #endif
drivers/gpu/drm/amd/include/asic_reg/thm/thm_11_0_2_sh_mask.h +3 -0
index d130d92aee19..f2f9eae9a68f 100644
@@ -92,5 +92,8 @@
 #define THM_TCON_THERM_TRIP__RSVD3_MASK                                                                       0x7FFFC000L
 #define THM_TCON_THERM_TRIP__SW_THERM_TP_MASK                                                                 0x80000000L
 
+#define CG_THERMAL_STATUS__FDO_PWM_DUTY__SHIFT                                                                0x9
+#define CG_THERMAL_STATUS__FDO_PWM_DUTY_MASK                                                                  0x0001FE00L
+
 #endif
 
drivers/gpu/drm/amd/pm/inc/smu_v11_0.h +3 -0
index 134a33e3de91..8e0f8e9a1665 100644
@@ -226,6 +226,9 @@ int smu_v11_0_set_fan_speed_percent(struct smu_context *smu,
 int smu_v11_0_set_fan_speed_rpm(struct smu_context *smu,
 				uint32_t speed);
 
+int smu_v11_0_get_fan_speed_percent(struct smu_context *smu,
+				    uint32_t *speed);
+
 int smu_v11_0_set_xgmi_pstate(struct smu_context *smu,
 				     uint32_t pstate);
 
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_thermal.c +15 -9
index 269dd7e95a44..43d754952bd9 100644
@@ -117,18 +117,24 @@ static int vega20_get_current_rpm(struct pp_hwmgr *hwmgr, uint32_t *current_rpm)
 int vega20_fan_ctrl_get_fan_speed_percent(struct pp_hwmgr *hwmgr,
 		uint32_t *speed)
 {
-	struct vega20_hwmgr *data = (struct vega20_hwmgr *)(hwmgr->backend);
-	PPTable_t *pp_table = &(data->smc_state_table.pp_table);
-	uint32_t current_rpm, percent = 0;
-	int ret = 0;
+	struct amdgpu_device *adev = hwmgr->adev;
+	uint32_t duty100, duty;
+	uint64_t tmp64;
 
-	ret = vega20_get_current_rpm(hwmgr, &current_rpm);
-	if (ret)
-		return ret;
+	duty100 = REG_GET_FIELD(RREG32_SOC15(THM, 0, mmCG_FDO_CTRL1),
+				CG_FDO_CTRL1, FMAX_DUTY100);
+	duty = REG_GET_FIELD(RREG32_SOC15(THM, 0, mmCG_THERMAL_STATUS),
+				CG_THERMAL_STATUS, FDO_PWM_DUTY);
+
+	if (!duty100)
+		return -EINVAL;
 
-	percent = current_rpm * 100 / pp_table->FanMaximumRpm;
+	tmp64 = (uint64_t)duty * 100;
+	do_div(tmp64, duty100);
+	*speed = (uint32_t)tmp64;
 
-	*speed = percent > 100 ? 100 : percent;
+	if (*speed > 100)
+		*speed = 100;
 
 	return 0;
 }
drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c +1 -24
index 047adf6dd444..4a6544b8e05e 100644
@@ -1162,29 +1162,6 @@ static int arcturus_read_sensor(struct smu_context *smu,
 	return ret;
 }
 
-static int arcturus_get_fan_speed_percent(struct smu_context *smu,
-					  uint32_t *speed)
-{
-	int ret;
-	u32 rpm;
-
-	if (!speed)
-		return -EINVAL;
-
-	switch (smu_v11_0_get_fan_control_mode(smu)) {
-	case AMD_FAN_CTRL_AUTO:
-		ret = arcturus_get_smu_metrics_data(smu,
-						    METRICS_CURR_FANSPEED,
-						    &rpm);
-		if (!ret && smu->fan_max_rpm)
-			*speed = rpm * 100 / smu->fan_max_rpm;
-		return ret;
-	default:
-		*speed = smu->user_dpm_profile.fan_speed_percent;
-		return 0;
-	}
-}
-
 static int arcturus_get_fan_parameters(struct smu_context *smu)
 {
 	PPTable_t *pptable = smu->smu_table.driver_pptable;
@@ -2268,7 +2245,7 @@ static const struct pptable_funcs arcturus_ppt_funcs = {
 	.print_clk_levels = arcturus_print_clk_levels,
 	.force_clk_levels = arcturus_force_clk_levels,
 	.read_sensor = arcturus_read_sensor,
-	.get_fan_speed_percent = arcturus_get_fan_speed_percent,
+	.get_fan_speed_percent = smu_v11_0_get_fan_speed_percent,
 	.get_power_profile_mode = arcturus_get_power_profile_mode,
 	.set_power_profile_mode = arcturus_set_power_profile_mode,
 	.set_performance_level = arcturus_set_performance_level,
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1 -24
index d8a011483dcf..2ddf35788672 100644
@@ -1668,29 +1668,6 @@ static bool navi10_is_dpm_running(struct smu_context *smu)
 	return !!(feature_enabled & SMC_DPM_FEATURE);
 }
 
-static int navi10_get_fan_speed_percent(struct smu_context *smu,
-					uint32_t *speed)
-{
-	int ret;
-	u32 rpm;
-
-	if (!speed)
-		return -EINVAL;
-
-	switch (smu_v11_0_get_fan_control_mode(smu)) {
-	case AMD_FAN_CTRL_AUTO:
-		ret = navi1x_get_smu_metrics_data(smu,
-						  METRICS_CURR_FANSPEED,
-						  &rpm);
-		if (!ret && smu->fan_max_rpm)
-			*speed = rpm * 100 / smu->fan_max_rpm;
-		return ret;
-	default:
-		*speed = smu->user_dpm_profile.fan_speed_percent;
-		return 0;
-	}
-}
-
 static int navi10_get_fan_parameters(struct smu_context *smu)
 {
 	PPTable_t *pptable = smu->smu_table.driver_pptable;
@@ -3204,7 +3181,7 @@ static const struct pptable_funcs navi10_ppt_funcs = {
 	.display_config_changed = navi10_display_config_changed,
 	.notify_smc_display_config = navi10_notify_smc_display_config,
 	.is_dpm_running = navi10_is_dpm_running,
-	.get_fan_speed_percent = navi10_get_fan_speed_percent,
+	.get_fan_speed_percent = smu_v11_0_get_fan_speed_percent,
 	.get_power_profile_mode = navi10_get_power_profile_mode,
 	.set_power_profile_mode = navi10_set_power_profile_mode,
 	.set_watermarks_table = navi10_set_watermarks_table,
drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +1 -24
index dad120294c19..e7686ce6744b 100644
@@ -1355,29 +1355,6 @@ static bool sienna_cichlid_is_dpm_running(struct smu_context *smu)
 	return !!(feature_enabled & SMC_DPM_FEATURE);
 }
 
-static int sienna_cichlid_get_fan_speed_percent(struct smu_context *smu,
-						uint32_t *speed)
-{
-	int ret;
-	u32 rpm;
-
-	if (!speed)
-		return -EINVAL;
-
-	switch (smu_v11_0_get_fan_control_mode(smu)) {
-	case AMD_FAN_CTRL_AUTO:
-		ret = sienna_cichlid_get_smu_metrics_data(smu,
-							  METRICS_CURR_FANSPEED,
-							  &rpm);
-		if (!ret && smu->fan_max_rpm)
-			*speed = rpm * 100 / smu->fan_max_rpm;
-		return ret;
-	default:
-		*speed = smu->user_dpm_profile.fan_speed_percent;
-		return 0;
-	}
-}
-
 static int sienna_cichlid_get_fan_parameters(struct smu_context *smu)
 {
 	uint16_t *table_member;
@@ -3842,7 +3819,7 @@ static const struct pptable_funcs sienna_cichlid_ppt_funcs = {
 	.display_config_changed = sienna_cichlid_display_config_changed,
 	.notify_smc_display_config = sienna_cichlid_notify_smc_display_config,
 	.is_dpm_running = sienna_cichlid_is_dpm_running,
-	.get_fan_speed_percent = sienna_cichlid_get_fan_speed_percent,
+	.get_fan_speed_percent = smu_v11_0_get_fan_speed_percent,
 	.get_power_profile_mode = sienna_cichlid_get_power_profile_mode,
 	.set_power_profile_mode = sienna_cichlid_set_power_profile_mode,
 	.set_watermarks_table = sienna_cichlid_set_watermarks_table,
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +35 -0
index fefc8e93fdc6..c49683b07076 100644
@@ -1249,6 +1249,41 @@ int smu_v11_0_set_fan_speed_rpm(struct smu_context *smu,
 	return ret;
 }
 
+int smu_v11_0_get_fan_speed_percent(struct smu_context *smu,
+				    uint32_t *speed)
+{
+	struct amdgpu_device *adev = smu->adev;
+	uint32_t duty100, duty;
+	uint64_t tmp64;
+
+	/*
+	 * For pre Sienna Cichlid ASICs, the 0 RPM may be not correctly
+	 * detected via register retrieving. To workaround this, we will
+	 * report the fan speed as 0 PWM if user just requested such.
+	 */
+	if ((smu->user_dpm_profile.custom_fan_speed & SMU_CUSTOM_FAN_SPEED_PWM)
+	     && !smu->user_dpm_profile.fan_speed_percent) {
+		*speed = 0;
+		return 0;
+	}
+
+	duty100 = REG_GET_FIELD(RREG32_SOC15(THM, 0, mmCG_FDO_CTRL1),
+				CG_FDO_CTRL1, FMAX_DUTY100);
+	duty = REG_GET_FIELD(RREG32_SOC15(THM, 0, mmCG_THERMAL_STATUS),
+				CG_THERMAL_STATUS, FDO_PWM_DUTY);
+	if (!duty100)
+		return -EINVAL;
+
+	tmp64 = (uint64_t)duty * 100;
+	do_div(tmp64, duty100);
+	*speed = (uint32_t)tmp64;
+
+	if (*speed > 100)
+		*speed = 100;
+
+	return 0;
+}
+
 int
 smu_v11_0_set_fan_control_mode(struct smu_context *smu,
 			       uint32_t mode)
Signature · 6 lines
2.29.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#5 lore raw

Re: [PATCH 3/7] drm/amd/pm: correct the fan speed PWM retrieving

Quoted 81 lines · Evan Quan

The relationship "PWM = RPM / smu->fan_max_rpm" between fan speed PWM and RPM is not true for SMU11 ASICs. So, we need a new way to retrieving the fan speed PWM.

Change-Id Idfe0276d7113b9c921b88fa08085a33fd971d621
---
  .../include/asic_reg/thm/thm_11_0_2_offset.h  |  3 ++
  .../include/asic_reg/thm/thm_11_0_2_sh_mask.h |  3 ++
  drivers/gpu/drm/amd/pm/inc/smu_v11_0.h        |  3 ++
  .../amd/pm/powerplay/hwmgr/vega20_thermal.c   | 24 ++++++++-----
  .../gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 25 +------------
  .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c   | 25 +------------
  .../amd/pm/swsmu/smu11/sienna_cichlid_ppt.c   | 25 +------------
  .../gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c    | 35 +++++++++++++++++++
  8 files changed, 62 insertions(+), 81 deletions(-)
drivers/gpu/drm/amd/include/asic_reg/thm/thm_11_0_2_offset.h +3 -0
index a485526f3a51..eca96abef445 100644
@@ -49,4 +49,7 @@
  #define mmTHM_BACO_CNTL                                                                                0x0081
  #define mmTHM_BACO_CNTL_BASE_IDX                                                                       0
 
+#define mmCG_THERMAL_STATUS                                                                            0x006C
+#define mmCG_THERMAL_STATUS_BASE_IDX                                                                   0
+
  #endif
drivers/gpu/drm/amd/include/asic_reg/thm/thm_11_0_2_sh_mask.h +3 -0
index d130d92aee19..f2f9eae9a68f 100644
@@ -92,5 +92,8 @@
  #define THM_TCON_THERM_TRIP__RSVD3_MASK                                                                       0x7FFFC000L
  #define THM_TCON_THERM_TRIP__SW_THERM_TP_MASK                                                                 0x80000000L
 
+#define CG_THERMAL_STATUS__FDO_PWM_DUTY__SHIFT                                                                0x9
+#define CG_THERMAL_STATUS__FDO_PWM_DUTY_MASK                                                                  0x0001FE00L
+
  #endif
 
drivers/gpu/drm/amd/pm/inc/smu_v11_0.h +3 -0
index 134a33e3de91..8e0f8e9a1665 100644
@@ -226,6 +226,9 @@ int smu_v11_0_set_fan_speed_percent(struct smu_context *smu,
  int smu_v11_0_set_fan_speed_rpm(struct smu_context *smu,
  				uint32_t speed);
 
+int smu_v11_0_get_fan_speed_percent(struct smu_context *smu,
+				    uint32_t *speed);
+
  int smu_v11_0_set_xgmi_pstate(struct smu_context *smu,
  				     uint32_t pstate);
 
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_thermal.c +9 -7
index 269dd7e95a44..43d754952bd9 100644
@@ -117,18 +117,24 @@ static int vega20_get_current_rpm(struct pp_hwmgr *hwmgr, uint32_t *current_rpm)
  int vega20_fan_ctrl_get_fan_speed_percent(struct pp_hwmgr *hwmgr,
  		uint32_t *speed)
  {
-	struct vega20_hwmgr *data = (struct vega20_hwmgr *)(hwmgr->backend);
-	PPTable_t *pp_table = &(data->smc_state_table.pp_table);
-	uint32_t current_rpm, percent = 0;
-	int ret = 0;
+	struct amdgpu_device *adev = hwmgr->adev;
+	uint32_t duty100, duty;
+	uint64_t tmp64;
 
-	ret = vega20_get_current_rpm(hwmgr, &current_rpm);
-	if (ret)
-		return ret;
+	duty100 = REG_GET_FIELD(RREG32_SOC15(THM, 0, mmCG_FDO_CTRL1),
+				CG_FDO_CTRL1, FMAX_DUTY100);
+	duty = REG_GET_FIELD(RREG32_SOC15(THM, 0, mmCG_THERMAL_STATUS),
+				CG_THERMAL_STATUS, FDO_PWM_DUTY);
+
+	if (!duty100)

drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_thermal.c static int vega20_get_current_rpm(struct pp_hwmgr *hwmgr, uint32_t *current_rpm) · line 137

Quoted 10 lines
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_thermal.c +6 -2
+		return -EINVAL;
 
-	percent = current_rpm * 100 / pp_table->FanMaximumRpm;
+	tmp64 = (uint64_t)duty * 100;
+	do_div(tmp64, duty100);
+	*speed = (uint32_t)tmp64;
 
-	*speed = percent > 100 ? 100 : percent;
+	if (*speed > 100)
+		*speed = 100;

Patch 5 avoids conversion as the relation between PWM and RPM is not linear. Suggest to return PWM value (0-255) directly instead of percentage. Since the function cannot be reused for rpm, it may make sense to rename to set/get pwm instead of percent.

Thanks,
Lijo

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

author
#6 lore raw

PATCH 4/7 drm/amd/pm: correct the fan speed RPM retrieving

In reply to Evan Quan

The relationship "PWM = RPM / smu->fan_max_rpm" between fan speed PWM and RPM is not true for SMU11 ASICs. So, we need a new way to retrieving the fan speed RPM.

Change-Id Ife4298c8b7ec93ef023a7da27d59654e0444e044
---
 .../include/asic_reg/thm/thm_11_0_2_offset.h  |  3 ++
 drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h       |  5 ++++
 drivers/gpu/drm/amd/pm/inc/smu_v11_0.h        |  3 ++
 drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c     |  7 ++---
 .../gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 24 ++++++++++++++++
 .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c   | 24 ++++++++++++++++
 .../amd/pm/swsmu/smu11/sienna_cichlid_ppt.c   | 21 ++++++++++++++
 .../gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c    | 28 +++++++++++++++++++
 8 files changed, 110 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/include/asic_reg/thm/thm_11_0_2_offset.h +3 -0
index eca96abef445..8474f419caa5 100644
@@ -38,6 +38,9 @@
 #define mmCG_TACH_CTRL                                                                                 0x006a
 #define mmCG_TACH_CTRL_BASE_IDX                                                                        0
 
+#define mmCG_TACH_STATUS                                                                               0x006b
+#define mmCG_TACH_STATUS_BASE_IDX                                                                      0
+
 #define mmTHM_THERMAL_INT_ENA                                                                          0x000a
 #define mmTHM_THERMAL_INT_ENA_BASE_IDX                                                                 0
 #define mmTHM_THERMAL_INT_CTRL                                                                         0x000b
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +5 -0
index fa585f0be530..db5123fc6042 100644
@@ -726,6 +726,11 @@ struct pptable_funcs {
 	 */
 	int (*get_fan_speed_percent)(struct smu_context *smu, uint32_t *speed);
 
+	/**
+	 * @get_fan_speed_rpm: Get the current fan speed in rpm.
+	 */
+	int (*get_fan_speed_rpm)(struct smu_context *smu, uint32_t *speed);
+
 	/**
 	 * @set_watermarks_table: Configure and upload the watermarks tables to
 	 *                        the SMU.
drivers/gpu/drm/amd/pm/inc/smu_v11_0.h +3 -0
index 8e0f8e9a1665..05c8fc8fc3f9 100644
@@ -229,6 +229,9 @@ int smu_v11_0_set_fan_speed_rpm(struct smu_context *smu,
 int smu_v11_0_get_fan_speed_percent(struct smu_context *smu,
 				    uint32_t *speed);
 
+int smu_v11_0_get_fan_speed_rpm(struct smu_context *smu,
+				uint32_t *speed);
+
 int smu_v11_0_set_xgmi_pstate(struct smu_context *smu,
 				     uint32_t pstate);
 
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +2 -5
index 9a25443988e3..54fb3d7d23ee 100644
@@ -2614,17 +2614,14 @@ static int smu_get_fan_speed_rpm(void *handle, uint32_t *speed)
 {
 	struct smu_context *smu = handle;
 	int ret = 0;
-	u32 percent;
 
 	if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled)
 		return -EOPNOTSUPP;
 
 	mutex_lock(&smu->mutex);
 
-	if (smu->ppt_funcs->get_fan_speed_percent) {
-		ret = smu->ppt_funcs->get_fan_speed_percent(smu, &percent);
-		*speed = percent * smu->fan_max_rpm / 100;
-	}
+	if (smu->ppt_funcs->get_fan_speed_rpm)
+		ret = smu->ppt_funcs->get_fan_speed_rpm(smu, speed);
 
 	mutex_unlock(&smu->mutex);
 
drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c +24 -0
index 4a6544b8e05e..e3303c8dcaca 100644
@@ -1162,6 +1162,29 @@ static int arcturus_read_sensor(struct smu_context *smu,
 	return ret;
 }
 
+static int arcturus_get_fan_speed_rpm(struct smu_context *smu,
+				      uint32_t *speed)
+{
+	int ret = 0;
+
+	if (!speed)
+		return -EINVAL;
+
+	switch (smu_v11_0_get_fan_control_mode(smu)) {
+	case AMD_FAN_CTRL_AUTO:
+		ret = arcturus_get_smu_metrics_data(smu,
+						    METRICS_CURR_FANSPEED,
+						    speed);
+		break;
+	default:
+		ret = smu_v11_0_get_fan_speed_rpm(smu,
+						  speed);
+		break;
+	}
+
+	return ret;
+}
+
 static int arcturus_get_fan_parameters(struct smu_context *smu)
 {
 	PPTable_t *pptable = smu->smu_table.driver_pptable;
@@ -2246,6 +2269,7 @@ static const struct pptable_funcs arcturus_ppt_funcs = {
 	.force_clk_levels = arcturus_force_clk_levels,
 	.read_sensor = arcturus_read_sensor,
 	.get_fan_speed_percent = smu_v11_0_get_fan_speed_percent,
+	.get_fan_speed_rpm = arcturus_get_fan_speed_rpm,
 	.get_power_profile_mode = arcturus_get_power_profile_mode,
 	.set_power_profile_mode = arcturus_set_power_profile_mode,
 	.set_performance_level = arcturus_set_performance_level,
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +24 -0
index 2ddf35788672..7dce5ea7c1a0 100644
@@ -1668,6 +1668,29 @@ static bool navi10_is_dpm_running(struct smu_context *smu)
 	return !!(feature_enabled & SMC_DPM_FEATURE);
 }
 
+static int navi10_get_fan_speed_rpm(struct smu_context *smu,
+				    uint32_t *speed)
+{
+	int ret = 0;
+
+	if (!speed)
+		return -EINVAL;
+
+	switch (smu_v11_0_get_fan_control_mode(smu)) {
+	case AMD_FAN_CTRL_AUTO:
+		ret = navi10_get_smu_metrics_data(smu,
+						  METRICS_CURR_FANSPEED,
+						  speed);
+		break;
+	default:
+		ret = smu_v11_0_get_fan_speed_rpm(smu,
+						  speed);
+		break;
+	}
+
+	return ret;
+}
+
 static int navi10_get_fan_parameters(struct smu_context *smu)
 {
 	PPTable_t *pptable = smu->smu_table.driver_pptable;
@@ -3182,6 +3205,7 @@ static const struct pptable_funcs navi10_ppt_funcs = {
 	.notify_smc_display_config = navi10_notify_smc_display_config,
 	.is_dpm_running = navi10_is_dpm_running,
 	.get_fan_speed_percent = smu_v11_0_get_fan_speed_percent,
+	.get_fan_speed_rpm = navi10_get_fan_speed_rpm,
 	.get_power_profile_mode = navi10_get_power_profile_mode,
 	.set_power_profile_mode = navi10_set_power_profile_mode,
 	.set_watermarks_table = navi10_set_watermarks_table,
drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +21 -0
index e7686ce6744b..2f93dc4b5968 100644
@@ -1355,6 +1355,26 @@ static bool sienna_cichlid_is_dpm_running(struct smu_context *smu)
 	return !!(feature_enabled & SMC_DPM_FEATURE);
 }
 
+static int sienna_cichlid_get_fan_speed_rpm(struct smu_context *smu,
+					    uint32_t *speed)
+{
+	int ret = 0;
+
+	if (!speed)
+		return -EINVAL;
+
+	/*
+	 * For Sienna_Cichlid and later, the fan speed(rpm) reported
+	 * by pmfw is always trustable(even when the fan control feature
+	 * disabled or 0 RPM kicked in).
+	 */
+	ret = sienna_cichlid_get_smu_metrics_data(smu,
+						  METRICS_CURR_FANSPEED,
+						  speed);
+
+	return ret;
+}
+
 static int sienna_cichlid_get_fan_parameters(struct smu_context *smu)
 {
 	uint16_t *table_member;
@@ -3820,6 +3840,7 @@ static const struct pptable_funcs sienna_cichlid_ppt_funcs = {
 	.notify_smc_display_config = sienna_cichlid_notify_smc_display_config,
 	.is_dpm_running = sienna_cichlid_is_dpm_running,
 	.get_fan_speed_percent = smu_v11_0_get_fan_speed_percent,
+	.get_fan_speed_rpm = sienna_cichlid_get_fan_speed_rpm,
 	.get_power_profile_mode = sienna_cichlid_get_power_profile_mode,
 	.set_power_profile_mode = sienna_cichlid_set_power_profile_mode,
 	.set_watermarks_table = sienna_cichlid_set_watermarks_table,
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +28 -0
index c49683b07076..0cdf55a0dba2 100644
@@ -1284,6 +1284,34 @@ int smu_v11_0_get_fan_speed_percent(struct smu_context *smu,
 	return 0;
 }
 
+int smu_v11_0_get_fan_speed_rpm(struct smu_context *smu,
+				uint32_t *speed)
+{
+	struct amdgpu_device *adev = smu->adev;
+	uint32_t tach_status, crystal_clock_freq;
+	uint64_t tmp64;
+
+	/*
+	 * For pre Sienna Cichlid ASICs, the 0 RPM may be not correctly
+	 * detected via register retrieving. To workaround this, we will
+	 * report the fan speed as 0 RPM if user just requested such.
+	 */
+	if ((smu->user_dpm_profile.custom_fan_speed & SMU_CUSTOM_FAN_SPEED_RPM)
+	     && !smu->user_dpm_profile.fan_speed_rpm) {
+		*speed = 0;
+		return 0;
+	}
+
+	crystal_clock_freq = amdgpu_asic_get_xclk(adev) / 4;
+	tmp64 = (uint64_t)crystal_clock_freq * 60 * 10000;
+
+	tach_status = RREG32_SOC15(THM, 0, mmCG_TACH_STATUS);
+	do_div(tmp64, tach_status);
+	*speed = (uint32_t)tmp64;
+
+	return 0;
+}
+
 int
 smu_v11_0_set_fan_control_mode(struct smu_context *smu,
 			       uint32_t mode)
Signature · 6 lines
2.29.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#7 lore raw

RE: [PATCH 4/7] drm/amd/pm: correct the fan speed RPM retrieving

[Public]

A comment inline.

Regards,
Guchun

-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Evan Quan
Sent: Wednesday, July 7, 2021 9:57 AM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; Quan, Evan <[email protected]>
Subject: [PATCH 4/7] drm/amd/pm: correct the fan speed RPM retrieving

The relationship "PWM = RPM / smu->fan_max_rpm" between fan speed PWM and RPM is not true for SMU11 ASICs. So, we need a new way to retrieving the fan speed RPM.

Change-Id Ife4298c8b7ec93ef023a7da27d59654e0444e044
---
 .../include/asic_reg/thm/thm_11_0_2_offset.h  |  3 ++
 drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h       |  5 ++++
 drivers/gpu/drm/amd/pm/inc/smu_v11_0.h        |  3 ++
 drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c     |  7 ++---
 .../gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 24 ++++++++++++++++
 .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c   | 24 ++++++++++++++++
 .../amd/pm/swsmu/smu11/sienna_cichlid_ppt.c   | 21 ++++++++++++++
 .../gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c    | 28 +++++++++++++++++++
 8 files changed, 110 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/include/asic_reg/thm/thm_11_0_2_offset.h +3 -0
index eca96abef445..8474f419caa5 100644
@@ -38,6 +38,9 @@
 #define mmCG_TACH_CTRL                                                                                 0x006a
 #define mmCG_TACH_CTRL_BASE_IDX                                                                        0
 
+#define mmCG_TACH_STATUS                                                                               0x006b
+#define mmCG_TACH_STATUS_BASE_IDX                                                                      0
+
 #define mmTHM_THERMAL_INT_ENA                                                                          0x000a
 #define mmTHM_THERMAL_INT_ENA_BASE_IDX                                                                 0
 #define mmTHM_THERMAL_INT_CTRL                                                                         0x000b
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +5 -0
index fa585f0be530..db5123fc6042 100644
@@ -726,6 +726,11 @@ struct pptable_funcs {
 	 */
 	int (*get_fan_speed_percent)(struct smu_context *smu, uint32_t *speed);
 
+	/**
+	 * @get_fan_speed_rpm: Get the current fan speed in rpm.
+	 */
+	int (*get_fan_speed_rpm)(struct smu_context *smu, uint32_t *speed);
+
 	/**
 	 * @set_watermarks_table: Configure and upload the watermarks tables to
 	 *                        the SMU.
drivers/gpu/drm/amd/pm/inc/smu_v11_0.h +3 -0
index 8e0f8e9a1665..05c8fc8fc3f9 100644
@@ -229,6 +229,9 @@ int smu_v11_0_set_fan_speed_rpm(struct smu_context *smu,  int smu_v11_0_get_fan_speed_percent(struct smu_context *smu,
 				    uint32_t *speed);
 
+int smu_v11_0_get_fan_speed_rpm(struct smu_context *smu,
+				uint32_t *speed);
+
 int smu_v11_0_set_xgmi_pstate(struct smu_context *smu,
 				     uint32_t pstate);
 
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +2 -5
index 9a25443988e3..54fb3d7d23ee 100644
@@ -2614,17 +2614,14 @@ static int smu_get_fan_speed_rpm(void *handle, uint32_t *speed)  {
 	struct smu_context *smu = handle;
 	int ret = 0;
-	u32 percent;
 
 	if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled)
 		return -EOPNOTSUPP;
 
 	mutex_lock(&smu->mutex);
 
-	if (smu->ppt_funcs->get_fan_speed_percent) {
-		ret = smu->ppt_funcs->get_fan_speed_percent(smu, &percent);
-		*speed = percent * smu->fan_max_rpm / 100;
-	}
+	if (smu->ppt_funcs->get_fan_speed_rpm)
+		ret = smu->ppt_funcs->get_fan_speed_rpm(smu, speed);
 
 	mutex_unlock(&smu->mutex);
 
drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c +23 -0
index 4a6544b8e05e..e3303c8dcaca 100644
@@ -1162,6 +1162,29 @@ static int arcturus_read_sensor(struct smu_context *smu,
 	return ret;
 }
 
+static int arcturus_get_fan_speed_rpm(struct smu_context *smu,
+				      uint32_t *speed)
+{
+	int ret = 0;
+
+	if (!speed)
+		return -EINVAL;
+
+	switch (smu_v11_0_get_fan_control_mode(smu)) {
+	case AMD_FAN_CTRL_AUTO:
+		ret = arcturus_get_smu_metrics_data(smu,
+						    METRICS_CURR_FANSPEED,
+						    speed);
+		break;
+	default:
+		ret = smu_v11_0_get_fan_speed_rpm(smu,
+						  speed);
+		break;
+	}
+
+	return ret;
+}
+
 static int arcturus_get_fan_parameters(struct smu_context *smu)  {
 	PPTable_t *pptable = smu->smu_table.driver_pptable; @@ -2246,6 +2269,7 @@ static const struct pptable_funcs arcturus_ppt_funcs = {
 	.force_clk_levels = arcturus_force_clk_levels,

.read_sensor = arcturus_read_sensor,
.get_fan_speed_percent = smu_v11_0_get_fan_speed_percent,
+ .get_fan_speed_rpm = arcturus_get_fan_speed_rpm,
.get_power_profile_mode = arcturus_get_power_profile_mode,
.set_power_profile_mode = arcturus_set_power_profile_mode,
.set_performance_level = arcturus_set_performance_level, diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
index 2ddf35788672..7dce5ea7c1a0 100644

drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +23 -0
@@ -1668,6 +1668,29 @@ static bool navi10_is_dpm_running(struct smu_context *smu)
 	return !!(feature_enabled & SMC_DPM_FEATURE);  }
 
+static int navi10_get_fan_speed_rpm(struct smu_context *smu,
+				    uint32_t *speed)
+{
+	int ret = 0;
+
+	if (!speed)
+		return -EINVAL;
+
+	switch (smu_v11_0_get_fan_control_mode(smu)) {
+	case AMD_FAN_CTRL_AUTO:
+		ret = navi10_get_smu_metrics_data(smu,
+						  METRICS_CURR_FANSPEED,
+						  speed);
+		break;
+	default:
+		ret = smu_v11_0_get_fan_speed_rpm(smu,
+						  speed);
+		break;
+	}
+
+	return ret;
+}
+
 static int navi10_get_fan_parameters(struct smu_context *smu)  {
 	PPTable_t *pptable = smu->smu_table.driver_pptable; @@ -3182,6 +3205,7 @@ static const struct pptable_funcs navi10_ppt_funcs = {
 	.notify_smc_display_config = navi10_notify_smc_display_config,
 	.is_dpm_running = navi10_is_dpm_running,

.get_fan_speed_percent = smu_v11_0_get_fan_speed_percent,
+ .get_fan_speed_rpm = navi10_get_fan_speed_rpm,
.get_power_profile_mode = navi10_get_power_profile_mode,
.set_power_profile_mode = navi10_set_power_profile_mode,
.set_watermarks_table = navi10_set_watermarks_table, diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c
index e7686ce6744b..2f93dc4b5968 100644

drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +18 -0
@@ -1355,6 +1355,26 @@ static bool sienna_cichlid_is_dpm_running(struct smu_context *smu)
 	return !!(feature_enabled & SMC_DPM_FEATURE);  }
 
+static int sienna_cichlid_get_fan_speed_rpm(struct smu_context *smu,
+					    uint32_t *speed)
+{
+	int ret = 0;
+
+	if (!speed)
+		return -EINVAL;
+
+	/*
+	 * For Sienna_Cichlid and later, the fan speed(rpm) reported
+	 * by pmfw is always trustable(even when the fan control feature
+	 * disabled or 0 RPM kicked in).
+	 */
+	ret = sienna_cichlid_get_smu_metrics_data(smu,
+						  METRICS_CURR_FANSPEED,
+						  speed);
+
+	return ret;

[Guchun] More simple if directly return function sienna_cichlid_get_smu_metrics_data, then variable 'ret' can be dropped.

+}
+
static int sienna_cichlid_get_fan_parameters(struct smu_context *smu) {
uint16_t *table_member;
@@ -3820,6 +3840,7 @@ static const struct pptable_funcs sienna_cichlid_ppt_funcs = {
.notify_smc_display_config = sienna_cichlid_notify_smc_display_config, .is_dpm_running = sienna_cichlid_is_dpm_running, .get_fan_speed_percent = smu_v11_0_get_fan_speed_percent,
+ .get_fan_speed_rpm = sienna_cichlid_get_fan_speed_rpm,
.get_power_profile_mode = sienna_cichlid_get_power_profile_mode, .set_power_profile_mode = sienna_cichlid_set_power_profile_mode, .set_watermarks_table = sienna_cichlid_set_watermarks_table,

drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +28 -0
index c49683b07076..0cdf55a0dba2 100644
@@ -1284,6 +1284,34 @@ int smu_v11_0_get_fan_speed_percent(struct smu_context *smu,
 	return 0;
 }
 
+int smu_v11_0_get_fan_speed_rpm(struct smu_context *smu,
+				uint32_t *speed)
+{
+	struct amdgpu_device *adev = smu->adev;
+	uint32_t tach_status, crystal_clock_freq;
+	uint64_t tmp64;
+
+	/*
+	 * For pre Sienna Cichlid ASICs, the 0 RPM may be not correctly
+	 * detected via register retrieving. To workaround this, we will
+	 * report the fan speed as 0 RPM if user just requested such.
+	 */
+	if ((smu->user_dpm_profile.custom_fan_speed & SMU_CUSTOM_FAN_SPEED_RPM)
+	     && !smu->user_dpm_profile.fan_speed_rpm) {
+		*speed = 0;
+		return 0;
+	}
+
+	crystal_clock_freq = amdgpu_asic_get_xclk(adev) / 4;
+	tmp64 = (uint64_t)crystal_clock_freq * 60 * 10000;
+
+	tach_status = RREG32_SOC15(THM, 0, mmCG_TACH_STATUS);
+	do_div(tmp64, tach_status);
+	*speed = (uint32_t)tmp64;
+
+	return 0;
+}
+
 int
 smu_v11_0_set_fan_control_mode(struct smu_context *smu,
 			       uint32_t mode)

--
2.29.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&amp;data=04%7C01%7Cguchun.chen%40amd.com%7C24bf2298a1554dbd9b8508d940eadc6d%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637612199748658238%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=nB08a637vYeUyLJIcsw6fuDdjZaDUCnPIfDSQrDIIVI%3D&amp;reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#8 lore raw

Re: [PATCH 4/7] drm/amd/pm: correct the fan speed RPM retrieving

In reply to Evan Quan
Quoted 225 lines · Evan Quan

The relationship "PWM = RPM / smu->fan_max_rpm" between fan speed PWM and RPM is not true for SMU11 ASICs. So, we need a new way to retrieving the fan speed RPM.

Change-Id Ife4298c8b7ec93ef023a7da27d59654e0444e044
---
  .../include/asic_reg/thm/thm_11_0_2_offset.h  |  3 ++
  drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h       |  5 ++++
  drivers/gpu/drm/amd/pm/inc/smu_v11_0.h        |  3 ++
  drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c     |  7 ++---
  .../gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 24 ++++++++++++++++
  .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c   | 24 ++++++++++++++++
  .../amd/pm/swsmu/smu11/sienna_cichlid_ppt.c   | 21 ++++++++++++++
  .../gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c    | 28 +++++++++++++++++++
  8 files changed, 110 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/include/asic_reg/thm/thm_11_0_2_offset.h +3 -0
index eca96abef445..8474f419caa5 100644
@@ -38,6 +38,9 @@
  #define mmCG_TACH_CTRL                                                                                 0x006a
  #define mmCG_TACH_CTRL_BASE_IDX                                                                        0
 
+#define mmCG_TACH_STATUS                                                                               0x006b
+#define mmCG_TACH_STATUS_BASE_IDX                                                                      0
+
  #define mmTHM_THERMAL_INT_ENA                                                                          0x000a
  #define mmTHM_THERMAL_INT_ENA_BASE_IDX                                                                 0
  #define mmTHM_THERMAL_INT_CTRL                                                                         0x000b
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +5 -0
index fa585f0be530..db5123fc6042 100644
@@ -726,6 +726,11 @@ struct pptable_funcs {
  	 */
  	int (*get_fan_speed_percent)(struct smu_context *smu, uint32_t *speed);
 
+	/**
+	 * @get_fan_speed_rpm: Get the current fan speed in rpm.
+	 */
+	int (*get_fan_speed_rpm)(struct smu_context *smu, uint32_t *speed);
+
  	/**
  	 * @set_watermarks_table: Configure and upload the watermarks tables to
  	 *                        the SMU.
drivers/gpu/drm/amd/pm/inc/smu_v11_0.h +3 -0
index 8e0f8e9a1665..05c8fc8fc3f9 100644
@@ -229,6 +229,9 @@ int smu_v11_0_set_fan_speed_rpm(struct smu_context *smu,
  int smu_v11_0_get_fan_speed_percent(struct smu_context *smu,
  				    uint32_t *speed);
 
+int smu_v11_0_get_fan_speed_rpm(struct smu_context *smu,
+				uint32_t *speed);
+
  int smu_v11_0_set_xgmi_pstate(struct smu_context *smu,
  				     uint32_t pstate);
 
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +2 -5
index 9a25443988e3..54fb3d7d23ee 100644
@@ -2614,17 +2614,14 @@ static int smu_get_fan_speed_rpm(void *handle, uint32_t *speed)
  {
  	struct smu_context *smu = handle;
  	int ret = 0;
-	u32 percent;
 
  	if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled)
  		return -EOPNOTSUPP;
 
  	mutex_lock(&smu->mutex);
 
-	if (smu->ppt_funcs->get_fan_speed_percent) {
-		ret = smu->ppt_funcs->get_fan_speed_percent(smu, &percent);
-		*speed = percent * smu->fan_max_rpm / 100;
-	}
+	if (smu->ppt_funcs->get_fan_speed_rpm)
+		ret = smu->ppt_funcs->get_fan_speed_rpm(smu, speed);
 
  	mutex_unlock(&smu->mutex);
 
drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c +24 -0
index 4a6544b8e05e..e3303c8dcaca 100644
@@ -1162,6 +1162,29 @@ static int arcturus_read_sensor(struct smu_context *smu,
  	return ret;
  }
 
+static int arcturus_get_fan_speed_rpm(struct smu_context *smu,
+				      uint32_t *speed)
+{
+	int ret = 0;
+
+	if (!speed)
+		return -EINVAL;
+
+	switch (smu_v11_0_get_fan_control_mode(smu)) {
+	case AMD_FAN_CTRL_AUTO:
+		ret = arcturus_get_smu_metrics_data(smu,
+						    METRICS_CURR_FANSPEED,
+						    speed);
+		break;
+	default:
+		ret = smu_v11_0_get_fan_speed_rpm(smu,
+						  speed);
+		break;
+	}
+
+	return ret;
+}
+
  static int arcturus_get_fan_parameters(struct smu_context *smu)
  {
  	PPTable_t *pptable = smu->smu_table.driver_pptable;
@@ -2246,6 +2269,7 @@ static const struct pptable_funcs arcturus_ppt_funcs = {
  	.force_clk_levels = arcturus_force_clk_levels,
  	.read_sensor = arcturus_read_sensor,
  	.get_fan_speed_percent = smu_v11_0_get_fan_speed_percent,
+	.get_fan_speed_rpm = arcturus_get_fan_speed_rpm,
  	.get_power_profile_mode = arcturus_get_power_profile_mode,
  	.set_power_profile_mode = arcturus_set_power_profile_mode,
  	.set_performance_level = arcturus_set_performance_level,
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +24 -0
index 2ddf35788672..7dce5ea7c1a0 100644
@@ -1668,6 +1668,29 @@ static bool navi10_is_dpm_running(struct smu_context *smu)
  	return !!(feature_enabled & SMC_DPM_FEATURE);
  }
 
+static int navi10_get_fan_speed_rpm(struct smu_context *smu,
+				    uint32_t *speed)
+{
+	int ret = 0;
+
+	if (!speed)
+		return -EINVAL;
+
+	switch (smu_v11_0_get_fan_control_mode(smu)) {
+	case AMD_FAN_CTRL_AUTO:
+		ret = navi10_get_smu_metrics_data(smu,
+						  METRICS_CURR_FANSPEED,
+						  speed);
+		break;
+	default:
+		ret = smu_v11_0_get_fan_speed_rpm(smu,
+						  speed);
+		break;
+	}
+
+	return ret;
+}
+
  static int navi10_get_fan_parameters(struct smu_context *smu)
  {
  	PPTable_t *pptable = smu->smu_table.driver_pptable;
@@ -3182,6 +3205,7 @@ static const struct pptable_funcs navi10_ppt_funcs = {
  	.notify_smc_display_config = navi10_notify_smc_display_config,
  	.is_dpm_running = navi10_is_dpm_running,
  	.get_fan_speed_percent = smu_v11_0_get_fan_speed_percent,
+	.get_fan_speed_rpm = navi10_get_fan_speed_rpm,
  	.get_power_profile_mode = navi10_get_power_profile_mode,
  	.set_power_profile_mode = navi10_set_power_profile_mode,
  	.set_watermarks_table = navi10_set_watermarks_table,
drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +21 -0
index e7686ce6744b..2f93dc4b5968 100644
@@ -1355,6 +1355,26 @@ static bool sienna_cichlid_is_dpm_running(struct smu_context *smu)
  	return !!(feature_enabled & SMC_DPM_FEATURE);
  }
 
+static int sienna_cichlid_get_fan_speed_rpm(struct smu_context *smu,
+					    uint32_t *speed)
+{
+	int ret = 0;
+
+	if (!speed)
+		return -EINVAL;
+
+	/*
+	 * For Sienna_Cichlid and later, the fan speed(rpm) reported
+	 * by pmfw is always trustable(even when the fan control feature
+	 * disabled or 0 RPM kicked in).
+	 */
+	ret = sienna_cichlid_get_smu_metrics_data(smu,
+						  METRICS_CURR_FANSPEED,
+						  speed);
+
+	return ret;
+}
+
  static int sienna_cichlid_get_fan_parameters(struct smu_context *smu)
  {
  	uint16_t *table_member;
@@ -3820,6 +3840,7 @@ static const struct pptable_funcs sienna_cichlid_ppt_funcs = {
  	.notify_smc_display_config = sienna_cichlid_notify_smc_display_config,
  	.is_dpm_running = sienna_cichlid_is_dpm_running,
  	.get_fan_speed_percent = smu_v11_0_get_fan_speed_percent,
+	.get_fan_speed_rpm = sienna_cichlid_get_fan_speed_rpm,
  	.get_power_profile_mode = sienna_cichlid_get_power_profile_mode,
  	.set_power_profile_mode = sienna_cichlid_set_power_profile_mode,
  	.set_watermarks_table = sienna_cichlid_set_watermarks_table,
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +9 -0
index c49683b07076..0cdf55a0dba2 100644
@@ -1284,6 +1284,34 @@ int smu_v11_0_get_fan_speed_percent(struct smu_context *smu,
  	return 0;
  }
 
+int smu_v11_0_get_fan_speed_rpm(struct smu_context *smu,
+				uint32_t *speed)
+{
+	struct amdgpu_device *adev = smu->adev;
+	uint32_t tach_status, crystal_clock_freq;
+	uint64_t tmp64;
+
+	/*
+	 * For pre Sienna Cichlid ASICs, the 0 RPM may be not correctly

drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c int smu_v11_0_get_fan_speed_percent(struct smu_context *smu, · line 1305

Quoted 10 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +10 -0
+	 * detected via register retrieving. To workaround this, we will
+	 * report the fan speed as 0 RPM if user just requested such.
+	 */
+	if ((smu->user_dpm_profile.custom_fan_speed & SMU_CUSTOM_FAN_SPEED_RPM)
+	     && !smu->user_dpm_profile.fan_speed_rpm) {
+		*speed = 0;
+		return 0;
+	}
+
+	crystal_clock_freq = amdgpu_asic_get_xclk(adev) / 4;

Same frequency comment - no need to related to ASIC refclk, define and use fan control crystal clock.

Thanks,
Lijo

drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c int smu_v11_0_get_fan_speed_percent(struct smu_context *smu, · line 1317

Quoted 13 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +9 -0
+	tmp64 = (uint64_t)crystal_clock_freq * 60 * 10000;
+
+	tach_status = RREG32_SOC15(THM, 0, mmCG_TACH_STATUS);
+	do_div(tmp64, tach_status);
+	*speed = (uint32_t)tmp64;
+
+	return 0;
+}
+
  int
  smu_v11_0_set_fan_control_mode(struct smu_context *smu,
  			       uint32_t mode)

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

author
#9 lore raw

PATCH 5/7 drm/amd/pm: drop the unnecessary intermediate percent-based transition

In reply to Evan Quan

Currently, the readout of fan speed pwm is transited into percent-based and then pwm-based. However, the transition into percent-based is totally unnecessary and make the final output less accurate.

Change-Id Ib99e088cda1875b4e2601f7077a178af6fe8a6cb
---
 drivers/gpu/drm/amd/pm/amdgpu_pm.c                 |  4 ----
 .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c    |  4 ++--
 .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_thermal.c  | 12 ++++++------
 .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c  |  2 +-
 .../drm/amd/pm/powerplay/hwmgr/vega10_thermal.c    | 10 +++++-----
 .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c  |  2 +-
 .../drm/amd/pm/powerplay/hwmgr/vega20_thermal.c    | 12 ++++++------
 drivers/gpu/drm/amd/pm/powerplay/si_dpm.c          | 10 +++++-----
 drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c          | 12 ++----------
 drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c     | 14 +++++++-------
 10 files changed, 35 insertions(+), 47 deletions(-)
drivers/gpu/drm/amd/pm/amdgpu_pm.c +0 -4
index 769f58d5ae1a..e9c98e3f4cfb 100644
@@ -2469,8 +2469,6 @@ static ssize_t amdgpu_hwmon_set_pwm1(struct device *dev,
 		return err;
 	}
 
-	value = (value * 100) / 255;
-
 	if (adev->powerplay.pp_funcs->set_fan_speed_percent)
 		err = amdgpu_dpm_set_fan_speed_percent(adev, value);
 	else
@@ -2515,8 +2513,6 @@ static ssize_t amdgpu_hwmon_get_pwm1(struct device *dev,
 	if (err)
 		return err;
 
-	speed = (speed * 255) / 100;
-
 	return sprintf(buf, "%i\n", speed);
 }
 
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c +2 -2
index 0541bfc81c1b..aa353a628c50 100644
@@ -3212,7 +3212,7 @@ static int smu7_force_dpm_level(struct pp_hwmgr *hwmgr,
 
 	if (!ret) {
 		if (level == AMD_DPM_FORCED_LEVEL_PROFILE_PEAK && hwmgr->dpm_level != AMD_DPM_FORCED_LEVEL_PROFILE_PEAK)
-			smu7_fan_ctrl_set_fan_speed_percent(hwmgr, 100);
+			smu7_fan_ctrl_set_fan_speed_percent(hwmgr, 255);
 		else if (level != AMD_DPM_FORCED_LEVEL_PROFILE_PEAK && hwmgr->dpm_level == AMD_DPM_FORCED_LEVEL_PROFILE_PEAK)
 			smu7_fan_ctrl_reset_fan_speed_to_default(hwmgr);
 	}
@@ -4988,7 +4988,7 @@ static void smu7_set_fan_control_mode(struct pp_hwmgr *hwmgr, uint32_t mode)
 {
 	switch (mode) {
 	case AMD_FAN_CTRL_NONE:
-		smu7_fan_ctrl_set_fan_speed_percent(hwmgr, 100);
+		smu7_fan_ctrl_set_fan_speed_percent(hwmgr, 255);
 		break;
 	case AMD_FAN_CTRL_MANUAL:
 		if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps,
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_thermal.c +6 -6
index 6cfe148ed45b..70ccc127e3fd 100644
@@ -70,12 +70,12 @@ int smu7_fan_ctrl_get_fan_speed_percent(struct pp_hwmgr *hwmgr,
 		return -EINVAL;
 
 
-	tmp64 = (uint64_t)duty * 100;
+	tmp64 = (uint64_t)duty * 255;
 	do_div(tmp64, duty100);
 	*speed = (uint32_t)tmp64;
 
-	if (*speed > 100)
-		*speed = 100;
+	if (*speed > 255)
+		*speed = 255;
 
 	return 0;
 }
@@ -214,8 +214,8 @@ int smu7_fan_ctrl_set_fan_speed_percent(struct pp_hwmgr *hwmgr,
 	if (hwmgr->thermal_controller.fanInfo.bNoFan)
 		return 0;
 
-	if (speed > 100)
-		speed = 100;
+	if (speed > 255)
+		speed = 255;
 
 	if (PP_CAP(PHM_PlatformCaps_MicrocodeFanControl))
 		smu7_fan_ctrl_stop_smc_fan_control(hwmgr);
@@ -227,7 +227,7 @@ int smu7_fan_ctrl_set_fan_speed_percent(struct pp_hwmgr *hwmgr,
 		return -EINVAL;
 
 	tmp64 = (uint64_t)speed * duty100;
-	do_div(tmp64, 100);
+	do_div(tmp64, 255);
 	duty = (uint32_t)tmp64;
 
 	PHM_WRITE_VFPF_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC,
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c +1 -1
index 25979106fd25..44c5e2588046 100644
@@ -4199,7 +4199,7 @@ static void vega10_set_fan_control_mode(struct pp_hwmgr *hwmgr, uint32_t mode)
 
 	switch (mode) {
 	case AMD_FAN_CTRL_NONE:
-		vega10_fan_ctrl_set_fan_speed_percent(hwmgr, 100);
+		vega10_fan_ctrl_set_fan_speed_percent(hwmgr, 255);
 		break;
 	case AMD_FAN_CTRL_MANUAL:
 		if (PP_CAP(PHM_PlatformCaps_MicrocodeFanControl))
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_thermal.c +5 -5
index 9b46b27bd30c..6b4c4294afca 100644
@@ -78,11 +78,11 @@ int vega10_fan_ctrl_get_fan_speed_percent(struct pp_hwmgr *hwmgr,
 
 	if (hwmgr->thermal_controller.
 			advanceFanControlParameters.usMaxFanRPM != 0)
-		percent = current_rpm * 100 /
+		percent = current_rpm * 255 /
 			hwmgr->thermal_controller.
 			advanceFanControlParameters.usMaxFanRPM;
 
-	*speed = percent > 100 ? 100 : percent;
+	*speed = percent > 255 ? 255 : percent;
 
 	return 0;
 }
@@ -257,8 +257,8 @@ int vega10_fan_ctrl_set_fan_speed_percent(struct pp_hwmgr *hwmgr,
 	if (hwmgr->thermal_controller.fanInfo.bNoFan)
 		return 0;
 
-	if (speed > 100)
-		speed = 100;
+	if (speed > 255)
+		speed = 255;
 
 	if (PP_CAP(PHM_PlatformCaps_MicrocodeFanControl))
 		vega10_fan_ctrl_stop_smc_fan_control(hwmgr);
@@ -270,7 +270,7 @@ int vega10_fan_ctrl_set_fan_speed_percent(struct pp_hwmgr *hwmgr,
 		return -EINVAL;
 
 	tmp64 = (uint64_t)speed * duty100;
-	do_div(tmp64, 100);
+	do_div(tmp64, 255);
 	duty = (uint32_t)tmp64;
 
 	WREG32_SOC15(THM, 0, mmCG_FDO_CTRL0,
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c +1 -1
index 0791309586c5..cbe5f8027ee0 100644
@@ -2769,7 +2769,7 @@ static void vega20_set_fan_control_mode(struct pp_hwmgr *hwmgr, uint32_t mode)
 {
 	switch (mode) {
 	case AMD_FAN_CTRL_NONE:
-		vega20_fan_ctrl_set_fan_speed_percent(hwmgr, 100);
+		vega20_fan_ctrl_set_fan_speed_percent(hwmgr, 255);
 		break;
 	case AMD_FAN_CTRL_MANUAL:
 		if (PP_CAP(PHM_PlatformCaps_MicrocodeFanControl))
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_thermal.c +6 -6
index 43d754952bd9..eb007c00d7c6 100644
@@ -129,12 +129,12 @@ int vega20_fan_ctrl_get_fan_speed_percent(struct pp_hwmgr *hwmgr,
 	if (!duty100)
 		return -EINVAL;
 
-	tmp64 = (uint64_t)duty * 100;
+	tmp64 = (uint64_t)duty * 255;
 	do_div(tmp64, duty100);
 	*speed = (uint32_t)tmp64;
 
-	if (*speed > 100)
-		*speed = 100;
+	if (*speed > 255)
+		*speed = 255;
 
 	return 0;
 }
@@ -147,8 +147,8 @@ int vega20_fan_ctrl_set_fan_speed_percent(struct pp_hwmgr *hwmgr,
 	uint32_t duty;
 	uint64_t tmp64;
 
-	if (speed > 100)
-		speed = 100;
+	if (speed > 255)
+		speed = 255;
 
 	if (PP_CAP(PHM_PlatformCaps_MicrocodeFanControl))
 		vega20_fan_ctrl_stop_smc_fan_control(hwmgr);
@@ -160,7 +160,7 @@ int vega20_fan_ctrl_set_fan_speed_percent(struct pp_hwmgr *hwmgr,
 		return -EINVAL;
 
 	tmp64 = (uint64_t)speed * duty100;
-	do_div(tmp64, 100);
+	do_div(tmp64, 255);
 	duty = (uint32_t)tmp64;
 
 	WREG32_SOC15(THM, 0, mmCG_FDO_CTRL0,
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +5 -5
index 15c0b8af376f..96ca359c10a5 100644
@@ -6555,12 +6555,12 @@ static int si_dpm_get_fan_speed_percent(void *handle,
 	if (duty100 == 0)
 		return -EINVAL;
 
-	tmp64 = (u64)duty * 100;
+	tmp64 = (u64)duty * 255;
 	do_div(tmp64, duty100);
 	*speed = (u32)tmp64;
 
-	if (*speed > 100)
-		*speed = 100;
+	if (*speed > 255)
+		*speed = 255;
 
 	return 0;
 }
@@ -6580,7 +6580,7 @@ static int si_dpm_set_fan_speed_percent(void *handle,
 	if (si_pi->fan_is_controlled_by_smc)
 		return -EINVAL;
 
-	if (speed > 100)
+	if (speed > 255)
 		return -EINVAL;
 
 	duty100 = (RREG32(CG_FDO_CTRL1) & FMAX_DUTY100_MASK) >> FMAX_DUTY100_SHIFT;
@@ -6589,7 +6589,7 @@ static int si_dpm_set_fan_speed_percent(void *handle,
 		return -EINVAL;
 
 	tmp64 = (u64)speed * duty100;
-	do_div(tmp64, 100);
+	do_div(tmp64, 255);
 	duty = (u32)tmp64;
 
 	tmp = RREG32(CG_FDO_CTRL0) & ~FDO_STATIC_DUTY_MASK;
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +2 -10
index 54fb3d7d23ee..94c15526ad21 100644
@@ -2565,23 +2565,17 @@ static int smu_get_fan_speed_percent(void *handle, u32 *speed)
 {
 	struct smu_context *smu = handle;
 	int ret = 0;
-	uint32_t percent;
 
 	if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled)
 		return -EOPNOTSUPP;
 
 	mutex_lock(&smu->mutex);
 
-	if (smu->ppt_funcs->get_fan_speed_percent) {
-		ret = smu->ppt_funcs->get_fan_speed_percent(smu, &percent);
-		if (!ret) {
-			*speed = percent > 100 ? 100 : percent;
-		}
-	}
+	if (smu->ppt_funcs->get_fan_speed_percent)
+		ret = smu->ppt_funcs->get_fan_speed_percent(smu, speed);
 
 	mutex_unlock(&smu->mutex);
 
-
 	return ret;
 }
 
@@ -2596,8 +2590,6 @@ static int smu_set_fan_speed_percent(void *handle, u32 speed)
 	mutex_lock(&smu->mutex);
 
 	if (smu->ppt_funcs->set_fan_speed_percent) {
-		if (speed > 100)
-			speed = 100;
 		ret = smu->ppt_funcs->set_fan_speed_percent(smu, speed);
 		if (!ret && !(smu->user_dpm_profile.flags & SMU_DPM_USER_PROFILE_RESTORE)) {
 			smu->user_dpm_profile.custom_fan_speed |= SMU_CUSTOM_FAN_SPEED_PWM;
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +7 -7
index 0cdf55a0dba2..f0ae0920c07e 100644
@@ -1191,8 +1191,8 @@ smu_v11_0_set_fan_speed_percent(struct smu_context *smu, uint32_t speed)
 	uint32_t duty100, duty;
 	uint64_t tmp64;
 
-	if (speed > 100)
-		speed = 100;
+	if (speed > 255)
+		speed = 255;
 
 	if (smu_v11_0_auto_fan_control(smu, 0))
 		return -EINVAL;
@@ -1203,7 +1203,7 @@ smu_v11_0_set_fan_speed_percent(struct smu_context *smu, uint32_t speed)
 		return -EINVAL;
 
 	tmp64 = (uint64_t)speed * duty100;
-	do_div(tmp64, 100);
+	do_div(tmp64, 255);
 	duty = (uint32_t)tmp64;
 
 	WREG32_SOC15(THM, 0, mmCG_FDO_CTRL0,
@@ -1274,12 +1274,12 @@ int smu_v11_0_get_fan_speed_percent(struct smu_context *smu,
 	if (!duty100)
 		return -EINVAL;
 
-	tmp64 = (uint64_t)duty * 100;
+	tmp64 = (uint64_t)duty * 255;
 	do_div(tmp64, duty100);
 	*speed = (uint32_t)tmp64;
 
-	if (*speed > 100)
-		*speed = 100;
+	if (*speed > 255)
+		*speed = 255;
 
 	return 0;
 }
@@ -1320,7 +1320,7 @@ smu_v11_0_set_fan_control_mode(struct smu_context *smu,
 
 	switch (mode) {
 	case AMD_FAN_CTRL_NONE:
-		ret = smu_v11_0_set_fan_speed_percent(smu, 100);
+		ret = smu_v11_0_set_fan_speed_percent(smu, 255);
 		break;
 	case AMD_FAN_CTRL_MANUAL:
 		ret = smu_v11_0_auto_fan_control(smu, 0);
Signature · 6 lines
2.29.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#10 lore raw

RE: [PATCH 5/7] drm/amd/pm: drop the unnecessary intermediate percent-based transition

[Public]

Seems 255 and 100 are used multiple times in different files. Is it better to define them as a macro?

Regards,
Guchun

-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Evan Quan
Sent: Wednesday, July 7, 2021 9:57 AM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; Quan, Evan <[email protected]>
Subject: [PATCH 5/7] drm/amd/pm: drop the unnecessary intermediate percent-based transition

Currently, the readout of fan speed pwm is transited into percent-based and then pwm-based. However, the transition into percent-based is totally unnecessary and make the final output less accurate.

Change-Id Ib99e088cda1875b4e2601f7077a178af6fe8a6cb
---
 drivers/gpu/drm/amd/pm/amdgpu_pm.c                 |  4 ----
 .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c    |  4 ++--
 .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_thermal.c  | 12 ++++++------  .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c  |  2 +-
 .../drm/amd/pm/powerplay/hwmgr/vega10_thermal.c    | 10 +++++-----
 .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c  |  2 +-
 .../drm/amd/pm/powerplay/hwmgr/vega20_thermal.c    | 12 ++++++------
 drivers/gpu/drm/amd/pm/powerplay/si_dpm.c          | 10 +++++-----
 drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c          | 12 ++----------
 drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c     | 14 +++++++-------
 10 files changed, 35 insertions(+), 47 deletions(-)
drivers/gpu/drm/amd/pm/amdgpu_pm.c +0 -4
index 769f58d5ae1a..e9c98e3f4cfb 100644
@@ -2469,8 +2469,6 @@ static ssize_t amdgpu_hwmon_set_pwm1(struct device *dev,
 		return err;
 	}
 
-	value = (value * 100) / 255;
-
 	if (adev->powerplay.pp_funcs->set_fan_speed_percent)
 		err = amdgpu_dpm_set_fan_speed_percent(adev, value);
 	else
@@ -2515,8 +2513,6 @@ static ssize_t amdgpu_hwmon_get_pwm1(struct device *dev,
 	if (err)
 		return err;
 
-	speed = (speed * 255) / 100;
-
 	return sprintf(buf, "%i\n", speed);
 }
 
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c +2 -2
index 0541bfc81c1b..aa353a628c50 100644
@@ -3212,7 +3212,7 @@ static int smu7_force_dpm_level(struct pp_hwmgr *hwmgr,
 
 	if (!ret) {
 		if (level == AMD_DPM_FORCED_LEVEL_PROFILE_PEAK && hwmgr->dpm_level != AMD_DPM_FORCED_LEVEL_PROFILE_PEAK)
-			smu7_fan_ctrl_set_fan_speed_percent(hwmgr, 100);
+			smu7_fan_ctrl_set_fan_speed_percent(hwmgr, 255);
 		else if (level != AMD_DPM_FORCED_LEVEL_PROFILE_PEAK && hwmgr->dpm_level == AMD_DPM_FORCED_LEVEL_PROFILE_PEAK)
 			smu7_fan_ctrl_reset_fan_speed_to_default(hwmgr);
 	}
@@ -4988,7 +4988,7 @@ static void smu7_set_fan_control_mode(struct pp_hwmgr *hwmgr, uint32_t mode)  {
 	switch (mode) {
 	case AMD_FAN_CTRL_NONE:
-		smu7_fan_ctrl_set_fan_speed_percent(hwmgr, 100);
+		smu7_fan_ctrl_set_fan_speed_percent(hwmgr, 255);
 		break;
 	case AMD_FAN_CTRL_MANUAL:
 		if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps,
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_thermal.c +6 -6
index 6cfe148ed45b..70ccc127e3fd 100644
@@ -70,12 +70,12 @@ int smu7_fan_ctrl_get_fan_speed_percent(struct pp_hwmgr *hwmgr,
 		return -EINVAL;
 
 
-	tmp64 = (uint64_t)duty * 100;
+	tmp64 = (uint64_t)duty * 255;
 	do_div(tmp64, duty100);
 	*speed = (uint32_t)tmp64;
 
-	if (*speed > 100)
-		*speed = 100;
+	if (*speed > 255)
+		*speed = 255;
 
 	return 0;
 }
@@ -214,8 +214,8 @@ int smu7_fan_ctrl_set_fan_speed_percent(struct pp_hwmgr *hwmgr,
 	if (hwmgr->thermal_controller.fanInfo.bNoFan)
 		return 0;
 
-	if (speed > 100)
-		speed = 100;
+	if (speed > 255)
+		speed = 255;
 
 	if (PP_CAP(PHM_PlatformCaps_MicrocodeFanControl))
 		smu7_fan_ctrl_stop_smc_fan_control(hwmgr);
@@ -227,7 +227,7 @@ int smu7_fan_ctrl_set_fan_speed_percent(struct pp_hwmgr *hwmgr,
 		return -EINVAL;
 
 	tmp64 = (uint64_t)speed * duty100;
-	do_div(tmp64, 100);
+	do_div(tmp64, 255);
 	duty = (uint32_t)tmp64;
 
 	PHM_WRITE_VFPF_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC, diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c

index 25979106fd25..44c5e2588046 100644

drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c +1 -1
@@ -4199,7 +4199,7 @@ static void vega10_set_fan_control_mode(struct pp_hwmgr *hwmgr, uint32_t mode)
 
 	switch (mode) {
 	case AMD_FAN_CTRL_NONE:
-		vega10_fan_ctrl_set_fan_speed_percent(hwmgr, 100);
+		vega10_fan_ctrl_set_fan_speed_percent(hwmgr, 255);
 		break;
 	case AMD_FAN_CTRL_MANUAL:
 		if (PP_CAP(PHM_PlatformCaps_MicrocodeFanControl))
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_thermal.c +5 -5
index 9b46b27bd30c..6b4c4294afca 100644
@@ -78,11 +78,11 @@ int vega10_fan_ctrl_get_fan_speed_percent(struct pp_hwmgr *hwmgr,
 
 	if (hwmgr->thermal_controller.
 			advanceFanControlParameters.usMaxFanRPM != 0)
-		percent = current_rpm * 100 /
+		percent = current_rpm * 255 /
 			hwmgr->thermal_controller.
 			advanceFanControlParameters.usMaxFanRPM;
 
-	*speed = percent > 100 ? 100 : percent;
+	*speed = percent > 255 ? 255 : percent;
 
 	return 0;
 }
@@ -257,8 +257,8 @@ int vega10_fan_ctrl_set_fan_speed_percent(struct pp_hwmgr *hwmgr,
 	if (hwmgr->thermal_controller.fanInfo.bNoFan)
 		return 0;
 
-	if (speed > 100)
-		speed = 100;
+	if (speed > 255)
+		speed = 255;
 
 	if (PP_CAP(PHM_PlatformCaps_MicrocodeFanControl))
 		vega10_fan_ctrl_stop_smc_fan_control(hwmgr);
@@ -270,7 +270,7 @@ int vega10_fan_ctrl_set_fan_speed_percent(struct pp_hwmgr *hwmgr,
 		return -EINVAL;
 
 	tmp64 = (uint64_t)speed * duty100;
-	do_div(tmp64, 100);
+	do_div(tmp64, 255);
 	duty = (uint32_t)tmp64;
 
 	WREG32_SOC15(THM, 0, mmCG_FDO_CTRL0,
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c +1 -1
index 0791309586c5..cbe5f8027ee0 100644
@@ -2769,7 +2769,7 @@ static void vega20_set_fan_control_mode(struct pp_hwmgr *hwmgr, uint32_t mode)  {
 	switch (mode) {
 	case AMD_FAN_CTRL_NONE:
-		vega20_fan_ctrl_set_fan_speed_percent(hwmgr, 100);
+		vega20_fan_ctrl_set_fan_speed_percent(hwmgr, 255);
 		break;
 	case AMD_FAN_CTRL_MANUAL:
 		if (PP_CAP(PHM_PlatformCaps_MicrocodeFanControl))
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_thermal.c +6 -6
index 43d754952bd9..eb007c00d7c6 100644
@@ -129,12 +129,12 @@ int vega20_fan_ctrl_get_fan_speed_percent(struct pp_hwmgr *hwmgr,
 	if (!duty100)
 		return -EINVAL;
 
-	tmp64 = (uint64_t)duty * 100;
+	tmp64 = (uint64_t)duty * 255;
 	do_div(tmp64, duty100);
 	*speed = (uint32_t)tmp64;
 
-	if (*speed > 100)
-		*speed = 100;
+	if (*speed > 255)
+		*speed = 255;
 
 	return 0;
 }
@@ -147,8 +147,8 @@ int vega20_fan_ctrl_set_fan_speed_percent(struct pp_hwmgr *hwmgr,
 	uint32_t duty;
 	uint64_t tmp64;
 
-	if (speed > 100)
-		speed = 100;
+	if (speed > 255)
+		speed = 255;
 
 	if (PP_CAP(PHM_PlatformCaps_MicrocodeFanControl))
 		vega20_fan_ctrl_stop_smc_fan_control(hwmgr);
@@ -160,7 +160,7 @@ int vega20_fan_ctrl_set_fan_speed_percent(struct pp_hwmgr *hwmgr,
 		return -EINVAL;
 
 	tmp64 = (uint64_t)speed * duty100;
-	do_div(tmp64, 100);
+	do_div(tmp64, 255);
 	duty = (uint32_t)tmp64;
 
 	WREG32_SOC15(THM, 0, mmCG_FDO_CTRL0,
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +4 -4
index 15c0b8af376f..96ca359c10a5 100644
@@ -6555,12 +6555,12 @@ static int si_dpm_get_fan_speed_percent(void *handle,
 	if (duty100 == 0)
 		return -EINVAL;
 
-	tmp64 = (u64)duty * 100;
+	tmp64 = (u64)duty * 255;
 	do_div(tmp64, duty100);
 	*speed = (u32)tmp64;
 
-	if (*speed > 100)
-		*speed = 100;
+	if (*speed > 255)
+		*speed = 255;
 
 	return 0;
 }
@@ -6580,7 +6580,7 @@ static int si_dpm_set_fan_speed_percent(void *handle,
 	if (si_pi->fan_is_controlled_by_smc)
 		return -EINVAL;
 
-	if (speed > 100)
+	if (speed > 255)
 		return -EINVAL;
 
 	duty100 = (RREG32(CG_FDO_CTRL1) & FMAX_DUTY100_MASK) >> FMAX_DUTY100_SHIFT; @@ -6589,7 +6589,7 @@ static int si_dpm_set_fan_speed_percent(void *handle,

return -EINVAL;

tmp64 = (u64)speed * duty100;
- do_div(tmp64, 100);
+ do_div(tmp64, 255);
duty = (u32)tmp64;

tmp = RREG32(CG_FDO_CTRL0) & ~FDO_STATIC_DUTY_MASK; diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
index 54fb3d7d23ee..94c15526ad21 100644

drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +2 -10
@@ -2565,23 +2565,17 @@ static int smu_get_fan_speed_percent(void *handle, u32 *speed)  {
 	struct smu_context *smu = handle;
 	int ret = 0;
-	uint32_t percent;
 
 	if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled)
 		return -EOPNOTSUPP;
 
 	mutex_lock(&smu->mutex);
 
-	if (smu->ppt_funcs->get_fan_speed_percent) {
-		ret = smu->ppt_funcs->get_fan_speed_percent(smu, &percent);
-		if (!ret) {
-			*speed = percent > 100 ? 100 : percent;
-		}
-	}
+	if (smu->ppt_funcs->get_fan_speed_percent)
+		ret = smu->ppt_funcs->get_fan_speed_percent(smu, speed);
 
 	mutex_unlock(&smu->mutex);
 
-
 	return ret;
 }
 
@@ -2596,8 +2590,6 @@ static int smu_set_fan_speed_percent(void *handle, u32 speed)
 	mutex_lock(&smu->mutex);
 
 	if (smu->ppt_funcs->set_fan_speed_percent) {
-		if (speed > 100)
-			speed = 100;
 		ret = smu->ppt_funcs->set_fan_speed_percent(smu, speed);
 		if (!ret && !(smu->user_dpm_profile.flags & SMU_DPM_USER_PROFILE_RESTORE)) {
 			smu->user_dpm_profile.custom_fan_speed |= SMU_CUSTOM_FAN_SPEED_PWM; diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c

index 0cdf55a0dba2..f0ae0920c07e 100644

drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +7 -7
@@ -1191,8 +1191,8 @@ smu_v11_0_set_fan_speed_percent(struct smu_context *smu, uint32_t speed)
 	uint32_t duty100, duty;
 	uint64_t tmp64;
 
-	if (speed > 100)
-		speed = 100;
+	if (speed > 255)
+		speed = 255;
 
 	if (smu_v11_0_auto_fan_control(smu, 0))
 		return -EINVAL;
@@ -1203,7 +1203,7 @@ smu_v11_0_set_fan_speed_percent(struct smu_context *smu, uint32_t speed)
 		return -EINVAL;
 
 	tmp64 = (uint64_t)speed * duty100;
-	do_div(tmp64, 100);
+	do_div(tmp64, 255);
 	duty = (uint32_t)tmp64;
 
 	WREG32_SOC15(THM, 0, mmCG_FDO_CTRL0,
@@ -1274,12 +1274,12 @@ int smu_v11_0_get_fan_speed_percent(struct smu_context *smu,
 	if (!duty100)
 		return -EINVAL;
 
-	tmp64 = (uint64_t)duty * 100;
+	tmp64 = (uint64_t)duty * 255;
 	do_div(tmp64, duty100);
 	*speed = (uint32_t)tmp64;
 
-	if (*speed > 100)
-		*speed = 100;
+	if (*speed > 255)
+		*speed = 255;
 
 	return 0;
 }
@@ -1320,7 +1320,7 @@ smu_v11_0_set_fan_control_mode(struct smu_context *smu,
 
 	switch (mode) {
 	case AMD_FAN_CTRL_NONE:
-		ret = smu_v11_0_set_fan_speed_percent(smu, 100);
+		ret = smu_v11_0_set_fan_speed_percent(smu, 255);
 		break;
 	case AMD_FAN_CTRL_MANUAL:
 		ret = smu_v11_0_auto_fan_control(smu, 0);

--
2.29.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&amp;data=04%7C01%7Cguchun.chen%40amd.com%7C5b919ff74f95497e2dd108d940eaddf7%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637612199755775085%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=mbcHvnH3%2BLgMVnXY72XKV%2F%2BMScHA%2FXYbvVdALV0oq7I%3D&amp;reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#11 lore raw

Re: [PATCH 5/7] drm/amd/pm: drop the unnecessary intermediate percent-based transition

In reply to Evan Quan

Hi Evan,

Bit of a drive by comment but I think that maybe all the *_fan_speed_percent() function names are a bit confusing if they no longer operate on percents but on a duty cycle unit of 0-255. No good idea what to call them though :-\

Also max() could be used in a bunch of places instead of

    if (speed > 255)
              speed = 255;

Regards,
Nils

Den ons 7 juli 2021 03:59Evan Quan <[email protected]> skrev:

Quoted 371 lines

Currently, the readout of fan speed pwm is transited into percent-based and then pwm-based. However, the transition into percent-based is totally unnecessary and make the final output less accurate.

Change-Id Ib99e088cda1875b4e2601f7077a178af6fe8a6cb
---
 drivers/gpu/drm/amd/pm/amdgpu_pm.c                 |  4 ----
 .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c    |  4 ++--
 .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_thermal.c  | 12 ++++++------
 .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c  |  2 +-
 .../drm/amd/pm/powerplay/hwmgr/vega10_thermal.c    | 10 +++++-----
 .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c  |  2 +-
 .../drm/amd/pm/powerplay/hwmgr/vega20_thermal.c    | 12 ++++++------
 drivers/gpu/drm/amd/pm/powerplay/si_dpm.c          | 10 +++++-----
 drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c          | 12 ++----------
 drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c     | 14 +++++++-------
 10 files changed, 35 insertions(+), 47 deletions(-)
drivers/gpu/drm/amd/pm/amdgpu_pm.c +0 -2
index 769f58d5ae1a..e9c98e3f4cfb 100644
@@ -2469,8 +2469,6 @@ static ssize_t amdgpu_hwmon_set_pwm1(struct device
 *dev,
                return err;
        }
 
-       value = (value * 100) / 255;
-
        if (adev->powerplay.pp_funcs->set_fan_speed_percent)
                err = amdgpu_dpm_set_fan_speed_percent(adev, value);

else

drivers/gpu/drm/amd/pm/amdgpu_pm.c +0 -2
@@ -2515,8 +2513,6 @@ static ssize_t amdgpu_hwmon_get_pwm1(struct device
 *dev,
        if (err)
                return err;
 
-       speed = (speed * 255) / 100;
-
        return sprintf(buf, "%i\n", speed);
 }
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c +1 -1
index 0541bfc81c1b..aa353a628c50 100644
@@ -3212,7 +3212,7 @@ static int smu7_force_dpm_level(struct pp_hwmgr
 *hwmgr,
 
        if (!ret) {
                if (level == AMD_DPM_FORCED_LEVEL_PROFILE_PEAK &&
 hwmgr->dpm_level != AMD_DPM_FORCED_LEVEL_PROFILE_PEAK)
-                       smu7_fan_ctrl_set_fan_speed_percent(hwmgr, 100);
+                       smu7_fan_ctrl_set_fan_speed_percent(hwmgr, 255);
                else if (level != AMD_DPM_FORCED_LEVEL_PROFILE_PEAK &&

hwmgr->dpm_level == AMD_DPM_FORCED_LEVEL_PROFILE_PEAK)

                        smu7_fan_ctrl_reset_fan_speed_to_default(hwmgr);
        }
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c +1 -1
@@ -4988,7 +4988,7 @@ static void smu7_set_fan_control_mode(struct
 pp_hwmgr *hwmgr, uint32_t mode)
 {
        switch (mode) {
        case AMD_FAN_CTRL_NONE:
-               smu7_fan_ctrl_set_fan_speed_percent(hwmgr, 100);
+               smu7_fan_ctrl_set_fan_speed_percent(hwmgr, 255);
                break;
        case AMD_FAN_CTRL_MANUAL:

if
(phm_cap_enabled(hwmgr->platform_descriptor.platformCaps,

drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_thermal.c +3 -3
index 6cfe148ed45b..70ccc127e3fd 100644
@@ -70,12 +70,12 @@ int smu7_fan_ctrl_get_fan_speed_percent(struct
 pp_hwmgr *hwmgr,
                return -EINVAL;
 
 
-       tmp64 = (uint64_t)duty * 100;
+       tmp64 = (uint64_t)duty * 255;
        do_div(tmp64, duty100);
        *speed = (uint32_t)tmp64;
 
-       if (*speed > 100)
-               *speed = 100;
+       if (*speed > 255)
+               *speed = 255;
 
        return 0;

}

drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_thermal.c +2 -2
@@ -214,8 +214,8 @@ int smu7_fan_ctrl_set_fan_speed_percent(struct
 pp_hwmgr *hwmgr,
        if (hwmgr->thermal_controller.fanInfo.bNoFan)
                return 0;
 
-       if (speed > 100)
-               speed = 100;
+       if (speed > 255)
+               speed = 255;
 
        if (PP_CAP(PHM_PlatformCaps_MicrocodeFanControl))
                smu7_fan_ctrl_stop_smc_fan_control(hwmgr);
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_thermal.c +1 -1
@@ -227,7 +227,7 @@ int smu7_fan_ctrl_set_fan_speed_percent(struct
 pp_hwmgr *hwmgr,
                return -EINVAL;
 
        tmp64 = (uint64_t)speed * duty100;
-       do_div(tmp64, 100);
+       do_div(tmp64, 255);
        duty = (uint32_t)tmp64;
 
        PHM_WRITE_VFPF_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC,
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c +1 -1
index 25979106fd25..44c5e2588046 100644
@@ -4199,7 +4199,7 @@ static void vega10_set_fan_control_mode(struct
 pp_hwmgr *hwmgr, uint32_t mode)
 
        switch (mode) {
        case AMD_FAN_CTRL_NONE:
-               vega10_fan_ctrl_set_fan_speed_percent(hwmgr, 100);
+               vega10_fan_ctrl_set_fan_speed_percent(hwmgr, 255);
                break;
        case AMD_FAN_CTRL_MANUAL:

if (PP_CAP(PHM_PlatformCaps_MicrocodeFanControl))

drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_thermal.c +2 -2
index 9b46b27bd30c..6b4c4294afca 100644
@@ -78,11 +78,11 @@ int vega10_fan_ctrl_get_fan_speed_percent(struct
 pp_hwmgr *hwmgr,
 
        if (hwmgr->thermal_controller.
                        advanceFanControlParameters.usMaxFanRPM != 0)
-               percent = current_rpm * 100 /
+               percent = current_rpm * 255 /
                        hwmgr->thermal_controller.
                        advanceFanControlParameters.usMaxFanRPM;
 
-       *speed = percent > 100 ? 100 : percent;
+       *speed = percent > 255 ? 255 : percent;
 
        return 0;

}

drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_thermal.c +2 -2
@@ -257,8 +257,8 @@ int vega10_fan_ctrl_set_fan_speed_percent(struct
 pp_hwmgr *hwmgr,
        if (hwmgr->thermal_controller.fanInfo.bNoFan)
                return 0;
 
-       if (speed > 100)
-               speed = 100;
+       if (speed > 255)
+               speed = 255;
 
        if (PP_CAP(PHM_PlatformCaps_MicrocodeFanControl))
                vega10_fan_ctrl_stop_smc_fan_control(hwmgr);
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_thermal.c +1 -1
@@ -270,7 +270,7 @@ int vega10_fan_ctrl_set_fan_speed_percent(struct
 pp_hwmgr *hwmgr,
                return -EINVAL;
 
        tmp64 = (uint64_t)speed * duty100;
-       do_div(tmp64, 100);
+       do_div(tmp64, 255);
        duty = (uint32_t)tmp64;
 
        WREG32_SOC15(THM, 0, mmCG_FDO_CTRL0,
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c +1 -1
index 0791309586c5..cbe5f8027ee0 100644
@@ -2769,7 +2769,7 @@ static void vega20_set_fan_control_mode(struct
 pp_hwmgr *hwmgr, uint32_t mode)
 {
        switch (mode) {
        case AMD_FAN_CTRL_NONE:
-               vega20_fan_ctrl_set_fan_speed_percent(hwmgr, 100);
+               vega20_fan_ctrl_set_fan_speed_percent(hwmgr, 255);
                break;
        case AMD_FAN_CTRL_MANUAL:

if (PP_CAP(PHM_PlatformCaps_MicrocodeFanControl))

drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_thermal.c +3 -3
index 43d754952bd9..eb007c00d7c6 100644
@@ -129,12 +129,12 @@ int vega20_fan_ctrl_get_fan_speed_percent(struct
 pp_hwmgr *hwmgr,
        if (!duty100)
                return -EINVAL;
 
-       tmp64 = (uint64_t)duty * 100;
+       tmp64 = (uint64_t)duty * 255;
        do_div(tmp64, duty100);
        *speed = (uint32_t)tmp64;
 
-       if (*speed > 100)
-               *speed = 100;
+       if (*speed > 255)
+               *speed = 255;
 
        return 0;

}

drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_thermal.c +2 -2
@@ -147,8 +147,8 @@ int vega20_fan_ctrl_set_fan_speed_percent(struct
 pp_hwmgr *hwmgr,
        uint32_t duty;
        uint64_t tmp64;
 
-       if (speed > 100)
-               speed = 100;
+       if (speed > 255)
+               speed = 255;
 
        if (PP_CAP(PHM_PlatformCaps_MicrocodeFanControl))
                vega20_fan_ctrl_stop_smc_fan_control(hwmgr);
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_thermal.c +1 -1
@@ -160,7 +160,7 @@ int vega20_fan_ctrl_set_fan_speed_percent(struct
 pp_hwmgr *hwmgr,
                return -EINVAL;
 
        tmp64 = (uint64_t)speed * duty100;
-       do_div(tmp64, 100);
+       do_div(tmp64, 255);
        duty = (uint32_t)tmp64;
 
        WREG32_SOC15(THM, 0, mmCG_FDO_CTRL0,
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +3 -3
index 15c0b8af376f..96ca359c10a5 100644
@@ -6555,12 +6555,12 @@ static int si_dpm_get_fan_speed_percent(void
 *handle,
        if (duty100 == 0)
                return -EINVAL;
 
-       tmp64 = (u64)duty * 100;
+       tmp64 = (u64)duty * 255;
        do_div(tmp64, duty100);
        *speed = (u32)tmp64;
 
-       if (*speed > 100)
-               *speed = 100;
+       if (*speed > 255)
+               *speed = 255;
 
        return 0;

}

drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +1 -1
@@ -6580,7 +6580,7 @@ static int si_dpm_set_fan_speed_percent(void *handle,
        if (si_pi->fan_is_controlled_by_smc)
                return -EINVAL;
 
-       if (speed > 100)
+       if (speed > 255)
                return -EINVAL;
 
        duty100 = (RREG32(CG_FDO_CTRL1) & FMAX_DUTY100_MASK) >>

FMAX_DUTY100_SHIFT;

drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +1 -1
@@ -6589,7 +6589,7 @@ static int si_dpm_set_fan_speed_percent(void *handle,
                return -EINVAL;
 
        tmp64 = (u64)speed * duty100;
-       do_div(tmp64, 100);
+       do_div(tmp64, 255);
        duty = (u32)tmp64;
 
        tmp = RREG32(CG_FDO_CTRL0) & ~FDO_STATIC_DUTY_MASK;
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +2 -10
index 54fb3d7d23ee..94c15526ad21 100644
@@ -2565,23 +2565,17 @@ static int smu_get_fan_speed_percent(void *handle,
 u32 *speed)
 {
        struct smu_context *smu = handle;
        int ret = 0;
-       uint32_t percent;
 
        if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled)
                return -EOPNOTSUPP;
 
        mutex_lock(&smu->mutex);
 
-       if (smu->ppt_funcs->get_fan_speed_percent) {
-               ret = smu->ppt_funcs->get_fan_speed_percent(smu, &percent);
-               if (!ret) {
-                       *speed = percent > 100 ? 100 : percent;
-               }
-       }
+       if (smu->ppt_funcs->get_fan_speed_percent)
+               ret = smu->ppt_funcs->get_fan_speed_percent(smu, speed);
 
        mutex_unlock(&smu->mutex);
 
-
        return ret;
 }
@@ -2596,8 +2590,6 @@ static int smu_set_fan_speed_percent(void *handle,
 u32 speed)
        mutex_lock(&smu->mutex);
 
        if (smu->ppt_funcs->set_fan_speed_percent) {
-               if (speed > 100)
-                       speed = 100;
                ret = smu->ppt_funcs->set_fan_speed_percent(smu, speed);
                if (!ret && !(smu->user_dpm_profile.flags &
SMU_DPM_USER_PROFILE_RESTORE)) {
                        smu->user_dpm_profile.custom_fan_speed |=

SMU_CUSTOM_FAN_SPEED_PWM;

drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +2 -2
index 0cdf55a0dba2..f0ae0920c07e 100644
@@ -1191,8 +1191,8 @@ smu_v11_0_set_fan_speed_percent(struct smu_context
 *smu, uint32_t speed)
        uint32_t duty100, duty;
        uint64_t tmp64;
 
-       if (speed > 100)
-               speed = 100;
+       if (speed > 255)
+               speed = 255;
 
        if (smu_v11_0_auto_fan_control(smu, 0))
                return -EINVAL;
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +1 -1
@@ -1203,7 +1203,7 @@ smu_v11_0_set_fan_speed_percent(struct smu_context
 *smu, uint32_t speed)
                return -EINVAL;
 
        tmp64 = (uint64_t)speed * duty100;
-       do_div(tmp64, 100);
+       do_div(tmp64, 255);
        duty = (uint32_t)tmp64;
 
        WREG32_SOC15(THM, 0, mmCG_FDO_CTRL0,
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +3 -3
@@ -1274,12 +1274,12 @@ int smu_v11_0_get_fan_speed_percent(struct
 smu_context *smu,
        if (!duty100)
                return -EINVAL;
 
-       tmp64 = (uint64_t)duty * 100;
+       tmp64 = (uint64_t)duty * 255;
        do_div(tmp64, duty100);
        *speed = (uint32_t)tmp64;
 
-       if (*speed > 100)
-               *speed = 100;
+       if (*speed > 255)
+               *speed = 255;
 
        return 0;

}

drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +1 -1
@@ -1320,7 +1320,7 @@ smu_v11_0_set_fan_control_mode(struct smu_context
 *smu,
 
        switch (mode) {
        case AMD_FAN_CTRL_NONE:
-               ret = smu_v11_0_set_fan_speed_percent(smu, 100);
+               ret = smu_v11_0_set_fan_speed_percent(smu, 255);
                break;
        case AMD_FAN_CTRL_MANUAL:
                ret = smu_v11_0_auto_fan_control(smu, 0);
Quoted 8 lines

--
2.29.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#12 lore raw

Re: [PATCH 5/7] drm/amd/pm: drop the unnecessary intermediate percent-based transition

In reply to Evan Quan

As mentioned in another patch, renaming function to set_/get_ pwm will clarify things better. The scale is 0-255 in hwmon as well.

Thanks,
Lijo

Quoted 326 lines · Evan Quan

Currently, the readout of fan speed pwm is transited into percent-based and then pwm-based. However, the transition into percent-based is totally unnecessary and make the final output less accurate.

Change-Id Ib99e088cda1875b4e2601f7077a178af6fe8a6cb
---
  drivers/gpu/drm/amd/pm/amdgpu_pm.c                 |  4 ----
  .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c    |  4 ++--
  .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_thermal.c  | 12 ++++++------
  .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c  |  2 +-
  .../drm/amd/pm/powerplay/hwmgr/vega10_thermal.c    | 10 +++++-----
  .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c  |  2 +-
  .../drm/amd/pm/powerplay/hwmgr/vega20_thermal.c    | 12 ++++++------
  drivers/gpu/drm/amd/pm/powerplay/si_dpm.c          | 10 +++++-----
  drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c          | 12 ++----------
  drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c     | 14 +++++++-------
  10 files changed, 35 insertions(+), 47 deletions(-)
drivers/gpu/drm/amd/pm/amdgpu_pm.c +0 -4
index 769f58d5ae1a..e9c98e3f4cfb 100644
@@ -2469,8 +2469,6 @@ static ssize_t amdgpu_hwmon_set_pwm1(struct device *dev,
  		return err;
  	}
 
-	value = (value * 100) / 255;
-
  	if (adev->powerplay.pp_funcs->set_fan_speed_percent)
  		err = amdgpu_dpm_set_fan_speed_percent(adev, value);
  	else
@@ -2515,8 +2513,6 @@ static ssize_t amdgpu_hwmon_get_pwm1(struct device *dev,
  	if (err)
  		return err;
 
-	speed = (speed * 255) / 100;
-
  	return sprintf(buf, "%i\n", speed);
  }
 
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c +2 -2
index 0541bfc81c1b..aa353a628c50 100644
@@ -3212,7 +3212,7 @@ static int smu7_force_dpm_level(struct pp_hwmgr *hwmgr,
 
  	if (!ret) {
  		if (level == AMD_DPM_FORCED_LEVEL_PROFILE_PEAK && hwmgr->dpm_level != AMD_DPM_FORCED_LEVEL_PROFILE_PEAK)
-			smu7_fan_ctrl_set_fan_speed_percent(hwmgr, 100);
+			smu7_fan_ctrl_set_fan_speed_percent(hwmgr, 255);
  		else if (level != AMD_DPM_FORCED_LEVEL_PROFILE_PEAK && hwmgr->dpm_level == AMD_DPM_FORCED_LEVEL_PROFILE_PEAK)
  			smu7_fan_ctrl_reset_fan_speed_to_default(hwmgr);
  	}
@@ -4988,7 +4988,7 @@ static void smu7_set_fan_control_mode(struct pp_hwmgr *hwmgr, uint32_t mode)
  {
  	switch (mode) {
  	case AMD_FAN_CTRL_NONE:
-		smu7_fan_ctrl_set_fan_speed_percent(hwmgr, 100);
+		smu7_fan_ctrl_set_fan_speed_percent(hwmgr, 255);
  		break;
  	case AMD_FAN_CTRL_MANUAL:
  		if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps,
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_thermal.c +6 -6
index 6cfe148ed45b..70ccc127e3fd 100644
@@ -70,12 +70,12 @@ int smu7_fan_ctrl_get_fan_speed_percent(struct pp_hwmgr *hwmgr,
  		return -EINVAL;
 
 
-	tmp64 = (uint64_t)duty * 100;
+	tmp64 = (uint64_t)duty * 255;
  	do_div(tmp64, duty100);
  	*speed = (uint32_t)tmp64;
 
-	if (*speed > 100)
-		*speed = 100;
+	if (*speed > 255)
+		*speed = 255;
 
  	return 0;
  }
@@ -214,8 +214,8 @@ int smu7_fan_ctrl_set_fan_speed_percent(struct pp_hwmgr *hwmgr,
  	if (hwmgr->thermal_controller.fanInfo.bNoFan)
  		return 0;
 
-	if (speed > 100)
-		speed = 100;
+	if (speed > 255)
+		speed = 255;
 
  	if (PP_CAP(PHM_PlatformCaps_MicrocodeFanControl))
  		smu7_fan_ctrl_stop_smc_fan_control(hwmgr);
@@ -227,7 +227,7 @@ int smu7_fan_ctrl_set_fan_speed_percent(struct pp_hwmgr *hwmgr,
  		return -EINVAL;
 
  	tmp64 = (uint64_t)speed * duty100;
-	do_div(tmp64, 100);
+	do_div(tmp64, 255);
  	duty = (uint32_t)tmp64;
 
  	PHM_WRITE_VFPF_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC,
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c +1 -1
index 25979106fd25..44c5e2588046 100644
@@ -4199,7 +4199,7 @@ static void vega10_set_fan_control_mode(struct pp_hwmgr *hwmgr, uint32_t mode)
 
  	switch (mode) {
  	case AMD_FAN_CTRL_NONE:
-		vega10_fan_ctrl_set_fan_speed_percent(hwmgr, 100);
+		vega10_fan_ctrl_set_fan_speed_percent(hwmgr, 255);
  		break;
  	case AMD_FAN_CTRL_MANUAL:
  		if (PP_CAP(PHM_PlatformCaps_MicrocodeFanControl))
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_thermal.c +5 -5
index 9b46b27bd30c..6b4c4294afca 100644
@@ -78,11 +78,11 @@ int vega10_fan_ctrl_get_fan_speed_percent(struct pp_hwmgr *hwmgr,
 
  	if (hwmgr->thermal_controller.
  			advanceFanControlParameters.usMaxFanRPM != 0)
-		percent = current_rpm * 100 /
+		percent = current_rpm * 255 /
  			hwmgr->thermal_controller.
  			advanceFanControlParameters.usMaxFanRPM;
 
-	*speed = percent > 100 ? 100 : percent;
+	*speed = percent > 255 ? 255 : percent;
 
  	return 0;
  }
@@ -257,8 +257,8 @@ int vega10_fan_ctrl_set_fan_speed_percent(struct pp_hwmgr *hwmgr,
  	if (hwmgr->thermal_controller.fanInfo.bNoFan)
  		return 0;
 
-	if (speed > 100)
-		speed = 100;
+	if (speed > 255)
+		speed = 255;
 
  	if (PP_CAP(PHM_PlatformCaps_MicrocodeFanControl))
  		vega10_fan_ctrl_stop_smc_fan_control(hwmgr);
@@ -270,7 +270,7 @@ int vega10_fan_ctrl_set_fan_speed_percent(struct pp_hwmgr *hwmgr,
  		return -EINVAL;
 
  	tmp64 = (uint64_t)speed * duty100;
-	do_div(tmp64, 100);
+	do_div(tmp64, 255);
  	duty = (uint32_t)tmp64;
 
  	WREG32_SOC15(THM, 0, mmCG_FDO_CTRL0,
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c +1 -1
index 0791309586c5..cbe5f8027ee0 100644
@@ -2769,7 +2769,7 @@ static void vega20_set_fan_control_mode(struct pp_hwmgr *hwmgr, uint32_t mode)
  {
  	switch (mode) {
  	case AMD_FAN_CTRL_NONE:
-		vega20_fan_ctrl_set_fan_speed_percent(hwmgr, 100);
+		vega20_fan_ctrl_set_fan_speed_percent(hwmgr, 255);
  		break;
  	case AMD_FAN_CTRL_MANUAL:
  		if (PP_CAP(PHM_PlatformCaps_MicrocodeFanControl))
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_thermal.c +6 -6
index 43d754952bd9..eb007c00d7c6 100644
@@ -129,12 +129,12 @@ int vega20_fan_ctrl_get_fan_speed_percent(struct pp_hwmgr *hwmgr,
  	if (!duty100)
  		return -EINVAL;
 
-	tmp64 = (uint64_t)duty * 100;
+	tmp64 = (uint64_t)duty * 255;
  	do_div(tmp64, duty100);
  	*speed = (uint32_t)tmp64;
 
-	if (*speed > 100)
-		*speed = 100;
+	if (*speed > 255)
+		*speed = 255;
 
  	return 0;
  }
@@ -147,8 +147,8 @@ int vega20_fan_ctrl_set_fan_speed_percent(struct pp_hwmgr *hwmgr,
  	uint32_t duty;
  	uint64_t tmp64;
 
-	if (speed > 100)
-		speed = 100;
+	if (speed > 255)
+		speed = 255;
 
  	if (PP_CAP(PHM_PlatformCaps_MicrocodeFanControl))
  		vega20_fan_ctrl_stop_smc_fan_control(hwmgr);
@@ -160,7 +160,7 @@ int vega20_fan_ctrl_set_fan_speed_percent(struct pp_hwmgr *hwmgr,
  		return -EINVAL;
 
  	tmp64 = (uint64_t)speed * duty100;
-	do_div(tmp64, 100);
+	do_div(tmp64, 255);
  	duty = (uint32_t)tmp64;
 
  	WREG32_SOC15(THM, 0, mmCG_FDO_CTRL0,
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +5 -5
index 15c0b8af376f..96ca359c10a5 100644
@@ -6555,12 +6555,12 @@ static int si_dpm_get_fan_speed_percent(void *handle,
  	if (duty100 == 0)
  		return -EINVAL;
 
-	tmp64 = (u64)duty * 100;
+	tmp64 = (u64)duty * 255;
  	do_div(tmp64, duty100);
  	*speed = (u32)tmp64;
 
-	if (*speed > 100)
-		*speed = 100;
+	if (*speed > 255)
+		*speed = 255;
 
  	return 0;
  }
@@ -6580,7 +6580,7 @@ static int si_dpm_set_fan_speed_percent(void *handle,
  	if (si_pi->fan_is_controlled_by_smc)
  		return -EINVAL;
 
-	if (speed > 100)
+	if (speed > 255)
  		return -EINVAL;
 
  	duty100 = (RREG32(CG_FDO_CTRL1) & FMAX_DUTY100_MASK) >> FMAX_DUTY100_SHIFT;
@@ -6589,7 +6589,7 @@ static int si_dpm_set_fan_speed_percent(void *handle,
  		return -EINVAL;
 
  	tmp64 = (u64)speed * duty100;
-	do_div(tmp64, 100);
+	do_div(tmp64, 255);
  	duty = (u32)tmp64;
 
  	tmp = RREG32(CG_FDO_CTRL0) & ~FDO_STATIC_DUTY_MASK;
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +2 -10
index 54fb3d7d23ee..94c15526ad21 100644
@@ -2565,23 +2565,17 @@ static int smu_get_fan_speed_percent(void *handle, u32 *speed)
  {
  	struct smu_context *smu = handle;
  	int ret = 0;
-	uint32_t percent;
 
  	if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled)
  		return -EOPNOTSUPP;
 
  	mutex_lock(&smu->mutex);
 
-	if (smu->ppt_funcs->get_fan_speed_percent) {
-		ret = smu->ppt_funcs->get_fan_speed_percent(smu, &percent);
-		if (!ret) {
-			*speed = percent > 100 ? 100 : percent;
-		}
-	}
+	if (smu->ppt_funcs->get_fan_speed_percent)
+		ret = smu->ppt_funcs->get_fan_speed_percent(smu, speed);
 
  	mutex_unlock(&smu->mutex);
 
-
  	return ret;
  }
 
@@ -2596,8 +2590,6 @@ static int smu_set_fan_speed_percent(void *handle, u32 speed)
  	mutex_lock(&smu->mutex);
 
  	if (smu->ppt_funcs->set_fan_speed_percent) {
-		if (speed > 100)
-			speed = 100;
  		ret = smu->ppt_funcs->set_fan_speed_percent(smu, speed);
  		if (!ret && !(smu->user_dpm_profile.flags & SMU_DPM_USER_PROFILE_RESTORE)) {
  			smu->user_dpm_profile.custom_fan_speed |= SMU_CUSTOM_FAN_SPEED_PWM;
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +6 -6
index 0cdf55a0dba2..f0ae0920c07e 100644
@@ -1191,8 +1191,8 @@ smu_v11_0_set_fan_speed_percent(struct smu_context *smu, uint32_t speed)
  	uint32_t duty100, duty;
  	uint64_t tmp64;
 
-	if (speed > 100)
-		speed = 100;
+	if (speed > 255)
+		speed = 255;
 
  	if (smu_v11_0_auto_fan_control(smu, 0))
  		return -EINVAL;
@@ -1203,7 +1203,7 @@ smu_v11_0_set_fan_speed_percent(struct smu_context *smu, uint32_t speed)
  		return -EINVAL;
 
  	tmp64 = (uint64_t)speed * duty100;
-	do_div(tmp64, 100);
+	do_div(tmp64, 255);
  	duty = (uint32_t)tmp64;
 
  	WREG32_SOC15(THM, 0, mmCG_FDO_CTRL0,
@@ -1274,12 +1274,12 @@ int smu_v11_0_get_fan_speed_percent(struct smu_context *smu,
  	if (!duty100)
  		return -EINVAL;
 
-	tmp64 = (uint64_t)duty * 100;
+	tmp64 = (uint64_t)duty * 255;
  	do_div(tmp64, duty100);
  	*speed = (uint32_t)tmp64;
 
-	if (*speed > 100)
-		*speed = 100;
+	if (*speed > 255)
+		*speed = 255;
 
  	return 0;
  }

drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c smu_v11_0_set_fan_control_mode(struct smu_context *smu, · line 1326

Quoted 8 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +1 -1
@@ -1320,7 +1320,7 @@ smu_v11_0_set_fan_control_mode(struct smu_context *smu,
 
  	switch (mode) {
  	case AMD_FAN_CTRL_NONE:
-		ret = smu_v11_0_set_fan_speed_percent(smu, 100);
+		ret = smu_v11_0_set_fan_speed_percent(smu, 255);
  		break;
  	case AMD_FAN_CTRL_MANUAL:
  		ret = smu_v11_0_auto_fan_control(smu, 0);

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

author
#13 lore raw

PATCH 6/7 drm/amd/pm: drop unnecessary manual mode check

In reply to Evan Quan

As the fan control was guarded under manual mode before fan speed RPM/PWM setting. Thus the extra check is totally redundant.

Change-Id Ia9d776141ec4aa39255accbf00d7e7ed81c8424d
---
 drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +1 -11
index f0ae0920c07e..319bd7689df4 100644
@@ -1194,9 +1194,6 @@ smu_v11_0_set_fan_speed_percent(struct smu_context *smu, uint32_t speed)
 	if (speed > 255)
 		speed = 255;
 
-	if (smu_v11_0_auto_fan_control(smu, 0))
-		return -EINVAL;
-
 	duty100 = REG_GET_FIELD(RREG32_SOC15(THM, 0, mmCG_FDO_CTRL1),
 				CG_FDO_CTRL1, FMAX_DUTY100);
 	if (!duty100)
@@ -1218,11 +1215,6 @@ int smu_v11_0_set_fan_speed_rpm(struct smu_context *smu,
 {
 	struct amdgpu_device *adev = smu->adev;
 	uint32_t tach_period, crystal_clock_freq;
-	int ret;
-
-	ret = smu_v11_0_auto_fan_control(smu, 0);
-	if (ret)
-		return ret;
 
 	/*
 	 * crystal_clock_freq div by 4 is required since the fan control
@@ -1244,9 +1236,7 @@ int smu_v11_0_set_fan_speed_rpm(struct smu_context *smu,
 				   CG_TACH_CTRL, TARGET_PERIOD,
 				   tach_period));
 
-	ret = smu_v11_0_set_fan_static_mode(smu, FDO_PWM_MODE_STATIC_RPM);
-
-	return ret;
+	return smu_v11_0_set_fan_static_mode(smu, FDO_PWM_MODE_STATIC_RPM);
 }
 
 int smu_v11_0_get_fan_speed_percent(struct smu_context *smu,
Signature · 6 lines
2.29.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
author
#14 lore raw

PATCH 7/7 drm/amd/pm: correct the address of Arcturus fan related registers

In reply to Evan Quan

These registers have different address from other SMU V11 ASICs.

Change-Id Iaeb0438331eed9b0313933da25622f8e4c048fab
---
 .../gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c    | 104 +++++++++++++-----
 1 file changed, 78 insertions(+), 26 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +78 -26
index 319bd7689df4..414c8674e32f 100644
@@ -79,6 +79,24 @@ MODULE_FIRMWARE("amdgpu/beige_goby_smc.bin");
 #define mmTHM_BACO_CNTL_ARCT			0xA7
 #define mmTHM_BACO_CNTL_ARCT_BASE_IDX		0
 
+#define mmCG_FDO_CTRL0_ARCT			0x8B
+#define mmCG_FDO_CTRL0_ARCT_BASE_IDX		0
+
+#define mmCG_FDO_CTRL1_ARCT			0x8C
+#define mmCG_FDO_CTRL1_ARCT_BASE_IDX		0
+
+#define mmCG_FDO_CTRL2_ARCT			0x8D
+#define mmCG_FDO_CTRL2_ARCT_BASE_IDX		0
+
+#define mmCG_TACH_CTRL_ARCT			0x8E
+#define mmCG_TACH_CTRL_ARCT_BASE_IDX		0
+
+#define mmCG_TACH_STATUS_ARCT			0x8F
+#define mmCG_TACH_STATUS_ARCT_BASE_IDX		0
+
+#define mmCG_THERMAL_STATUS_ARCT		0x90
+#define mmCG_THERMAL_STATUS_ARCT_BASE_IDX	0
+
 int smu_v11_0_init_microcode(struct smu_context *smu)
 {
 	struct amdgpu_device *adev = smu->adev;
@@ -1174,12 +1192,21 @@ smu_v11_0_set_fan_static_mode(struct smu_context *smu, uint32_t mode)
 {
 	struct amdgpu_device *adev = smu->adev;
 
-	WREG32_SOC15(THM, 0, mmCG_FDO_CTRL2,
-		     REG_SET_FIELD(RREG32_SOC15(THM, 0, mmCG_FDO_CTRL2),
-				   CG_FDO_CTRL2, TMIN, 0));
-	WREG32_SOC15(THM, 0, mmCG_FDO_CTRL2,
-		     REG_SET_FIELD(RREG32_SOC15(THM, 0, mmCG_FDO_CTRL2),
-				   CG_FDO_CTRL2, FDO_PWM_MODE, mode));
+	if (adev->asic_type == CHIP_ARCTURUS) {
+		WREG32_SOC15(THM, 0, mmCG_FDO_CTRL2_ARCT,
+			     REG_SET_FIELD(RREG32_SOC15(THM, 0, mmCG_FDO_CTRL2_ARCT),
+					   CG_FDO_CTRL2, TMIN, 0));
+		WREG32_SOC15(THM, 0, mmCG_FDO_CTRL2_ARCT,
+			     REG_SET_FIELD(RREG32_SOC15(THM, 0, mmCG_FDO_CTRL2_ARCT),
+					   CG_FDO_CTRL2, FDO_PWM_MODE, mode));
+	} else {
+		WREG32_SOC15(THM, 0, mmCG_FDO_CTRL2,
+			     REG_SET_FIELD(RREG32_SOC15(THM, 0, mmCG_FDO_CTRL2),
+					   CG_FDO_CTRL2, TMIN, 0));
+		WREG32_SOC15(THM, 0, mmCG_FDO_CTRL2,
+			     REG_SET_FIELD(RREG32_SOC15(THM, 0, mmCG_FDO_CTRL2),
+					   CG_FDO_CTRL2, FDO_PWM_MODE, mode));
+	}
 
 	return 0;
 }
@@ -1194,8 +1221,12 @@ smu_v11_0_set_fan_speed_percent(struct smu_context *smu, uint32_t speed)
 	if (speed > 255)
 		speed = 255;
 
-	duty100 = REG_GET_FIELD(RREG32_SOC15(THM, 0, mmCG_FDO_CTRL1),
-				CG_FDO_CTRL1, FMAX_DUTY100);
+	if (adev->asic_type == CHIP_ARCTURUS)
+		duty100 = REG_GET_FIELD(RREG32_SOC15(THM, 0, mmCG_FDO_CTRL1_ARCT),
+					CG_FDO_CTRL1, FMAX_DUTY100);
+	else
+		duty100 = REG_GET_FIELD(RREG32_SOC15(THM, 0, mmCG_FDO_CTRL1),
+					CG_FDO_CTRL1, FMAX_DUTY100);
 	if (!duty100)
 		return -EINVAL;
 
@@ -1203,9 +1234,14 @@ smu_v11_0_set_fan_speed_percent(struct smu_context *smu, uint32_t speed)
 	do_div(tmp64, 255);
 	duty = (uint32_t)tmp64;
 
-	WREG32_SOC15(THM, 0, mmCG_FDO_CTRL0,
-		     REG_SET_FIELD(RREG32_SOC15(THM, 0, mmCG_FDO_CTRL0),
-				   CG_FDO_CTRL0, FDO_STATIC_DUTY, duty));
+	if (adev->asic_type == CHIP_ARCTURUS)
+		WREG32_SOC15(THM, 0, mmCG_FDO_CTRL0_ARCT,
+			     REG_SET_FIELD(RREG32_SOC15(THM, 0, mmCG_FDO_CTRL0_ARCT),
+					   CG_FDO_CTRL0, FDO_STATIC_DUTY, duty));
+	else
+		WREG32_SOC15(THM, 0, mmCG_FDO_CTRL0,
+			     REG_SET_FIELD(RREG32_SOC15(THM, 0, mmCG_FDO_CTRL0),
+					   CG_FDO_CTRL0, FDO_STATIC_DUTY, duty));
 
 	return smu_v11_0_set_fan_static_mode(smu, FDO_PWM_MODE_STATIC);
 }
@@ -1214,13 +1250,14 @@ int smu_v11_0_set_fan_speed_rpm(struct smu_context *smu,
 				uint32_t speed)
 {
 	struct amdgpu_device *adev = smu->adev;
-	uint32_t tach_period, crystal_clock_freq;
-
 	/*
 	 * crystal_clock_freq div by 4 is required since the fan control
 	 * module refers to 25MHz
+	 * crystal_clock_freq used for fan speed rpm calculation is
+	 * always 25Mhz. So, hardcode it as 2500(in 10K unit).
 	 */
-	crystal_clock_freq = amdgpu_asic_get_xclk(adev) / 4;
+	uint32_t crystal_clock_freq = 2500;
+	uint32_t tach_period;
 
 	/*
 	 * To prevent from possible overheat, some ASICs may have requirement
@@ -1231,10 +1268,16 @@ int smu_v11_0_set_fan_speed_rpm(struct smu_context *smu,
 	 *   lower than 500 RPM.
 	 */
 	tach_period = 60 * crystal_clock_freq * 10000 / (8 * speed);
-	WREG32_SOC15(THM, 0, mmCG_TACH_CTRL,
-		     REG_SET_FIELD(RREG32_SOC15(THM, 0, mmCG_TACH_CTRL),
-				   CG_TACH_CTRL, TARGET_PERIOD,
-				   tach_period));
+	if (adev->asic_type == CHIP_ARCTURUS)
+		WREG32_SOC15(THM, 0, mmCG_TACH_CTRL_ARCT,
+			     REG_SET_FIELD(RREG32_SOC15(THM, 0, mmCG_TACH_CTRL_ARCT),
+					   CG_TACH_CTRL, TARGET_PERIOD,
+					   tach_period));
+	else
+		WREG32_SOC15(THM, 0, mmCG_TACH_CTRL,
+			     REG_SET_FIELD(RREG32_SOC15(THM, 0, mmCG_TACH_CTRL),
+					   CG_TACH_CTRL, TARGET_PERIOD,
+					   tach_period));
 
 	return smu_v11_0_set_fan_static_mode(smu, FDO_PWM_MODE_STATIC_RPM);
 }
@@ -1257,10 +1300,17 @@ int smu_v11_0_get_fan_speed_percent(struct smu_context *smu,
 		return 0;
 	}
 
-	duty100 = REG_GET_FIELD(RREG32_SOC15(THM, 0, mmCG_FDO_CTRL1),
-				CG_FDO_CTRL1, FMAX_DUTY100);
-	duty = REG_GET_FIELD(RREG32_SOC15(THM, 0, mmCG_THERMAL_STATUS),
-				CG_THERMAL_STATUS, FDO_PWM_DUTY);
+	if (adev->asic_type == CHIP_ARCTURUS) {
+		duty100 = REG_GET_FIELD(RREG32_SOC15(THM, 0, mmCG_FDO_CTRL1_ARCT),
+					CG_FDO_CTRL1, FMAX_DUTY100);
+		duty = REG_GET_FIELD(RREG32_SOC15(THM, 0, mmCG_THERMAL_STATUS_ARCT),
+					CG_THERMAL_STATUS, FDO_PWM_DUTY);
+	} else {
+		duty100 = REG_GET_FIELD(RREG32_SOC15(THM, 0, mmCG_FDO_CTRL1),
+					CG_FDO_CTRL1, FMAX_DUTY100);
+		duty = REG_GET_FIELD(RREG32_SOC15(THM, 0, mmCG_THERMAL_STATUS),
+					CG_THERMAL_STATUS, FDO_PWM_DUTY);
+	}
 	if (!duty100)
 		return -EINVAL;
 
@@ -1278,7 +1328,8 @@ int smu_v11_0_get_fan_speed_rpm(struct smu_context *smu,
 				uint32_t *speed)
 {
 	struct amdgpu_device *adev = smu->adev;
-	uint32_t tach_status, crystal_clock_freq;
+	uint32_t crystal_clock_freq = 2500;
+	uint32_t tach_status;
 	uint64_t tmp64;
 
 	/*
@@ -1292,10 +1343,11 @@ int smu_v11_0_get_fan_speed_rpm(struct smu_context *smu,
 		return 0;
 	}
 
-	crystal_clock_freq = amdgpu_asic_get_xclk(adev) / 4;
 	tmp64 = (uint64_t)crystal_clock_freq * 60 * 10000;
-
-	tach_status = RREG32_SOC15(THM, 0, mmCG_TACH_STATUS);
+	if (adev->asic_type == CHIP_ARCTURUS)
+		tach_status = RREG32_SOC15(THM, 0, mmCG_TACH_STATUS_ARCT);
+	else
+		tach_status = RREG32_SOC15(THM, 0, mmCG_TACH_STATUS);
 	do_div(tmp64, tach_status);
 	*speed = (uint32_t)tmp64;
 
Signature · 6 lines
2.29.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#15 lore raw

Re: [PATCH 7/7] drm/amd/pm: correct the address of Arcturus fan related registers

Arcturus callbacks were dropped in another patch in this series. Instead of dropping, better to keep the callbacks and use the specific reg offsets.

Thanks,
Lijo

Quoted 175 lines · Evan Quan

These registers have different address from other SMU V11 ASICs.

Change-Id Iaeb0438331eed9b0313933da25622f8e4c048fab
---
  .../gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c    | 104 +++++++++++++-----
  1 file changed, 78 insertions(+), 26 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +74 -24
index 319bd7689df4..414c8674e32f 100644
@@ -79,6 +79,24 @@ MODULE_FIRMWARE("amdgpu/beige_goby_smc.bin");
  #define mmTHM_BACO_CNTL_ARCT			0xA7
  #define mmTHM_BACO_CNTL_ARCT_BASE_IDX		0
 
+#define mmCG_FDO_CTRL0_ARCT			0x8B
+#define mmCG_FDO_CTRL0_ARCT_BASE_IDX		0
+
+#define mmCG_FDO_CTRL1_ARCT			0x8C
+#define mmCG_FDO_CTRL1_ARCT_BASE_IDX		0
+
+#define mmCG_FDO_CTRL2_ARCT			0x8D
+#define mmCG_FDO_CTRL2_ARCT_BASE_IDX		0
+
+#define mmCG_TACH_CTRL_ARCT			0x8E
+#define mmCG_TACH_CTRL_ARCT_BASE_IDX		0
+
+#define mmCG_TACH_STATUS_ARCT			0x8F
+#define mmCG_TACH_STATUS_ARCT_BASE_IDX		0
+
+#define mmCG_THERMAL_STATUS_ARCT		0x90
+#define mmCG_THERMAL_STATUS_ARCT_BASE_IDX	0
+
  int smu_v11_0_init_microcode(struct smu_context *smu)
  {
  	struct amdgpu_device *adev = smu->adev;
@@ -1174,12 +1192,21 @@ smu_v11_0_set_fan_static_mode(struct smu_context *smu, uint32_t mode)
  {
  	struct amdgpu_device *adev = smu->adev;
 
-	WREG32_SOC15(THM, 0, mmCG_FDO_CTRL2,
-		     REG_SET_FIELD(RREG32_SOC15(THM, 0, mmCG_FDO_CTRL2),
-				   CG_FDO_CTRL2, TMIN, 0));
-	WREG32_SOC15(THM, 0, mmCG_FDO_CTRL2,
-		     REG_SET_FIELD(RREG32_SOC15(THM, 0, mmCG_FDO_CTRL2),
-				   CG_FDO_CTRL2, FDO_PWM_MODE, mode));
+	if (adev->asic_type == CHIP_ARCTURUS) {
+		WREG32_SOC15(THM, 0, mmCG_FDO_CTRL2_ARCT,
+			     REG_SET_FIELD(RREG32_SOC15(THM, 0, mmCG_FDO_CTRL2_ARCT),
+					   CG_FDO_CTRL2, TMIN, 0));
+		WREG32_SOC15(THM, 0, mmCG_FDO_CTRL2_ARCT,
+			     REG_SET_FIELD(RREG32_SOC15(THM, 0, mmCG_FDO_CTRL2_ARCT),
+					   CG_FDO_CTRL2, FDO_PWM_MODE, mode));
+	} else {
+		WREG32_SOC15(THM, 0, mmCG_FDO_CTRL2,
+			     REG_SET_FIELD(RREG32_SOC15(THM, 0, mmCG_FDO_CTRL2),
+					   CG_FDO_CTRL2, TMIN, 0));
+		WREG32_SOC15(THM, 0, mmCG_FDO_CTRL2,
+			     REG_SET_FIELD(RREG32_SOC15(THM, 0, mmCG_FDO_CTRL2),
+					   CG_FDO_CTRL2, FDO_PWM_MODE, mode));
+	}
 
  	return 0;
  }
@@ -1194,8 +1221,12 @@ smu_v11_0_set_fan_speed_percent(struct smu_context *smu, uint32_t speed)
  	if (speed > 255)
  		speed = 255;
 
-	duty100 = REG_GET_FIELD(RREG32_SOC15(THM, 0, mmCG_FDO_CTRL1),
-				CG_FDO_CTRL1, FMAX_DUTY100);
+	if (adev->asic_type == CHIP_ARCTURUS)
+		duty100 = REG_GET_FIELD(RREG32_SOC15(THM, 0, mmCG_FDO_CTRL1_ARCT),
+					CG_FDO_CTRL1, FMAX_DUTY100);
+	else
+		duty100 = REG_GET_FIELD(RREG32_SOC15(THM, 0, mmCG_FDO_CTRL1),
+					CG_FDO_CTRL1, FMAX_DUTY100);
  	if (!duty100)
  		return -EINVAL;
 
@@ -1203,9 +1234,14 @@ smu_v11_0_set_fan_speed_percent(struct smu_context *smu, uint32_t speed)
  	do_div(tmp64, 255);
  	duty = (uint32_t)tmp64;
 
-	WREG32_SOC15(THM, 0, mmCG_FDO_CTRL0,
-		     REG_SET_FIELD(RREG32_SOC15(THM, 0, mmCG_FDO_CTRL0),
-				   CG_FDO_CTRL0, FDO_STATIC_DUTY, duty));
+	if (adev->asic_type == CHIP_ARCTURUS)
+		WREG32_SOC15(THM, 0, mmCG_FDO_CTRL0_ARCT,
+			     REG_SET_FIELD(RREG32_SOC15(THM, 0, mmCG_FDO_CTRL0_ARCT),
+					   CG_FDO_CTRL0, FDO_STATIC_DUTY, duty));
+	else
+		WREG32_SOC15(THM, 0, mmCG_FDO_CTRL0,
+			     REG_SET_FIELD(RREG32_SOC15(THM, 0, mmCG_FDO_CTRL0),
+					   CG_FDO_CTRL0, FDO_STATIC_DUTY, duty));
 
  	return smu_v11_0_set_fan_static_mode(smu, FDO_PWM_MODE_STATIC);
  }
@@ -1214,13 +1250,14 @@ int smu_v11_0_set_fan_speed_rpm(struct smu_context *smu,
  				uint32_t speed)
  {
  	struct amdgpu_device *adev = smu->adev;
-	uint32_t tach_period, crystal_clock_freq;
-
  	/*
  	 * crystal_clock_freq div by 4 is required since the fan control
  	 * module refers to 25MHz
+	 * crystal_clock_freq used for fan speed rpm calculation is
+	 * always 25Mhz. So, hardcode it as 2500(in 10K unit).
  	 */
-	crystal_clock_freq = amdgpu_asic_get_xclk(adev) / 4;
+	uint32_t crystal_clock_freq = 2500;
+	uint32_t tach_period;
 
  	/*
  	 * To prevent from possible overheat, some ASICs may have requirement
@@ -1231,10 +1268,16 @@ int smu_v11_0_set_fan_speed_rpm(struct smu_context *smu,
  	 *   lower than 500 RPM.
  	 */
  	tach_period = 60 * crystal_clock_freq * 10000 / (8 * speed);
-	WREG32_SOC15(THM, 0, mmCG_TACH_CTRL,
-		     REG_SET_FIELD(RREG32_SOC15(THM, 0, mmCG_TACH_CTRL),
-				   CG_TACH_CTRL, TARGET_PERIOD,
-				   tach_period));
+	if (adev->asic_type == CHIP_ARCTURUS)
+		WREG32_SOC15(THM, 0, mmCG_TACH_CTRL_ARCT,
+			     REG_SET_FIELD(RREG32_SOC15(THM, 0, mmCG_TACH_CTRL_ARCT),
+					   CG_TACH_CTRL, TARGET_PERIOD,
+					   tach_period));
+	else
+		WREG32_SOC15(THM, 0, mmCG_TACH_CTRL,
+			     REG_SET_FIELD(RREG32_SOC15(THM, 0, mmCG_TACH_CTRL),
+					   CG_TACH_CTRL, TARGET_PERIOD,
+					   tach_period));
 
  	return smu_v11_0_set_fan_static_mode(smu, FDO_PWM_MODE_STATIC_RPM);
  }
@@ -1257,10 +1300,17 @@ int smu_v11_0_get_fan_speed_percent(struct smu_context *smu,
  		return 0;
  	}
 
-	duty100 = REG_GET_FIELD(RREG32_SOC15(THM, 0, mmCG_FDO_CTRL1),
-				CG_FDO_CTRL1, FMAX_DUTY100);
-	duty = REG_GET_FIELD(RREG32_SOC15(THM, 0, mmCG_THERMAL_STATUS),
-				CG_THERMAL_STATUS, FDO_PWM_DUTY);
+	if (adev->asic_type == CHIP_ARCTURUS) {
+		duty100 = REG_GET_FIELD(RREG32_SOC15(THM, 0, mmCG_FDO_CTRL1_ARCT),
+					CG_FDO_CTRL1, FMAX_DUTY100);
+		duty = REG_GET_FIELD(RREG32_SOC15(THM, 0, mmCG_THERMAL_STATUS_ARCT),
+					CG_THERMAL_STATUS, FDO_PWM_DUTY);
+	} else {
+		duty100 = REG_GET_FIELD(RREG32_SOC15(THM, 0, mmCG_FDO_CTRL1),
+					CG_FDO_CTRL1, FMAX_DUTY100);
+		duty = REG_GET_FIELD(RREG32_SOC15(THM, 0, mmCG_THERMAL_STATUS),
+					CG_THERMAL_STATUS, FDO_PWM_DUTY);
+	}
  	if (!duty100)
  		return -EINVAL;
 
@@ -1278,7 +1328,8 @@ int smu_v11_0_get_fan_speed_rpm(struct smu_context *smu,
  				uint32_t *speed)
  {
  	struct amdgpu_device *adev = smu->adev;
-	uint32_t tach_status, crystal_clock_freq;
+	uint32_t crystal_clock_freq = 2500;
+	uint32_t tach_status;
  	uint64_t tmp64;
 
  	/*
@@ -1292,10 +1343,11 @@ int smu_v11_0_get_fan_speed_rpm(struct smu_context *smu,
  		return 0;
  	}
 
-	crystal_clock_freq = amdgpu_asic_get_xclk(adev) / 4;

drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c int smu_v11_0_get_fan_speed_rpm(struct smu_context *smu, · line 1353

Quoted 10 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +4 -2
  	tmp64 = (uint64_t)crystal_clock_freq * 60 * 10000;
-
-	tach_status = RREG32_SOC15(THM, 0, mmCG_TACH_STATUS);
+	if (adev->asic_type == CHIP_ARCTURUS)
+		tach_status = RREG32_SOC15(THM, 0, mmCG_TACH_STATUS_ARCT);
+	else
+		tach_status = RREG32_SOC15(THM, 0, mmCG_TACH_STATUS);
  	do_div(tmp64, tach_status);
  	*speed = (uint32_t)tmp64;
 

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#16 lore raw
In reply to Evan Quan

[Public]

tach_period = 60 * crystal_clock_freq * 10000 / (8 * speed);

Any multiplication's overflow possibility?

Regards,
Guchun

-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Evan Quan
Sent: Wednesday, July 7, 2021 9:57 AM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; Quan, Evan <[email protected]>
Subject: [PATCH 1/7] drm/amd/pm: correct the fan speed RPM setting

The relationship "PWM = RPM / smu->fan_max_rpm" between fan speed PWM and RPM is not true for SMU11 ASICs. So, we need a new way to perform the fan speed RPM setting.

Change-Id I1afe8102f02ead9a8a07c7105f689ac60a85b0d8
---
 drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h       |  5 +++
 drivers/gpu/drm/amd/pm/inc/smu_v11_0.h        |  3 ++
 drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c     |  9 ++---
 .../gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c |  1 +
 .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c   |  1 +
 .../amd/pm/swsmu/smu11/sienna_cichlid_ppt.c   |  1 +
 .../gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c    | 36 +++++++++++++++++++
 7 files changed, 52 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +5 -0
index 3e89852e4820..6301e4cb3c2a 100644
@@ -1039,6 +1039,11 @@ struct pptable_funcs {
 	 */
 	int (*set_fan_speed_percent)(struct smu_context *smu, uint32_t speed);
 
+	/**
+	 * @set_fan_speed_rpm: Set a static fan speed in rpm.
+	 */
+	int (*set_fan_speed_rpm)(struct smu_context *smu, uint32_t speed);
+
 	/**
 	 * @set_xgmi_pstate: Set inter-chip global memory interconnect pstate.
 	 * &pstate: Pstate to set. D0 if Nonzero, D3 otherwise.
drivers/gpu/drm/amd/pm/inc/smu_v11_0.h +3 -0
index b89e7dca8906..134a33e3de91 100644
@@ -223,6 +223,9 @@ smu_v11_0_set_fan_control_mode(struct smu_context *smu,  int smu_v11_0_set_fan_speed_percent(struct smu_context *smu,
 				    uint32_t speed);
 
+int smu_v11_0_set_fan_speed_rpm(struct smu_context *smu,
+				uint32_t speed);
+
 int smu_v11_0_set_xgmi_pstate(struct smu_context *smu,
 				     uint32_t pstate);
 
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +5 -4
index ebe672142808..576e9ea68fd1 100644
@@ -2174,11 +2174,12 @@ static int smu_set_fan_speed_rpm(void *handle, uint32_t speed)
 
 	mutex_lock(&smu->mutex);
 
-	if (smu->ppt_funcs->set_fan_speed_percent) {
-		percent = speed * 100 / smu->fan_max_rpm;
-		ret = smu->ppt_funcs->set_fan_speed_percent(smu, percent);
-		if (!ret && !(smu->user_dpm_profile.flags & SMU_DPM_USER_PROFILE_RESTORE))
+	if (smu->ppt_funcs->set_fan_speed_rpm) {
+		ret = smu->ppt_funcs->set_fan_speed_rpm(smu, speed);
+		if (!ret && smu->user_dpm_profile.flags & SMU_DPM_USER_PROFILE_RESTORE) {
+			percent = speed * 100 / smu->fan_max_rpm;
 			smu->user_dpm_profile.fan_speed_percent = percent;
+		}
 	}
 
 	mutex_unlock(&smu->mutex);
drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c +1 -0
index 6b3e0ea10163..047adf6dd444 100644
@@ -2314,6 +2314,7 @@ static const struct pptable_funcs arcturus_ppt_funcs = {
 	.get_fan_control_mode = smu_v11_0_get_fan_control_mode,
 	.set_fan_control_mode = smu_v11_0_set_fan_control_mode,
 	.set_fan_speed_percent = smu_v11_0_set_fan_speed_percent,
+	.set_fan_speed_rpm = smu_v11_0_set_fan_speed_rpm,
 	.set_xgmi_pstate = smu_v11_0_set_xgmi_pstate,
 	.gfx_off_control = smu_v11_0_gfx_off_control,
 	.register_irq_handler = smu_v11_0_register_irq_handler, diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c

index 59ea59acfb00..d8a011483dcf 100644

drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1 -0
@@ -3248,6 +3248,7 @@ static const struct pptable_funcs navi10_ppt_funcs = {
 	.get_fan_control_mode = smu_v11_0_get_fan_control_mode,
 	.set_fan_control_mode = smu_v11_0_set_fan_control_mode,
 	.set_fan_speed_percent = smu_v11_0_set_fan_speed_percent,
+	.set_fan_speed_rpm = smu_v11_0_set_fan_speed_rpm,
 	.set_xgmi_pstate = smu_v11_0_set_xgmi_pstate,
 	.gfx_off_control = smu_v11_0_gfx_off_control,
 	.register_irq_handler = smu_v11_0_register_irq_handler, diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c

index 83d8e53ca1f8..dad120294c19 100644

drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +1 -0
@@ -3886,6 +3886,7 @@ static const struct pptable_funcs sienna_cichlid_ppt_funcs = {
 	.get_fan_control_mode = smu_v11_0_get_fan_control_mode,
 	.set_fan_control_mode = smu_v11_0_set_fan_control_mode,
 	.set_fan_speed_percent = smu_v11_0_set_fan_speed_percent,
+	.set_fan_speed_rpm = smu_v11_0_set_fan_speed_rpm,
 	.set_xgmi_pstate = smu_v11_0_set_xgmi_pstate,
 	.gfx_off_control = smu_v11_0_gfx_off_control,
 	.register_irq_handler = smu_v11_0_register_irq_handler, diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c

index 388c5cb5c647..fefc8e93fdc6 100644

drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +36 -1
@@ -1213,6 +1213,42 @@ smu_v11_0_set_fan_speed_percent(struct smu_context *smu, uint32_t speed)
 	return smu_v11_0_set_fan_static_mode(smu, FDO_PWM_MODE_STATIC);  }
 
+int smu_v11_0_set_fan_speed_rpm(struct smu_context *smu,
+				uint32_t speed)
+{
+	struct amdgpu_device *adev = smu->adev;
+	uint32_t tach_period, crystal_clock_freq;
+	int ret;
+
+	ret = smu_v11_0_auto_fan_control(smu, 0);
+	if (ret)
+		return ret;
+
+	/*
+	 * crystal_clock_freq div by 4 is required since the fan control
+	 * module refers to 25MHz
+	 */
+	crystal_clock_freq = amdgpu_asic_get_xclk(adev) / 4;
+
+	/*
+	 * To prevent from possible overheat, some ASICs may have requirement
+	 * for minimum fan speed:
+	 * - For some NV10 SKU, the fan speed cannot be set lower than
+	 *   700 RPM.
+	 * - For some Sienna Cichlid SKU, the fan speed cannot be set
+	 *   lower than 500 RPM.
+	 */
+	tach_period = 60 * crystal_clock_freq * 10000 / (8 * speed);
+	WREG32_SOC15(THM, 0, mmCG_TACH_CTRL,
+		     REG_SET_FIELD(RREG32_SOC15(THM, 0, mmCG_TACH_CTRL),
+				   CG_TACH_CTRL, TARGET_PERIOD,
+				   tach_period));
+
+	ret = smu_v11_0_set_fan_static_mode(smu, FDO_PWM_MODE_STATIC_RPM);
+
+	return ret;
+}
+
 int
 smu_v11_0_set_fan_control_mode(struct smu_context *smu,
 			       uint32_t mode)
--

2.29.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&amp;data=04%7C01%7Cguchun.chen%40amd.com%7C645297d9dabb45cde58708d940ead718%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637612199673041719%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=u55f4UA2CryPci5gT95LVEm%2F1%2FGeys0N39USkBTgTFM%3D&amp;reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

author
#17 lore raw

[Public]

Quoted 8 lines

-----Original Message-----
From: Chen, Guchun <[email protected]>
Sent: Wednesday, July 7, 2021 12:48 PM
To: Quan, Evan <[email protected]>; [email protected]
Cc: Deucher, Alexander <[email protected]>; Quan, Evan <[email protected]>
Subject: RE: [PATCH 1/7] drm/amd/pm: correct the fan speed RPM setting

Quoted 5 lines

[Public]

tach_period = 60 * crystal_clock_freq * 10000 / (8 * speed);

Any multiplication's overflow possibility?

[Quan, Evan] crystal_clock_freq is actually always 2500. So, it's pretty safe here. BR
Evan

Quoted 200 lines

Regards,
Guchun

-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Evan Quan
Sent: Wednesday, July 7, 2021 9:57 AM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; Quan, Evan <[email protected]>
Subject: [PATCH 1/7] drm/amd/pm: correct the fan speed RPM setting

The relationship "PWM = RPM / smu->fan_max_rpm" between fan speed PWM and RPM is not true for SMU11 ASICs. So, we need a new way to perform the fan speed RPM setting.

Change-Id I1afe8102f02ead9a8a07c7105f689ac60a85b0d8
---
 drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h       |  5 +++
 drivers/gpu/drm/amd/pm/inc/smu_v11_0.h        |  3 ++
 drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c     |  9 ++---
 .../gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c |  1 +
 .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c   |  1 +
 .../amd/pm/swsmu/smu11/sienna_cichlid_ppt.c   |  1 +
 .../gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c    | 36
+++++++++++++++++++
 7 files changed, 52 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +5 -0
index 3e89852e4820..6301e4cb3c2a 100644
@@ -1039,6 +1039,11 @@ struct pptable_funcs {
 	 */
 	int (*set_fan_speed_percent)(struct smu_context *smu, uint32_t
 speed);
 
+	/**
+	 * @set_fan_speed_rpm: Set a static fan speed in rpm.
+	 */
+	int (*set_fan_speed_rpm)(struct smu_context *smu, uint32_t
 speed);
+
 	/**

* @set_xgmi_pstate: Set inter-chip global memory interconnect
pstate.

drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +0 -0
 	 * &pstate: Pstate to set. D0 if Nonzero, D3 otherwise.
drivers/gpu/drm/amd/pm/inc/smu_v11_0.h +0 -0
index b89e7dca8906..134a33e3de91 100644
@@ -223,6 +223,9 @@ smu_v11_0_set_fan_control_mode(struct

smu_context *smu, int smu_v11_0_set_fan_speed_percent(struct smu_context *smu,

drivers/gpu/drm/amd/pm/inc/smu_v11_0.h +3 -0
 				    uint32_t speed);
 
+int smu_v11_0_set_fan_speed_rpm(struct smu_context *smu,
+				uint32_t speed);
+
 int smu_v11_0_set_xgmi_pstate(struct smu_context *smu,
 				     uint32_t pstate);
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +4 -4
index ebe672142808..576e9ea68fd1 100644
@@ -2174,11 +2174,12 @@ static int smu_set_fan_speed_rpm(void *handle,
 uint32_t speed)
 
 	mutex_lock(&smu->mutex);
 
-	if (smu->ppt_funcs->set_fan_speed_percent) {
-		percent = speed * 100 / smu->fan_max_rpm;
-		ret = smu->ppt_funcs->set_fan_speed_percent(smu,
 percent);
-		if (!ret && !(smu->user_dpm_profile.flags &
 SMU_DPM_USER_PROFILE_RESTORE))
+	if (smu->ppt_funcs->set_fan_speed_rpm) {
+		ret = smu->ppt_funcs->set_fan_speed_rpm(smu, speed);
+		if (!ret && smu->user_dpm_profile.flags &
 SMU_DPM_USER_PROFILE_RESTORE) {
+			percent = speed * 100 / smu->fan_max_rpm;
 			smu->user_dpm_profile.fan_speed_percent =

percent;

drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +1 -0
+		}
 	}
 
 	mutex_unlock(&smu->mutex);
drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c +1 -0
index 6b3e0ea10163..047adf6dd444 100644
@@ -2314,6 +2314,7 @@ static const struct pptable_funcs
 arcturus_ppt_funcs = {
 	.get_fan_control_mode = smu_v11_0_get_fan_control_mode,
 	.set_fan_control_mode = smu_v11_0_set_fan_control_mode,
 	.set_fan_speed_percent = smu_v11_0_set_fan_speed_percent,
+	.set_fan_speed_rpm = smu_v11_0_set_fan_speed_rpm,
 	.set_xgmi_pstate = smu_v11_0_set_xgmi_pstate,
 	.gfx_off_control = smu_v11_0_gfx_off_control,

.register_irq_handler = smu_v11_0_register_irq_handler, diff --git
a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
index 59ea59acfb00..d8a011483dcf 100644

drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1 -0
@@ -3248,6 +3248,7 @@ static const struct pptable_funcs navi10_ppt_funcs
 = {
 	.get_fan_control_mode = smu_v11_0_get_fan_control_mode,
 	.set_fan_control_mode = smu_v11_0_set_fan_control_mode,
 	.set_fan_speed_percent = smu_v11_0_set_fan_speed_percent,
+	.set_fan_speed_rpm = smu_v11_0_set_fan_speed_rpm,
 	.set_xgmi_pstate = smu_v11_0_set_xgmi_pstate,
 	.gfx_off_control = smu_v11_0_gfx_off_control,

.register_irq_handler = smu_v11_0_register_irq_handler, diff --git
a/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c index 83d8e53ca1f8..dad120294c19 100644

drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +1 -0
@@ -3886,6 +3886,7 @@ static const struct pptable_funcs
 sienna_cichlid_ppt_funcs = {
 	.get_fan_control_mode = smu_v11_0_get_fan_control_mode,
 	.set_fan_control_mode = smu_v11_0_set_fan_control_mode,
 	.set_fan_speed_percent = smu_v11_0_set_fan_speed_percent,
+	.set_fan_speed_rpm = smu_v11_0_set_fan_speed_rpm,
 	.set_xgmi_pstate = smu_v11_0_set_xgmi_pstate,
 	.gfx_off_control = smu_v11_0_gfx_off_control,

.register_irq_handler = smu_v11_0_register_irq_handler, diff --git
a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
index 388c5cb5c647..fefc8e93fdc6 100644

drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +19 -0
@@ -1213,6 +1213,42 @@ smu_v11_0_set_fan_speed_percent(struct
 smu_context *smu, uint32_t speed)
 	return smu_v11_0_set_fan_static_mode(smu,
 FDO_PWM_MODE_STATIC);  }
 
+int smu_v11_0_set_fan_speed_rpm(struct smu_context *smu,
+				uint32_t speed)
+{
+	struct amdgpu_device *adev = smu->adev;
+	uint32_t tach_period, crystal_clock_freq;
+	int ret;
+
+	ret = smu_v11_0_auto_fan_control(smu, 0);
+	if (ret)
+		return ret;
+
+	/*
+	 * crystal_clock_freq div by 4 is required since the fan control
+	 * module refers to 25MHz
+	 */
+	crystal_clock_freq = amdgpu_asic_get_xclk(adev) / 4;
+
+	/*
+	 * To prevent from possible overheat, some ASICs may have

requirement

drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +9 -0
+	 * for minimum fan speed:
+	 * - For some NV10 SKU, the fan speed cannot be set lower than
+	 *   700 RPM.
+	 * - For some Sienna Cichlid SKU, the fan speed cannot be set
+	 *   lower than 500 RPM.
+	 */
+	tach_period = 60 * crystal_clock_freq * 10000 / (8 * speed);
+	WREG32_SOC15(THM, 0, mmCG_TACH_CTRL,
+		     REG_SET_FIELD(RREG32_SOC15(THM, 0,

mmCG_TACH_CTRL),

drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +4 -0
+				   CG_TACH_CTRL, TARGET_PERIOD,
+				   tach_period));
+
+	ret = smu_v11_0_set_fan_static_mode(smu,

FDO_PWM_MODE_STATIC_RPM);

drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +4 -1
+
+	return ret;
+}
+
 int
 smu_v11_0_set_fan_control_mode(struct smu_context *smu,
 			       uint32_t mode)
--

2.29.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.
freedesktop.org%2Fmailman%2Flistinfo%2Famd- gfx&amp;data=04%7C01%7Cguchun.chen%40amd.com%7C645297d9dabb45c de58708d940ead718%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7 C637612199673041719%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAw MDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sda ta=u55f4UA2CryPci5gT95LVEm%2F1%2FGeys0N39USkBTgTFM%3D&amp;res erved=0

#18 lore raw
In reply to Evan Quan
Quoted 118 lines · Evan Quan

The relationship "PWM = RPM / smu->fan_max_rpm" between fan speed PWM and RPM is not true for SMU11 ASICs. So, we need a new way to perform the fan speed RPM setting.

Change-Id I1afe8102f02ead9a8a07c7105f689ac60a85b0d8
---
  drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h       |  5 +++
  drivers/gpu/drm/amd/pm/inc/smu_v11_0.h        |  3 ++
  drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c     |  9 ++---
  .../gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c |  1 +
  .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c   |  1 +
  .../amd/pm/swsmu/smu11/sienna_cichlid_ppt.c   |  1 +
  .../gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c    | 36 +++++++++++++++++++
  7 files changed, 52 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +5 -0
index 3e89852e4820..6301e4cb3c2a 100644
@@ -1039,6 +1039,11 @@ struct pptable_funcs {
  	 */
  	int (*set_fan_speed_percent)(struct smu_context *smu, uint32_t speed);
 
+	/**
+	 * @set_fan_speed_rpm: Set a static fan speed in rpm.
+	 */
+	int (*set_fan_speed_rpm)(struct smu_context *smu, uint32_t speed);
+
  	/**
  	 * @set_xgmi_pstate: Set inter-chip global memory interconnect pstate.
  	 * &pstate: Pstate to set. D0 if Nonzero, D3 otherwise.
drivers/gpu/drm/amd/pm/inc/smu_v11_0.h +3 -0
index b89e7dca8906..134a33e3de91 100644
@@ -223,6 +223,9 @@ smu_v11_0_set_fan_control_mode(struct smu_context *smu,
  int smu_v11_0_set_fan_speed_percent(struct smu_context *smu,
  				    uint32_t speed);
 
+int smu_v11_0_set_fan_speed_rpm(struct smu_context *smu,
+				uint32_t speed);
+
  int smu_v11_0_set_xgmi_pstate(struct smu_context *smu,
  				     uint32_t pstate);
 
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +5 -4
index ebe672142808..576e9ea68fd1 100644
@@ -2174,11 +2174,12 @@ static int smu_set_fan_speed_rpm(void *handle, uint32_t speed)
 
  	mutex_lock(&smu->mutex);
 
-	if (smu->ppt_funcs->set_fan_speed_percent) {
-		percent = speed * 100 / smu->fan_max_rpm;
-		ret = smu->ppt_funcs->set_fan_speed_percent(smu, percent);
-		if (!ret && !(smu->user_dpm_profile.flags & SMU_DPM_USER_PROFILE_RESTORE))
+	if (smu->ppt_funcs->set_fan_speed_rpm) {
+		ret = smu->ppt_funcs->set_fan_speed_rpm(smu, speed);
+		if (!ret && smu->user_dpm_profile.flags & SMU_DPM_USER_PROFILE_RESTORE) {
+			percent = speed * 100 / smu->fan_max_rpm;
  			smu->user_dpm_profile.fan_speed_percent = percent;
+		}
  	}
 
  	mutex_unlock(&smu->mutex);
drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c +1 -0
index 6b3e0ea10163..047adf6dd444 100644
@@ -2314,6 +2314,7 @@ static const struct pptable_funcs arcturus_ppt_funcs = {
  	.get_fan_control_mode = smu_v11_0_get_fan_control_mode,
  	.set_fan_control_mode = smu_v11_0_set_fan_control_mode,
  	.set_fan_speed_percent = smu_v11_0_set_fan_speed_percent,
+	.set_fan_speed_rpm = smu_v11_0_set_fan_speed_rpm,
  	.set_xgmi_pstate = smu_v11_0_set_xgmi_pstate,
  	.gfx_off_control = smu_v11_0_gfx_off_control,
  	.register_irq_handler = smu_v11_0_register_irq_handler,
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1 -0
index 59ea59acfb00..d8a011483dcf 100644
@@ -3248,6 +3248,7 @@ static const struct pptable_funcs navi10_ppt_funcs = {
  	.get_fan_control_mode = smu_v11_0_get_fan_control_mode,
  	.set_fan_control_mode = smu_v11_0_set_fan_control_mode,
  	.set_fan_speed_percent = smu_v11_0_set_fan_speed_percent,
+	.set_fan_speed_rpm = smu_v11_0_set_fan_speed_rpm,
  	.set_xgmi_pstate = smu_v11_0_set_xgmi_pstate,
  	.gfx_off_control = smu_v11_0_gfx_off_control,
  	.register_irq_handler = smu_v11_0_register_irq_handler,
drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +1 -0
index 83d8e53ca1f8..dad120294c19 100644
@@ -3886,6 +3886,7 @@ static const struct pptable_funcs sienna_cichlid_ppt_funcs = {
  	.get_fan_control_mode = smu_v11_0_get_fan_control_mode,
  	.set_fan_control_mode = smu_v11_0_set_fan_control_mode,
  	.set_fan_speed_percent = smu_v11_0_set_fan_speed_percent,
+	.set_fan_speed_rpm = smu_v11_0_set_fan_speed_rpm,
  	.set_xgmi_pstate = smu_v11_0_set_xgmi_pstate,
  	.gfx_off_control = smu_v11_0_gfx_off_control,
  	.register_irq_handler = smu_v11_0_register_irq_handler,
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +7 -0
index 388c5cb5c647..fefc8e93fdc6 100644
@@ -1213,6 +1213,42 @@ smu_v11_0_set_fan_speed_percent(struct smu_context *smu, uint32_t speed)
  	return smu_v11_0_set_fan_static_mode(smu, FDO_PWM_MODE_STATIC);
  }
 
+int smu_v11_0_set_fan_speed_rpm(struct smu_context *smu,
+				uint32_t speed)
+{
+	struct amdgpu_device *adev = smu->adev;
+	uint32_t tach_period, crystal_clock_freq;
+	int ret;
+

drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c smu_v11_0_set_fan_speed_percent(struct smu_context *smu, uint32_t speed) · line 1232

Quoted 10 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +10 -0
+	ret = smu_v11_0_auto_fan_control(smu, 0);
+	if (ret)
+		return ret;
+
+	/*
+	 * crystal_clock_freq div by 4 is required since the fan control
+	 * module refers to 25MHz
+	 */
+	crystal_clock_freq = amdgpu_asic_get_xclk(adev) / 4;
+

Just hardcode this as 25MHz, no need to relate it to ASIC clk.

Thanks,
Lijo

Quoted 13 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +12 -0
+	/*
+	 * To prevent from possible overheat, some ASICs may have requirement
+	 * for minimum fan speed:
+	 * - For some NV10 SKU, the fan speed cannot be set lower than
+	 *   700 RPM.
+	 * - For some Sienna Cichlid SKU, the fan speed cannot be set
+	 *   lower than 500 RPM.
+	 */
+	tach_period = 60 * crystal_clock_freq * 10000 / (8 * speed);
+	WREG32_SOC15(THM, 0, mmCG_TACH_CTRL,
+		     REG_SET_FIELD(RREG32_SOC15(THM, 0, mmCG_TACH_CTRL),
+				   CG_TACH_CTRL, TARGET_PERIOD,

drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c smu_v11_0_set_fan_speed_percent(struct smu_context *smu, uint32_t speed) · line 1254

Quoted 10 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +7 -0
+				   tach_period));
+
+	ret = smu_v11_0_set_fan_static_mode(smu, FDO_PWM_MODE_STATIC_RPM);
+
+	return ret;
+}
+
  int
  smu_v11_0_set_fan_control_mode(struct smu_context *smu,
  			       uint32_t mode)

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

author
#19 lore raw

[AMD Official Use Only]

Quoted 156 lines

-----Original Message-----
From: Lazar, Lijo <[email protected]>
Sent: Wednesday, July 7, 2021 4:50 PM
To: Quan, Evan <[email protected]>; [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: Re: [PATCH 1/7] drm/amd/pm: correct the fan speed RPM setting

Quoted 1 line · Evan Quan

The relationship "PWM = RPM / smu->fan_max_rpm" between fan speed

PWM

Quoted 5 lines

and RPM is not true for SMU11 ASICs. So, we need a new way to perform the fan speed RPM setting.

Change-Id I1afe8102f02ead9a8a07c7105f689ac60a85b0d8
Quoted 8 lines
---
  drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h       |  5 +++
  drivers/gpu/drm/amd/pm/inc/smu_v11_0.h        |  3 ++
  drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c     |  9 ++---
  .../gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c |  1 +
  .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c   |  1 +
  .../amd/pm/swsmu/smu11/sienna_cichlid_ppt.c   |  1 +
  .../gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c    | 36

+++++++++++++++++++

Quoted 8 lines
  7 files changed, 52 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +0 -0
index 3e89852e4820..6301e4cb3c2a 100644

drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h struct pptable_funcs { · line 1046

Quoted 8 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +4 -0
@@ -1039,6 +1039,11 @@ struct pptable_funcs {
  	 */
  	int (*set_fan_speed_percent)(struct smu_context *smu, uint32_t
 speed);
 
+	/**
+	 * @set_fan_speed_rpm: Set a static fan speed in rpm.
+	 */
+	int (*set_fan_speed_rpm)(struct smu_context *smu, uint32_t

speed);

drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h struct pptable_funcs {

Quoted 3 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +1 -0
+
  	/**
  	 * @set_xgmi_pstate: Set inter-chip global memory interconnect

pstate.

drivers/gpu/drm/amd/pm/inc/smu_v11_0.h smu_v11_0_set_fan_control_mode(struct

Quoted 7 lines

* &pstate: Pstate to set. D0 if Nonzero, D3 otherwise.

drivers/gpu/drm/amd/pm/inc/smu_v11_0.h +0 -0
index b89e7dca8906..134a33e3de91 100644
@@ -223,6 +223,9 @@ smu_v11_0_set_fan_control_mode(struct

smu_context *smu,

drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c static int smu_set_fan_speed_rpm(void

Quoted 15 lines
drivers/gpu/drm/amd/pm/inc/smu_v11_0.h +3 -0
  int smu_v11_0_set_fan_speed_percent(struct smu_context *smu,
  				    uint32_t speed);
 
+int smu_v11_0_set_fan_speed_rpm(struct smu_context *smu,
+				uint32_t speed);
+
  int smu_v11_0_set_xgmi_pstate(struct smu_context *smu,
  				     uint32_t pstate);
 
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0 -0
index ebe672142808..576e9ea68fd1 100644
@@ -2174,11 +2174,12 @@ static int smu_set_fan_speed_rpm(void

*handle,

drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c static int smu_set_fan_speed_rpm(void *handle, uint32_t speed)

Quoted 7 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0 -3
 uint32_t speed)
 
  	mutex_lock(&smu->mutex);
 
-	if (smu->ppt_funcs->set_fan_speed_percent) {
-		percent = speed * 100 / smu->fan_max_rpm;
-		ret = smu->ppt_funcs->set_fan_speed_percent(smu,

percent);

drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c static int smu_set_fan_speed_rpm(void · line 2181

Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0 -1
-		if (!ret && !(smu->user_dpm_profile.flags &

SMU_DPM_USER_PROFILE_RESTORE))

drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c static int smu_set_fan_speed_rpm(void *handle, uint32_t speed)

Quoted 3 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +3 -0
+	if (smu->ppt_funcs->set_fan_speed_rpm) {
+		ret = smu->ppt_funcs->set_fan_speed_rpm(smu, speed);
+		if (!ret && smu->user_dpm_profile.flags &

SMU_DPM_USER_PROFILE_RESTORE) {

drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c static int smu_set_fan_speed_rpm(void · line 2182

Quoted 2 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +1 -0
+			percent = speed * 100 / smu->fan_max_rpm;
  			smu->user_dpm_profile.fan_speed_percent =

percent;

drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c static const struct pptable_funcs

Quoted 10 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +1 -0
+		}
  	}
 
  	mutex_unlock(&smu->mutex);
drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c +0 -0
index 6b3e0ea10163..047adf6dd444 100644
@@ -2314,6 +2314,7 @@ static const struct pptable_funcs

arcturus_ppt_funcs = {

drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static const struct pptable_funcs

Quoted 13 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c +1 -0
  	.get_fan_control_mode = smu_v11_0_get_fan_control_mode,
  	.set_fan_control_mode = smu_v11_0_set_fan_control_mode,
  	.set_fan_speed_percent = smu_v11_0_set_fan_speed_percent,
+	.set_fan_speed_rpm = smu_v11_0_set_fan_speed_rpm,
  	.set_xgmi_pstate = smu_v11_0_set_xgmi_pstate,
  	.gfx_off_control = smu_v11_0_gfx_off_control,
  	.register_irq_handler = smu_v11_0_register_irq_handler, diff --git

a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
index 59ea59acfb00..d8a011483dcf 100644

drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0 -0
@@ -3248,6 +3248,7 @@ static const struct pptable_funcs

navi10_ppt_funcs = {

drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c static const struct pptable_funcs

Quoted 13 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1 -0
  	.get_fan_control_mode = smu_v11_0_get_fan_control_mode,
  	.set_fan_control_mode = smu_v11_0_set_fan_control_mode,
  	.set_fan_speed_percent = smu_v11_0_set_fan_speed_percent,
+	.set_fan_speed_rpm = smu_v11_0_set_fan_speed_rpm,
  	.set_xgmi_pstate = smu_v11_0_set_xgmi_pstate,
  	.gfx_off_control = smu_v11_0_gfx_off_control,
  	.register_irq_handler = smu_v11_0_register_irq_handler, diff --git

a/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c index 83d8e53ca1f8..dad120294c19 100644

drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +0 -0
@@ -3886,6 +3886,7 @@ static const struct pptable_funcs

sienna_cichlid_ppt_funcs = {

drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c smu_v11_0_set_fan_speed_percent(struct

Quoted 13 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +1 -0
  	.get_fan_control_mode = smu_v11_0_get_fan_control_mode,
  	.set_fan_control_mode = smu_v11_0_set_fan_control_mode,
  	.set_fan_speed_percent = smu_v11_0_set_fan_speed_percent,
+	.set_fan_speed_rpm = smu_v11_0_set_fan_speed_rpm,
  	.set_xgmi_pstate = smu_v11_0_set_xgmi_pstate,
  	.gfx_off_control = smu_v11_0_gfx_off_control,
  	.register_irq_handler = smu_v11_0_register_irq_handler, diff --git

a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
index 388c5cb5c647..fefc8e93fdc6 100644

drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +0 -0
@@ -1213,6 +1213,42 @@ smu_v11_0_set_fan_speed_percent(struct

smu_context *smu, uint32_t speed)

drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c smu_v11_0_set_fan_speed_percent(struct · line 1213

Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +0 -0
  	return smu_v11_0_set_fan_static_mode(smu,

FDO_PWM_MODE_STATIC);

Quoted 13 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +11 -0
  }
 
+int smu_v11_0_set_fan_speed_rpm(struct smu_context *smu,
+				uint32_t speed)
+{
+	struct amdgpu_device *adev = smu->adev;
+	uint32_t tach_period, crystal_clock_freq;
+	int ret;
+
+	ret = smu_v11_0_auto_fan_control(smu, 0);
+	if (ret)
+		return ret;
+
Quoted 9 lines

drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c smu_v11_0_set_fan_speed_percent(struct smu_context *smu, uint32_t speed) · line 1232

Quoted 6 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +6 -0
+	/*
+	 * crystal_clock_freq div by 4 is required since the fan control
+	 * module refers to 25MHz
+	 */
+	crystal_clock_freq = amdgpu_asic_get_xclk(adev) / 4;
+

Just hardcode this as 25MHz, no need to relate it to ASIC clk.

[Quan, Evan] Sure, will update it in V2.
BR
Evan

Quoted 29 lines

Thanks,
Lijo

drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c smu_v11_0_set_fan_speed_percent(struct · line 1234

Quoted 2 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +2 -0
+	/*
+	 * To prevent from possible overheat, some ASICs may have

requirement

drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c smu_v11_0_set_fan_speed_percent(struct smu_context *smu, uint32_t speed)

Quoted 9 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +9 -0
+	 * for minimum fan speed:
+	 * - For some NV10 SKU, the fan speed cannot be set lower than
+	 *   700 RPM.
+	 * - For some Sienna Cichlid SKU, the fan speed cannot be set
+	 *   lower than 500 RPM.
+	 */
+	tach_period = 60 * crystal_clock_freq * 10000 / (8 * speed);
+	WREG32_SOC15(THM, 0, mmCG_TACH_CTRL,
+		     REG_SET_FIELD(RREG32_SOC15(THM, 0,

mmCG_TACH_CTRL),

drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c smu_v11_0_set_fan_speed_percent(struct smu_context *smu, uint32_t speed)

Quoted 4 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +4 -0
+				   CG_TACH_CTRL, TARGET_PERIOD,
+				   tach_period));
+
+	ret = smu_v11_0_set_fan_static_mode(smu,

FDO_PWM_MODE_STATIC_RPM);

Quoted 8 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +4 -0
+
+	return ret;
+}
+
  int
  smu_v11_0_set_fan_control_mode(struct smu_context *smu,
  			       uint32_t mode)