@@ -37,6 +37,12 @@
static uint64_t TRACE_IMC_ADDR;
static uint64_t CORE_IMC_EVENT_MASK_ADDR;
static uint64_t trace_scom_val;
+
+struct nest_pmus_struct {
+ const char *name;
+ int len;
+};
+
/*
* Initialise these with the pdbar and htm scom port address array
* at run time, based on the processor version.
@@ -49,58 +55,58 @@ static unsigned int *htm_scom_index;
* imc_chip_avl_vector(in struct imc_chip_cb, look at include/imc.h).
* nest_pmus[] is an array containing all the possible nest IMC PMU node names.
*/
-static char const *nest_pmus[] = {
- "powerbus0",
- "mcs0",
- "mcs1",
- "mcs2",
- "mcs3",
- "mcs4",
- "mcs5",
- "mcs6",
- "mcs7",
- "mba0",
- "mba1",
- "mba2",
- "mba3",
- "mba4",
- "mba5",
- "mba6",
- "mba7",
- "cen0",
- "cen1",
- "cen2",
- "cen3",
- "cen4",
- "cen5",
- "cen6",
- "cen7",
- "xlink0",
- "xlink1",
- "xlink2",
- "mcd0",
- "mcd1",
- "phb0",
- "phb1",
- "phb2",
- "phb3",
- "phb4",
- "phb5",
- "nx",
- "capp0",
- "capp1",
- "vas",
- "int",
- "alink0",
- "alink1",
- "alink2",
- "alink3",
- "nvlink0",
- "nvlink1",
- "nvlink2",
- "nvlink3",
- "nvlink4",
- "nvlink5",
+static struct nest_pmus_struct nest_pmus[] = {
+ { .name = "powerbus0@", .len = 10 },
+ { .name = "mcs0@", .len = 5},
+ { .name = "mcs1@", .len = 5},
+ { .name = "mcs2@", .len = 5},
+ { .name = "mcs3@", .len = 5},
+ { .name = "mcs4@", .len = 5},
+ { .name = "mcs5@", .len = 5},
+ { .name = "mcs6@", .len = 5},
+ { .name = "mcs7@", .len = 5},
+ { .name = "mba0@", .len = 5},
+ { .name = "mba1@", .len = 5},
+ { .name = "mba2@", .len = 5},
+ { .name = "mba3@", .len = 5},
+ { .name = "mba4@", .len = 5},
+ { .name = "mba5@", .len = 5},
+ { .name = "mba6@", .len = 5},
+ { .name = "mba7@", .len = 5},
+ { .name = "centaur0@", .len = 9},
+ { .name = "centaur1@", .len = 9},
+ { .name = "centaur2@", .len = 9},
+ { .name = "centaur3@", .len = 9},
+ { .name = "centaur4@", .len = 9},
+ { .name = "centaur5@", .len = 9},
+ { .name = "centaur6@", .len = 9},
+ { .name = "centaur7@", .len = 9},
+ { .name = "xlink0@", .len = 7},
+ { .name = "xlink1@", .len = 7},
+ { .name = "xlink2@", .len = 7},
+ { .name = "mcd0@", .len = 5},
+ { .name = "mcd1@", .len = 5},
+ { .name = "phb0@", .len = 5},
+ { .name = "phb1@", .len = 5},
+ { .name = "phb2@", .len = 5},
+ { .name = "phb3@", .len = 5},
+ { .name = "phb4@", .len = 5},
+ { .name = "phb5@", .len = 5},
+ { .name = "nx@", .len = 3},
+ { .name = "capp0@", .len = 6},
+ { .name = "capp1@", .len = 6},
+ { .name = "vas@", .len = 4},
+ { .name = "int@", .len = 4},
+ { .name = "alink0@", .len = 7},
+ { .name = "alink1@", .len = 7},
+ { .name = "alink2@", .len = 7},
+ { .name = "alink3@", .len = 7},
+ { .name = "nvlink0@", .len = 8},
+ { .name = "nvlink1@", .len = 8},
+ { .name = "nvlink2@", .len = 8},
+ { .name = "nvlink3@", .len = 8},
+ { .name = "nvlink4@", .len = 8},
+ { .name = "nvlink5@", .len = 8},
/* reserved bits : 51 - 63 */
};
@@ -412,7 +418,7 @@ static void disable_unavailable_units(struct dt_node *dev)
for (i = 0; i < ARRAY_SIZE(nest_pmus); i++) {
if (!(PPC_BITMASK(i, i) & avl_vec)) {
/* Check if the device node exists */
- target = dt_find_by_name(dev, nest_pmus[i]);
+ target = dt_find_by_name_len(dev, nest_pmus[i].name, nest_pmus[i].len);
if (!target)
continue;
/* Remove the device node */
The nest IMC (In Memory Collection) Performance Monitoring Unit(PMU) node names are saved in nest_pmus[] array in the "hw/imc.c" IMC code. Not all the IMC PMUs listed in the device tree may be available. Nest IMC PMU names along with their bit values is represented in imc availability vector. The nest_pmus[] array is used to remove the unavailable nodes by checking this vector. To check node availability, code was using "dt_find_by_name". But since the node names have format like: "name@offset", dt_find_by_name doesn't return the expected result. Fix this by using dt_find_by_name_len. Also, instead of using char array, use a new "struct nest_pmus_struct" which saves the name as well as length parameter for dt_find_by_name_len. Signed-off-by: Athira Rajeev <atrajeev@linux.vnet.ibm.com> --- hw/imc.c | 112 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 59 insertions(+), 53 deletions(-)