Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c15c8d70 authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher
Browse files

drm/amd/powerplay: fix Smatch static checker warnings 



1. return -1 instead of -ENOMEM
2. The struct type mismatch warnings.

Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarKen Wang <Qingqing.Wang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 75ac63db

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

+1 −1
Original line number Diff line number Diff line
@@ -914,7 +914,7 @@ static int fiji_trim_voltage_table(struct pp_hwmgr *hwmgr, 
			GFP_KERNEL);



	if (NULL == table)

		return -EINVAL;

		return -ENOMEM;



	table->mask_low = vol_table->mask_low;

	table->phase_delay = vol_table->phase_delay;

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

+7 −6
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ int phm_dispatch_table(struct pp_hwmgr *hwmgr, 
		temp_storage = kzalloc(rt_table->storage_size, GFP_KERNEL);

		if (temp_storage == NULL) {

			printk(KERN_ERR "[ powerplay ] Could not allocate table temporary storage\n");

			return -1;

			return -ENOMEM;

		}

	}
@@ -90,7 +90,7 @@ int phm_construct_table(struct pp_hwmgr *hwmgr, 


	if (hwmgr == NULL || master_table == NULL || rt_table == NULL) {

		printk(KERN_ERR "[ powerplay ] Invalid Parameter!\n");

		return -1;

		return -EINVAL;

	}



	for (table_item = master_table->master_list;
@@ -102,8 +102,9 @@ int phm_construct_table(struct pp_hwmgr *hwmgr, 


	size = (function_count + 1) * sizeof(phm_table_function);

	run_time_list = kzalloc(size, GFP_KERNEL);



	if (NULL == run_time_list)

		return -1;

		return -ENOMEM;



	rtf = run_time_list;

	for (table_item = master_table->master_list;
@@ -111,7 +112,7 @@ int phm_construct_table(struct pp_hwmgr *hwmgr, 
		if ((rtf - run_time_list) > function_count) {

			printk(KERN_ERR "[ powerplay ] Check function results have changed\n");

			kfree(run_time_list);

			return -1;

			return -EINVAL;

		}



		if ((NULL == table_item->isFunctionNeededInRuntimeTable) ||
@@ -123,7 +124,7 @@ int phm_construct_table(struct pp_hwmgr *hwmgr, 
	if ((rtf - run_time_list) > function_count) {

		printk(KERN_ERR "[ powerplay ] Check function results have changed\n");

		kfree(run_time_list);

		return -1;

		return -EINVAL;

	}



	*rtf = NULL;
@@ -138,7 +139,7 @@ int phm_destroy_table(struct pp_hwmgr *hwmgr, 
{

	if (hwmgr == NULL || rt_table == NULL) {

		printk(KERN_ERR "[ powerplay ] Invalid Parameter\n");

		return -1;

		return -EINVAL;

	}



	if (NULL == rt_table->function_list)

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

+3 −0
Original line number Diff line number Diff line
@@ -111,6 +111,9 @@ int hw_init_power_state_table(struct pp_hwmgr *hwmgr) 


	hwmgr->ps = kzalloc(size * table_entries, GFP_KERNEL);



	if (hwmgr->ps == NULL)

		return -ENOMEM;



	state = hwmgr->ps;



	for (i = 0; i < table_entries; i++) {

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

+10 −1
Original line number Diff line number Diff line
@@ -1322,11 +1322,17 @@ static int get_cac_leakage_table(struct pp_hwmgr *hwmgr, 
	struct phm_cac_leakage_table  *cac_leakage_table;

	unsigned long            table_size, i;



	if (hwmgr == NULL || table == NULL || ptable == NULL)

		return -EINVAL;



	table_size = sizeof(ULONG) +

		(sizeof(struct phm_cac_leakage_table) * table->ucNumEntries);



	cac_leakage_table = kzalloc(table_size, GFP_KERNEL);



	if (cac_leakage_table == NULL)

		return -ENOMEM;



	cac_leakage_table->count = (ULONG)table->ucNumEntries;



	for (i = 0; i < cac_leakage_table->count; i++) {
@@ -1349,7 +1355,7 @@ static int get_cac_leakage_table(struct pp_hwmgr *hwmgr, 
static int get_platform_power_management_table(struct pp_hwmgr *hwmgr,

			ATOM_PPLIB_PPM_Table *atom_ppm_table)

{

	struct phm_ppm_table *ptr = kzalloc(sizeof(ATOM_PPLIB_PPM_Table), GFP_KERNEL);

	struct phm_ppm_table *ptr = kzalloc(sizeof(struct phm_ppm_table), GFP_KERNEL);



	if (NULL == ptr)

		return -ENOMEM;
@@ -1466,6 +1472,9 @@ static int init_phase_shedding_table(struct pp_hwmgr *hwmgr, 


			table = kzalloc(size, GFP_KERNEL);



			if (table == NULL)

				return -ENOMEM;



			table->count = (unsigned long)ptable->ucNumEntries;



			for (i = 0; i < table->count; i++) {

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

+18 −12
Original line number Diff line number Diff line
@@ -115,9 +115,12 @@ const unsigned long PhwTonga_Magic = (unsigned long)(PHM_VIslands_Magic); 
struct tonga_power_state *cast_phw_tonga_power_state(

				  struct pp_hw_power_state *hw_ps)

{

	if (hw_ps == NULL)

		return NULL;



	PP_ASSERT_WITH_CODE((PhwTonga_Magic == hw_ps->magic),

				"Invalid Powerstate Type!",

				 return NULL;);

				 return NULL);



	return (struct tonga_power_state *)hw_ps;

}
@@ -125,9 +128,12 @@ struct tonga_power_state *cast_phw_tonga_power_state( 
const struct tonga_power_state *cast_const_phw_tonga_power_state(

				 const struct pp_hw_power_state *hw_ps)

{

	if (hw_ps == NULL)

		return NULL;



	PP_ASSERT_WITH_CODE((PhwTonga_Magic == hw_ps->magic),

				"Invalid Powerstate Type!",

				 return NULL;);

				 return NULL);



	return (const struct tonga_power_state *)hw_ps;

}
@@ -3864,6 +3870,7 @@ int tonga_copy_vbios_smc_reg_table(const pp_atomctrl_mc_reg_table *table, phw_to 
				table->mc_reg_table_entry[i].mc_data[j];

		}

	}



	ni_table->num_entries = table->num_entries;



	return 0;
@@ -3989,7 +3996,7 @@ int tonga_initialize_mc_reg_table(struct pp_hwmgr *hwmgr) 
	table = kzalloc(sizeof(pp_atomctrl_mc_reg_table), GFP_KERNEL);



	if (NULL == table)

		return -1;

		return -ENOMEM;



	/* Program additional LP registers that are no longer programmed by VBIOS */

	cgs_write_register(hwmgr->device, mmMC_SEQ_RAS_TIMING_LP, cgs_read_register(hwmgr->device, mmMC_SEQ_RAS_TIMING));
@@ -5470,7 +5477,6 @@ static int tonga_generate_dpm_level_enable_mask(struct pp_hwmgr *hwmgr, const vo 
	struct tonga_hwmgr *data = (struct tonga_hwmgr *)(hwmgr->backend);

	const struct tonga_power_state *tonga_ps = cast_const_phw_tonga_power_state(states->pnew_state);





	result = tonga_trim_dpm_states(hwmgr, tonga_ps);

	if (0 != result)

		return result;
@@ -5732,7 +5738,7 @@ static int tonga_set_max_fan_pwm_output(struct pp_hwmgr *hwmgr, uint16_t us_max_ 
	if (phm_is_hw_access_blocked(hwmgr))

		return 0;



    return (0 == smum_send_msg_to_smc_with_parameter(hwmgr->smumgr, PPSMC_MSG_SetFanPwmMax, us_max_fan_pwm) ? 0 : -EINVAL);

	return (0 == smum_send_msg_to_smc_with_parameter(hwmgr->smumgr, PPSMC_MSG_SetFanPwmMax, us_max_fan_pwm) ? 0 : -1);

}



int tonga_notify_smc_display_config_after_ps_adjustment(struct pp_hwmgr *hwmgr)
@@ -5826,7 +5832,7 @@ static int tonga_set_max_fan_rpm_output(struct pp_hwmgr *hwmgr, uint16_t us_max_ 
	if (phm_is_hw_access_blocked(hwmgr))

		return 0;



	return (0 == smum_send_msg_to_smc_with_parameter(hwmgr->smumgr, PPSMC_MSG_SetFanRpmMax, us_max_fan_pwm) ? 0 : -EINVAL);

	return (0 == smum_send_msg_to_smc_with_parameter(hwmgr->smumgr, PPSMC_MSG_SetFanRpmMax, us_max_fan_pwm) ? 0 : -1);

}



uint32_t tonga_get_xclk(struct pp_hwmgr *hwmgr)
@@ -5962,7 +5968,7 @@ int tonga_check_states_equal(struct pp_hwmgr *hwmgr, const struct pp_hw_power_st 
	const struct tonga_power_state *psb = cast_const_phw_tonga_power_state(pstate2);

	int i;



	if (pstate1 == NULL || pstate2 == NULL || equal == NULL)

	if (equal == NULL || psa == NULL || psb == NULL)

		return -EINVAL;



	/* If the two states don't even have the same number of performance levels they cannot be the same state. */