Commit bae82e84 authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Alex Deucher

drm/amd/pm: Replace one-element array with flexible-array in struct phm_ppt_v1_pcie_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_pcie_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-arraysBuild-tested-by: default avatarkernel test robot <lkp@intel.com>
Link: https://lore.kernel.org/lkml/5f7db0bc.7Xivn4K83f7XW0ug%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 b44fd9cc
...@@ -103,7 +103,7 @@ typedef struct phm_ppt_v1_pcie_record phm_ppt_v1_pcie_record; ...@@ -103,7 +103,7 @@ typedef struct phm_ppt_v1_pcie_record phm_ppt_v1_pcie_record;
struct phm_ppt_v1_pcie_table { struct phm_ppt_v1_pcie_table {
uint32_t count; /* Number of entries. */ uint32_t count; /* Number of entries. */
phm_ppt_v1_pcie_record entries[1]; /* Dynamically allocate count entries. */ phm_ppt_v1_pcie_record entries[]; /* Dynamically allocate count entries. */
}; };
typedef struct phm_ppt_v1_pcie_table phm_ppt_v1_pcie_table; typedef struct phm_ppt_v1_pcie_table phm_ppt_v1_pcie_table;
......
...@@ -478,7 +478,7 @@ static int get_pcie_table( ...@@ -478,7 +478,7 @@ static int get_pcie_table(
PPTable_Generic_SubTable_Header const *ptable PPTable_Generic_SubTable_Header const *ptable
) )
{ {
uint32_t table_size, i, pcie_count; uint32_t i, pcie_count;
phm_ppt_v1_pcie_table *pcie_table; phm_ppt_v1_pcie_table *pcie_table;
struct phm_ppt_v1_information *pp_table_information = struct phm_ppt_v1_information *pp_table_information =
(struct phm_ppt_v1_information *)(hwmgr->pptable); (struct phm_ppt_v1_information *)(hwmgr->pptable);
...@@ -491,12 +491,10 @@ static int get_pcie_table( ...@@ -491,12 +491,10 @@ static int get_pcie_table(
PP_ASSERT_WITH_CODE((atom_pcie_table->ucNumEntries != 0), PP_ASSERT_WITH_CODE((atom_pcie_table->ucNumEntries != 0),
"Invalid PowerPlay Table!", return -1); "Invalid PowerPlay Table!", return -1);
table_size = sizeof(uint32_t) + pcie_table = kzalloc(struct_size(pcie_table, entries,
sizeof(phm_ppt_v1_pcie_record) * atom_pcie_table->ucNumEntries; atom_pcie_table->ucNumEntries),
GFP_KERNEL);
pcie_table = kzalloc(table_size, GFP_KERNEL); if (!pcie_table)
if (pcie_table == NULL)
return -ENOMEM; return -ENOMEM;
/* /*
...@@ -530,12 +528,10 @@ static int get_pcie_table( ...@@ -530,12 +528,10 @@ static int get_pcie_table(
PP_ASSERT_WITH_CODE((atom_pcie_table->ucNumEntries != 0), PP_ASSERT_WITH_CODE((atom_pcie_table->ucNumEntries != 0),
"Invalid PowerPlay Table!", return -1); "Invalid PowerPlay Table!", return -1);
table_size = sizeof(uint32_t) + pcie_table = kzalloc(struct_size(pcie_table, entries,
sizeof(phm_ppt_v1_pcie_record) * atom_pcie_table->ucNumEntries; atom_pcie_table->ucNumEntries),
GFP_KERNEL);
pcie_table = kzalloc(table_size, GFP_KERNEL); if (!pcie_table)
if (pcie_table == NULL)
return -ENOMEM; return -ENOMEM;
/* /*
......
...@@ -784,7 +784,7 @@ static int get_pcie_table(struct pp_hwmgr *hwmgr, ...@@ -784,7 +784,7 @@ static int get_pcie_table(struct pp_hwmgr *hwmgr,
struct phm_ppt_v1_pcie_table **vega10_pcie_table, struct phm_ppt_v1_pcie_table **vega10_pcie_table,
const Vega10_PPTable_Generic_SubTable_Header *table) const Vega10_PPTable_Generic_SubTable_Header *table)
{ {
uint32_t table_size, i, pcie_count; uint32_t i, pcie_count;
struct phm_ppt_v1_pcie_table *pcie_table; struct phm_ppt_v1_pcie_table *pcie_table;
struct phm_ppt_v2_information *table_info = struct phm_ppt_v2_information *table_info =
(struct phm_ppt_v2_information *)(hwmgr->pptable); (struct phm_ppt_v2_information *)(hwmgr->pptable);
...@@ -795,12 +795,8 @@ static int get_pcie_table(struct pp_hwmgr *hwmgr, ...@@ -795,12 +795,8 @@ static int get_pcie_table(struct pp_hwmgr *hwmgr,
"Invalid PowerPlay Table!", "Invalid PowerPlay Table!",
return 0); return 0);
table_size = sizeof(uint32_t) + pcie_table = kzalloc(struct_size(pcie_table, entries, atom_pcie_table->ucNumEntries),
sizeof(struct phm_ppt_v1_pcie_record) * GFP_KERNEL);
atom_pcie_table->ucNumEntries;
pcie_table = kzalloc(table_size, GFP_KERNEL);
if (!pcie_table) if (!pcie_table)
return -ENOMEM; return -ENOMEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment