Commit b44fd9cc authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Alex Deucher
Browse files

drm/amd/pm: Replace one-element array with flexible-array in struct phm_ppt_v1_voltage_lookup_table 

There is a regular need in the kernel to provide a way to declare having
a dynamically sized set of trailing elements in a structure. Kernel code
should always use “flexible array members”[1] for these cases. The older
style of one-element or zero-length arrays should no longer be used[2].

Refactor the code according to the use of a flexible-array member in
struct phm_ppt_v1_voltage_lookup_table, instead of a one-element array,
and use the struct_size() helper to calculate the size for the allocation.

[1] https://en.wikipedia.org/wiki/Flexible_array_member
[2] https://www.kernel.org/doc/html/v5.9-rc1/process/deprecated.html#zero-length-and-one-element-arrays



Build-tested-by: default avatarkernel test robot <lkp@intel.com>
Link: https://lore.kernel.org/lkml/5f7d61df.jWrFfnjxGbjSkPOp%25lkp@intel.com/


Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 03f0a7b8

drivers/gpu/drm/amd/pm/powerplay/hwmgr/hwmgr_ppt.h

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ typedef struct phm_ppt_v1_voltage_lookup_record phm_ppt_v1_voltage_lookup_record 


struct phm_ppt_v1_voltage_lookup_table {

	uint32_t count;

	phm_ppt_v1_voltage_lookup_record entries[1];    /* Dynamically allocate count entries. */

	phm_ppt_v1_voltage_lookup_record entries[];    /* Dynamically allocate count entries. */

};

typedef struct phm_ppt_v1_voltage_lookup_table phm_ppt_v1_voltage_lookup_table;

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

+3 −7
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ static int get_vddc_lookup_table( 
		uint32_t max_levels

		)

{

	uint32_t table_size, i;

	uint32_t i;

	phm_ppt_v1_voltage_lookup_table *table;

	phm_ppt_v1_voltage_lookup_record *record;

	ATOM_Tonga_Voltage_Lookup_Record *atom_record;
@@ -165,12 +165,8 @@ static int get_vddc_lookup_table( 
	PP_ASSERT_WITH_CODE((0 != vddc_lookup_pp_tables->ucNumEntries),

		"Invalid CAC Leakage PowerPlay Table!", return 1);



	table_size = sizeof(uint32_t) +

		sizeof(phm_ppt_v1_voltage_lookup_record) * max_levels;



	table = kzalloc(table_size, GFP_KERNEL);



	if (NULL == table)

	table = kzalloc(struct_size(table, entries, max_levels), GFP_KERNEL);

	if (!table)

		return -ENOMEM;



	table->count = vddc_lookup_pp_tables->ucNumEntries;

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

+3 −7
Original line number Diff line number Diff line
@@ -1040,18 +1040,14 @@ static int get_vddc_lookup_table( 
		const ATOM_Vega10_Voltage_Lookup_Table *vddc_lookup_pp_tables,

		uint32_t max_levels)

{

	uint32_t table_size, i;

	uint32_t i;

	phm_ppt_v1_voltage_lookup_table *table;



	PP_ASSERT_WITH_CODE((vddc_lookup_pp_tables->ucNumEntries != 0),

			"Invalid SOC_VDDD Lookup Table!", return 1);



	table_size = sizeof(uint32_t) +

			sizeof(phm_ppt_v1_voltage_lookup_record) * max_levels;



	table = kzalloc(table_size, GFP_KERNEL);



	if (table == NULL)

	table = kzalloc(struct_size(table, entries, max_levels), GFP_KERNEL);

	if (!table)

		return -ENOMEM;



	table->count = vddc_lookup_pp_tables->ucNumEntries;