On 3/8/2024 3:21 PM, Ma Jun wrote:
> Because powerplay_table initialization is skipped under
> sriov case, We set default lower and upper OD value to
> avoid NULL pointer issue.
>
> Also, It's necessary to check od capability before
> using the power limit value from powerplay_table.
>
> Fixes: 7968e9748fbb ("drm/amdgpu/pm: Fix the power1_min_cap value")
> Signed-off-by: Ma Jun <Jun.Ma2@xxxxxxx>
> Reported-by: Yin Zhenguo <zhenguo.yin@xxxxxxx>
> ---
> v1->v2: Check the od capability (Alex, Lijo)
> ---
> .../gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 18 ++++++-----
> .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 18 ++++++-----
> .../amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 30 +++++++++++--------
> .../drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 22 +++++++++-----
> .../drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 22 +++++++++-----
> 5 files changed, 68 insertions(+), 42 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
> index 1d96eb274d72..862d5d198f42 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
> @@ -1285,8 +1285,9 @@ static int arcturus_get_power_limit(struct smu_context *smu,
> {
> struct smu_11_0_powerplay_table *powerplay_table =
> (struct smu_11_0_powerplay_table *)smu->smu_table.power_play_table;
> + struct smu_11_0_overdrive_table *od_settings = smu->od_settings;
> PPTable_t *pptable = smu->smu_table.driver_pptable;
> - uint32_t power_limit, od_percent_upper, od_percent_lower;
> + uint32_t power_limit, od_percent_upper = 0, od_percent_lower = 10;
>
> if (smu_v11_0_get_current_power_limit(smu, &power_limit)) {
> /* the last hope to figure out the ppt limit */
> @@ -1303,12 +1304,15 @@ static int arcturus_get_power_limit(struct smu_context *smu,
> if (default_power_limit)
> *default_power_limit = power_limit;
>
> - if (smu->od_enabled)
> - od_percent_upper = le32_to_cpu(powerplay_table->overdrive_table.max[SMU_11_0_ODSETTING_POWERPERCENTAGE]);
> - else
> - od_percent_upper = 0;
> -
> - od_percent_lower = le32_to_cpu(powerplay_table->overdrive_table.min[SMU_11_0_ODSETTING_POWERPERCENTAGE]);
> + if (powerplay_table) {
> + if (smu->od_enabled) {
> + od_percent_upper = le32_to_cpu(powerplay_table->overdrive_table.max[SMU_11_0_ODSETTING_POWERPERCENTAGE]);
> + od_percent_lower = le32_to_cpu(powerplay_table->overdrive_table.min[SMU_11_0_ODSETTING_POWERPERCENTAGE]);
> + } else if (od_settings->cap[SMU_11_0_ODCAP_POWER_LIMIT]) {
This check is applicable even for od_enabled case. Presently OD provides
multiple feature capabilities; only if a capability is valid, then the
limits defined in the table are valid.
BTW, I'm not sure if that is the subject of this patch.
For arcturus, overdrive doesn't look relevant; again that may not be
relevant to this patch topic.
Thanks,
Lijo
> + od_percent_upper = 0;
> + od_percent_lower = le32_to_cpu(powerplay_table->overdrive_table.min[SMU_11_0_ODSETTING_POWERPERCENTAGE]);
> + }
> + }
>
> dev_dbg(smu->adev->dev, "od percent upper:%d, od percent lower:%d (default power: %d)\n",
> od_percent_upper, od_percent_lower, power_limit);
> 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 ed189a3878eb..fe8d24a7d319 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
> @@ -2339,7 +2339,7 @@ static int navi10_get_power_limit(struct smu_context *smu,
> (struct smu_11_0_powerplay_table *)smu->smu_table.power_play_table;
> struct smu_11_0_overdrive_table *od_settings = smu->od_settings;
> PPTable_t *pptable = smu->smu_table.driver_pptable;
> - uint32_t power_limit, od_percent_upper, od_percent_lower;
> + uint32_t power_limit, od_percent_upper = 0, od_percent_lower = 10;
>
> if (smu_v11_0_get_current_power_limit(smu, &power_limit)) {
> /* the last hope to figure out the ppt limit */
> @@ -2356,13 +2356,15 @@ static int navi10_get_power_limit(struct smu_context *smu,
> if (default_power_limit)
> *default_power_limit = power_limit;
>
> - if (smu->od_enabled &&
> - navi10_od_feature_is_supported(od_settings, SMU_11_0_ODCAP_POWER_LIMIT))
> - od_percent_upper = le32_to_cpu(powerplay_table->overdrive_table.max[SMU_11_0_ODSETTING_POWERPERCENTAGE]);
> - else
> - od_percent_upper = 0;
> -
> - od_percent_lower = le32_to_cpu(powerplay_table->overdrive_table.min[SMU_11_0_ODSETTING_POWERPERCENTAGE]);
> + if (powerplay_table) {
> + if (smu->od_enabled) {
> + od_percent_upper = le32_to_cpu(powerplay_table->overdrive_table.max[SMU_11_0_ODSETTING_POWERPERCENTAGE]);
> + od_percent_lower = le32_to_cpu(powerplay_table->overdrive_table.min[SMU_11_0_ODSETTING_POWERPERCENTAGE]);
> + } else if (navi10_od_feature_is_supported(od_settings, SMU_11_0_ODCAP_POWER_LIMIT)) {
> + od_percent_upper = 0;
> + od_percent_lower = le32_to_cpu(powerplay_table->overdrive_table.min[SMU_11_0_ODSETTING_POWERPERCENTAGE]);
> + }
> + }
>
> dev_dbg(smu->adev->dev, "od percent upper:%d, od percent lower:%d (default power: %d)\n",
> od_percent_upper, od_percent_lower, power_limit);
> 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 a405424dd699..c86e13f6b6c5 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c
> @@ -617,6 +617,12 @@ static uint32_t sienna_cichlid_get_throttler_status_locked(struct smu_context *s
> return throttler_status;
> }
>
> +static bool sienna_cichlid_is_od_feature_supported(struct smu_11_0_7_overdrive_table *od_table,
> + enum SMU_11_0_7_ODFEATURE_CAP cap)
> +{
> + return od_table->cap[cap];
> +}
> +
> static int sienna_cichlid_get_power_limit(struct smu_context *smu,
> uint32_t *current_power_limit,
> uint32_t *default_power_limit,
> @@ -625,7 +631,8 @@ static int sienna_cichlid_get_power_limit(struct smu_context *smu,
> {
> struct smu_11_0_7_powerplay_table *powerplay_table =
> (struct smu_11_0_7_powerplay_table *)smu->smu_table.power_play_table;
> - uint32_t power_limit, od_percent_upper, od_percent_lower;
> + struct smu_11_0_7_overdrive_table *od_settings = smu->od_settings;
> + uint32_t power_limit, od_percent_upper = 0, od_percent_lower = 10;
> uint16_t *table_member;
>
> GET_PPTABLE_MEMBER(SocketPowerLimitAc, &table_member);
> @@ -640,12 +647,15 @@ static int sienna_cichlid_get_power_limit(struct smu_context *smu,
> if (default_power_limit)
> *default_power_limit = power_limit;
>
> - if (smu->od_enabled)
> - od_percent_upper = le32_to_cpu(powerplay_table->overdrive_table.max[SMU_11_0_7_ODSETTING_POWERPERCENTAGE]);
> - else
> - od_percent_upper = 0;
> -
> - od_percent_lower = le32_to_cpu(powerplay_table->overdrive_table.min[SMU_11_0_7_ODSETTING_POWERPERCENTAGE]);
> + if (powerplay_table) {
> + if (smu->od_enabled) {
> + od_percent_upper = le32_to_cpu(powerplay_table->overdrive_table.max[SMU_11_0_7_ODSETTING_POWERPERCENTAGE]);
> + od_percent_lower = le32_to_cpu(powerplay_table->overdrive_table.min[SMU_11_0_7_ODSETTING_POWERPERCENTAGE]);
> + } else if (sienna_cichlid_is_od_feature_supported(od_settings, SMU_11_0_7_ODCAP_POWER_LIMIT)) {
> + od_percent_upper = 0;
> + od_percent_lower = le32_to_cpu(powerplay_table->overdrive_table.min[SMU_11_0_7_ODSETTING_POWERPERCENTAGE]);
> + }
> + }
>
> dev_dbg(smu->adev->dev, "od percent upper:%d, od percent lower:%d (default power: %d)\n",
> od_percent_upper, od_percent_lower, power_limit);
> @@ -1250,12 +1260,6 @@ static bool sienna_cichlid_is_support_fine_grained_dpm(struct smu_context *smu,
> return dpm_desc->SnapToDiscrete == 0;
> }
>
> -static bool sienna_cichlid_is_od_feature_supported(struct smu_11_0_7_overdrive_table *od_table,
> - enum SMU_11_0_7_ODFEATURE_CAP cap)
> -{
> - return od_table->cap[cap];
> -}
> -
> static void sienna_cichlid_get_od_setting_range(struct smu_11_0_7_overdrive_table *od_table,
> enum SMU_11_0_7_ODSETTING_ID setting,
> uint32_t *min, uint32_t *max)
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
> index 6a501d2661f5..e17f93ba861e 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
> @@ -2356,8 +2356,12 @@ static int smu_v13_0_0_get_power_limit(struct smu_context *smu,
> (struct smu_13_0_0_powerplay_table *)table_context->power_play_table;
> PPTable_t *pptable = table_context->driver_pptable;
> SkuTable_t *skutable = &pptable->SkuTable;
> - uint32_t power_limit, od_percent_upper, od_percent_lower;
> uint32_t msg_limit = skutable->MsgLimits.Power[PPT_THROTTLER_PPT0][POWER_SOURCE_AC];
> + const OverDriveLimits_t * const overdrive_upperlimits =
> + &pptable->SkuTable.OverDriveLimitsBasicMax;
> + const OverDriveLimits_t * const overdrive_lowerlimits =
> + &pptable->SkuTable.OverDriveLimitsMin;
> + uint32_t power_limit, od_percent_upper = 0, od_percent_lower = 10;
>
> if (smu_v13_0_get_current_power_limit(smu, &power_limit))
> power_limit = smu->adev->pm.ac_power ?
> @@ -2369,12 +2373,16 @@ static int smu_v13_0_0_get_power_limit(struct smu_context *smu,
> if (default_power_limit)
> *default_power_limit = power_limit;
>
> - if (smu->od_enabled)
> - od_percent_upper = le32_to_cpu(powerplay_table->overdrive_table.max[SMU_13_0_0_ODSETTING_POWERPERCENTAGE]);
> - else
> - od_percent_upper = 0;
> -
> - od_percent_lower = le32_to_cpu(powerplay_table->overdrive_table.min[SMU_13_0_0_ODSETTING_POWERPERCENTAGE]);
> + if (powerplay_table) {
> + if (smu->od_enabled) {
> + od_percent_upper = le32_to_cpu(powerplay_table->overdrive_table.max[SMU_13_0_0_ODSETTING_POWERPERCENTAGE]);
> + od_percent_lower = le32_to_cpu(powerplay_table->overdrive_table.min[SMU_13_0_0_ODSETTING_POWERPERCENTAGE]);
> + } else if (overdrive_lowerlimits->FeatureCtrlMask &&
> + overdrive_upperlimits->FeatureCtrlMask) {
> + od_percent_upper = 0;
> + od_percent_lower = le32_to_cpu(powerplay_table->overdrive_table.min[SMU_13_0_0_ODSETTING_POWERPERCENTAGE]);
> + }
> + }
>
> dev_dbg(smu->adev->dev, "od percent upper:%d, od percent lower:%d (default power: %d)\n",
> od_percent_upper, od_percent_lower, power_limit);
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
> index 3dc7b60cb075..684cb5a7ef6c 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
> @@ -2320,8 +2320,12 @@ static int smu_v13_0_7_get_power_limit(struct smu_context *smu,
> (struct smu_13_0_7_powerplay_table *)table_context->power_play_table;
> PPTable_t *pptable = table_context->driver_pptable;
> SkuTable_t *skutable = &pptable->SkuTable;
> - uint32_t power_limit, od_percent_upper, od_percent_lower;
> uint32_t msg_limit = skutable->MsgLimits.Power[PPT_THROTTLER_PPT0][POWER_SOURCE_AC];
> + const OverDriveLimits_t * const overdrive_upperlimits =
> + &pptable->SkuTable.OverDriveLimitsBasicMax;
> + const OverDriveLimits_t * const overdrive_lowerlimits =
> + &pptable->SkuTable.OverDriveLimitsMin;
> + uint32_t power_limit, od_percent_upper = 0, od_percent_lower = 10;
>
> if (smu_v13_0_get_current_power_limit(smu, &power_limit))
> power_limit = smu->adev->pm.ac_power ?
> @@ -2333,12 +2337,16 @@ static int smu_v13_0_7_get_power_limit(struct smu_context *smu,
> if (default_power_limit)
> *default_power_limit = power_limit;
>
> - if (smu->od_enabled)
> - od_percent_upper = le32_to_cpu(powerplay_table->overdrive_table.max[SMU_13_0_7_ODSETTING_POWERPERCENTAGE]);
> - else
> - od_percent_upper = 0;
> -
> - od_percent_lower = le32_to_cpu(powerplay_table->overdrive_table.min[SMU_13_0_7_ODSETTING_POWERPERCENTAGE]);
> + if (powerplay_table) {
> + if (smu->od_enabled) {
> + od_percent_upper = le32_to_cpu(powerplay_table->overdrive_table.max[SMU_13_0_7_ODSETTING_POWERPERCENTAGE]);
> + od_percent_lower = le32_to_cpu(powerplay_table->overdrive_table.min[SMU_13_0_7_ODSETTING_POWERPERCENTAGE]);
> + } else if (overdrive_lowerlimits->FeatureCtrlMask &&
> + overdrive_upperlimits->FeatureCtrlMask) {
> + od_percent_upper = 0;
> + od_percent_lower = le32_to_cpu(powerplay_table->overdrive_table.min[SMU_13_0_7_ODSETTING_POWERPERCENTAGE]);
> + }
> + }
>
> dev_dbg(smu->adev->dev, "od percent upper:%d, od percent lower:%d (default power: %d)\n",
> od_percent_upper, od_percent_lower, power_limit);
