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

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: kernel test robot <lkp@intel.com>
Link: https://lore.kernel.org/lkml/5f7d61df.jWrFfnjxGbjSkPOp%25lkp@intel.com/
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/hwmgr_ppt.h b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/hwmgr_ppt.h
index 923cc04e405a96e8ee2e837c5e231d591ecad5a5..e11298cdeb30407927dcc1fff2d0c9312c08b5ce 100644 (file)
--- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/hwmgr_ppt.h
+++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/hwmgr_ppt.h
@@ -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;
 

diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/process_pptables_v1_0.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/process_pptables_v1_0.c
index 5d8016cd1986d92cc2981739bc9a5f74169d8b1d..426655b9c678a5009b3f9a499ca5520f5804b749 100644 (file)
--- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/process_pptables_v1_0.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/process_pptables_v1_0.c
@@ -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;

diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_processpptables.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_processpptables.c
index 4f6a73a2cf2800bc5c4269434e461e5c079b102f..3d7f915381c8329dfe8e6711c6ed7fce8755a11d 100644 (file)
--- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_processpptables.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_processpptables.c
@@ -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;