iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

platform/mellanox: mlxbf-pmc: mlxbf_pmc_event_list(): make size ptr optional

Browse Source 
The mlxbf_pmc_event_list() function returns a pointer to an array of
supported events and the array size. The array size is returned via
a pointer passed as an argument, which is mandatory.

However, we want to be able to use mlxbf_pmc_event_list() just to check
if a block name is implemented/supported. For this usage passing the size
argument is not necessary so let's make it optional.

Signed-off-by: Luiz Capitulino <luizcap@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/182de8ec6b9c33152f2ba6b248c35b0311abf5e4.1708635408.git.luizcap@redhat.com
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
This commit is contained in:
Luiz Capitulino
2024-02-22 15:57:29 -05:00
committed by Ilpo Järvinen
parent f9ccdb4285
commit 0d46439bda
1 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/platform/mellanox/mlxbf-pmc.c
View File

@@ -966,32 +966,33 @@ static bool mlxbf_pmc_valid_range(unsigned int blk_num, u32 offset)
} }
/* Get the event list corresponding to a certain block */ /* Get the event list corresponding to a certain block */
static const struct mlxbf_pmc_events *mlxbf_pmc_event_list(const char *blk, size_t *size) static const struct mlxbf_pmc_events *mlxbf_pmc_event_list(const char *blk, size_t *psize)
{ {
const struct mlxbf_pmc_events *events; const struct mlxbf_pmc_events *events;
size_t size;
if (strstr(blk, "tilenet")) { if (strstr(blk, "tilenet")) {
events = mlxbf_pmc_hnfnet_events; events = mlxbf_pmc_hnfnet_events;
*size = ARRAY_SIZE(mlxbf_pmc_hnfnet_events); size = ARRAY_SIZE(mlxbf_pmc_hnfnet_events);
} else if (strstr(blk, "tile")) { } else if (strstr(blk, "tile")) {
events = mlxbf_pmc_hnf_events; events = mlxbf_pmc_hnf_events;
*size = ARRAY_SIZE(mlxbf_pmc_hnf_events); size = ARRAY_SIZE(mlxbf_pmc_hnf_events);
} else if (strstr(blk, "triogen")) { } else if (strstr(blk, "triogen")) {
events = mlxbf_pmc_smgen_events; events = mlxbf_pmc_smgen_events;
*size = ARRAY_SIZE(mlxbf_pmc_smgen_events); size = ARRAY_SIZE(mlxbf_pmc_smgen_events);
} else if (strstr(blk, "trio")) { } else if (strstr(blk, "trio")) {
switch (pmc->event_set) { switch (pmc->event_set) {
case MLXBF_PMC_EVENT_SET_BF1: case MLXBF_PMC_EVENT_SET_BF1:
events = mlxbf_pmc_trio_events_1; events = mlxbf_pmc_trio_events_1;
*size = ARRAY_SIZE(mlxbf_pmc_trio_events_1); size = ARRAY_SIZE(mlxbf_pmc_trio_events_1);
break; break;
case MLXBF_PMC_EVENT_SET_BF2: case MLXBF_PMC_EVENT_SET_BF2:
events = mlxbf_pmc_trio_events_2; events = mlxbf_pmc_trio_events_2;
*size = ARRAY_SIZE(mlxbf_pmc_trio_events_2); size = ARRAY_SIZE(mlxbf_pmc_trio_events_2);
break; break;
default: default:
events = NULL; events = NULL;
*size = 0; size = 0;
break; break;
} }
} else if (strstr(blk, "mss")) { } else if (strstr(blk, "mss")) {
@@ -999,43 +1000,46 @@ static const struct mlxbf_pmc_events *mlxbf_pmc_event_list(const char *blk, size
case MLXBF_PMC_EVENT_SET_BF1: case MLXBF_PMC_EVENT_SET_BF1:
case MLXBF_PMC_EVENT_SET_BF2: case MLXBF_PMC_EVENT_SET_BF2:
events = mlxbf_pmc_mss_events_1; events = mlxbf_pmc_mss_events_1;
*size = ARRAY_SIZE(mlxbf_pmc_mss_events_1); size = ARRAY_SIZE(mlxbf_pmc_mss_events_1);
break; break;
case MLXBF_PMC_EVENT_SET_BF3: case MLXBF_PMC_EVENT_SET_BF3:
events = mlxbf_pmc_mss_events_3; events = mlxbf_pmc_mss_events_3;
*size = ARRAY_SIZE(mlxbf_pmc_mss_events_3); size = ARRAY_SIZE(mlxbf_pmc_mss_events_3);
break; break;
default: default:
events = NULL; events = NULL;
*size = 0; size = 0;
break; break;
} }
} else if (strstr(blk, "ecc")) { } else if (strstr(blk, "ecc")) {
events = mlxbf_pmc_ecc_events; events = mlxbf_pmc_ecc_events;
*size = ARRAY_SIZE(mlxbf_pmc_ecc_events); size = ARRAY_SIZE(mlxbf_pmc_ecc_events);
} else if (strstr(blk, "pcie")) { } else if (strstr(blk, "pcie")) {
events = mlxbf_pmc_pcie_events; events = mlxbf_pmc_pcie_events;
*size = ARRAY_SIZE(mlxbf_pmc_pcie_events); size = ARRAY_SIZE(mlxbf_pmc_pcie_events);
} else if (strstr(blk, "l3cache")) { } else if (strstr(blk, "l3cache")) {
events = mlxbf_pmc_l3c_events; events = mlxbf_pmc_l3c_events;
*size = ARRAY_SIZE(mlxbf_pmc_l3c_events); size = ARRAY_SIZE(mlxbf_pmc_l3c_events);
} else if (strstr(blk, "gic")) { } else if (strstr(blk, "gic")) {
events = mlxbf_pmc_smgen_events; events = mlxbf_pmc_smgen_events;
*size = ARRAY_SIZE(mlxbf_pmc_smgen_events); size = ARRAY_SIZE(mlxbf_pmc_smgen_events);
} else if (strstr(blk, "smmu")) { } else if (strstr(blk, "smmu")) {
events = mlxbf_pmc_smgen_events; events = mlxbf_pmc_smgen_events;
*size = ARRAY_SIZE(mlxbf_pmc_smgen_events); size = ARRAY_SIZE(mlxbf_pmc_smgen_events);
} else if (strstr(blk, "llt_miss")) { } else if (strstr(blk, "llt_miss")) {
events = mlxbf_pmc_llt_miss_events; events = mlxbf_pmc_llt_miss_events;
*size = ARRAY_SIZE(mlxbf_pmc_llt_miss_events); size = ARRAY_SIZE(mlxbf_pmc_llt_miss_events);
} else if (strstr(blk, "llt")) { } else if (strstr(blk, "llt")) {
events = mlxbf_pmc_llt_events; events = mlxbf_pmc_llt_events;
*size = ARRAY_SIZE(mlxbf_pmc_llt_events); size = ARRAY_SIZE(mlxbf_pmc_llt_events);
} else { } else {
events = NULL; events = NULL;
*size = 0; size = 0;
} }
if (psize)
*psize = size;
return events; return events;
} }