Commit ac0cc350 authored by Moritz Kühner's avatar Moritz Kühner Committed by Alex Deucher
Browse files

drm/amd/powerplay/hwmgr: don't add invalid voltage 



if atomctrl_get_voltage_evv_on_sclk returns non zero (fail) in the expansion
of the PP_ASSERT_WITH_CODE macro the continue will actually do nothing
(The macro uses a do ... while(0) as scope, which eats the continue).
Based on the code I don't think this was the intent.
Unfortunately fixing this requires rewriting the control flow and
removing the macros.

v2: added signed of by
fixed error message print

v3: agd: drop DRM_ERROR

Signed-off-by: default avatarMoritz Kühner <kuehner.moritz@gmail.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c790f873

drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c

+28 −26
Original line number Diff line number Diff line
@@ -432,11 +432,9 @@ int tonga_get_evv_voltage(struct pp_hwmgr *hwmgr) 
						}

					}

				}

				PP_ASSERT_WITH_CODE(0 == atomctrl_get_voltage_evv_on_sclk

				if (0 == atomctrl_get_voltage_evv_on_sclk

				    (hwmgr, VOLTAGE_TYPE_VDDGFX, sclk,

						 virtual_voltage_id, &vddgfx),

						"Error retrieving EVV voltage value!", continue);



				     virtual_voltage_id, &vddgfx)) {

					/* need to make sure vddgfx is less than 2v or else, it could burn the ASIC. */

					PP_ASSERT_WITH_CODE((vddgfx < 2000 && vddgfx != 0), "Invalid VDDGFX value!", return -1);
@@ -446,17 +444,18 @@ int tonga_get_evv_voltage(struct pp_hwmgr *hwmgr) 
						data->vddcgfx_leakage.leakage_id[data->vddcgfx_leakage.count] = virtual_voltage_id;

						data->vddcgfx_leakage.count++;

					}

				} else {

					printk("Error retrieving EVV voltage value!\n");

				}

			}

		} else {

			/*  in merged mode we have only vddc EVV leakages */

			if (0 == tonga_get_sclk_for_voltage_evv(hwmgr,

						pptable_info->vddc_lookup_table,

						virtual_voltage_id, &sclk)) {

				PP_ASSERT_WITH_CODE(0 == atomctrl_get_voltage_evv_on_sclk

				if (0 == atomctrl_get_voltage_evv_on_sclk

				    (hwmgr, VOLTAGE_TYPE_VDDC, sclk,

						 virtual_voltage_id, &vddc),

						"Error retrieving EVV voltage value!", continue);



				     virtual_voltage_id, &vddc)) {

					/* need to make sure vddc is less than 2v or else, it could burn the ASIC. */

					PP_ASSERT_WITH_CODE(vddc < 2000, "Invalid VDDC value!", return -1);
@@ -466,6 +465,9 @@ int tonga_get_evv_voltage(struct pp_hwmgr *hwmgr) 
						data->vddc_leakage.leakage_id[data->vddc_leakage.count] = virtual_voltage_id;

						data->vddc_leakage.count++;

					}

				} else {

					printk("Error retrieving EVV voltage value!\n");

				}

			}

		}

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE