* [PATCH 2/3] skiboot: Update IMC code to use dt_find_by_name_len for checking dt nodes
2023-01-02 3:15 [PATCH 1/3] core/device: Add function to return child node using name and length Athira Rajeev
@ 2023-01-02 3:15 ` Athira Rajeev
2023-01-02 3:15 ` [PATCH 3/3] skiboot: Update IMC PMU node names for power10 Athira Rajeev
1 sibling, 0 replies; 3+ messages in thread
From: Athira Rajeev @ 2023-01-02 3:15 UTC (permalink / raw)
To: skiboot, mpe, maddy; +Cc: kjain, disgoel, linuxppc-dev, mahesh
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(-)
diff --git a/hw/imc.c b/hw/imc.c
index 97e0809f..779e9634 100644
--- a/hw/imc.c
+++ b/hw/imc.c
@@ -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 */
--
2.27.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 3/3] skiboot: Update IMC PMU node names for power10
2023-01-02 3:15 [PATCH 1/3] core/device: Add function to return child node using name and length Athira Rajeev
2023-01-02 3:15 ` [PATCH 2/3] skiboot: Update IMC code to use dt_find_by_name_len for checking dt nodes Athira Rajeev
@ 2023-01-02 3:15 ` Athira Rajeev
1 sibling, 0 replies; 3+ messages in thread
From: Athira Rajeev @ 2023-01-02 3:15 UTC (permalink / raw)
To: skiboot, mpe, maddy; +Cc: kjain, disgoel, linuxppc-dev, mahesh
The nest IMC (In Memory Collection) Performance Monitoring
Unit(PMU) node names are saved as "struct nest_pmus_struct"
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.
This struct is used to remove the unavailable nodes by checking
this vector.
For power10, the imc_chip_avl_vector ie, imc availability vector
( which is a part of the IMC control block structure ), has
change in mapping of units and bit positions. Hence rename the
existing nest_pmus array to nest_pmus_p9 and add entry for power10
as nest_pmus_p10.
Also the avl_vector has another change in bit positions 11:34. These
bit positions tells the availability of Xlink/Alink/CAPI. There
are total 8 links and three bit field combination says which link
is available. Example, 101b means X-Link is configured. Patch implements
all these change to handle nest_pmus_p10.
Signed-off-by: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
---
hw/imc.c | 195 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 185 insertions(+), 10 deletions(-)
diff --git a/hw/imc.c b/hw/imc.c
index 779e9634..d1adc5ef 100644
--- a/hw/imc.c
+++ b/hw/imc.c
@@ -55,7 +55,7 @@ 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 struct nest_pmus_struct nest_pmus[] = {
+static struct nest_pmus_struct nest_pmus_p9[] = {
{ .name = "powerbus0@", .len = 10 },
{ .name = "mcs0@", .len = 5},
{ .name = "mcs1@", .len = 5},
@@ -110,6 +110,67 @@ static struct nest_pmus_struct nest_pmus[] = {
/* reserved bits : 51 - 63 */
};
+static struct nest_pmus_struct nest_pmus_p10[] = {
+ { .name = "pb@", .len = 3 },
+ { .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 = "pec0@", .len = 5},
+ { .name = "pec1@", .len = 5},
+ { .name = "NA", .len = 0},
+ { .name = "NA", .len = 0},
+ { .name = "NA", .len = 0},
+ { .name = "NA", .len = 0},
+ { .name = "NA", .len = 0},
+ { .name = "NA", .len = 0},
+ { .name = "NA", .len = 0},
+ { .name = "NA", .len = 0},
+ { .name = "NA", .len = 0},
+ { .name = "NA", .len = 0},
+ { .name = "NA", .len = 0},
+ { .name = "NA", .len = 0},
+ { .name = "NA", .len = 0},
+ { .name = "NA", .len = 0},
+ { .name = "NA", .len = 0},
+ { .name = "NA", .len = 0},
+ { .name = "NA", .len = 0},
+ { .name = "NA", .len = 0},
+ { .name = "NA", .len = 0},
+ { .name = "NA", .len = 0},
+ { .name = "NA", .len = 0},
+ { .name = "NA", .len = 0},
+ { .name = "NA", .len = 0},
+ { .name = "NA", .len = 0},
+ { .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 = "ocmb0@", .len = 6},
+ { .name = "ocmb1@", .len = 6},
+ { .name = "ocmb2@", .len = 6},
+ { .name = "ocmb3@", .len = 6},
+ { .name = "ocmb4@", .len = 6},
+ { .name = "ocmb5@", .len = 6},
+ { .name = "ocmb6@", .len = 6},
+ { .name = "ocmb7@", .len = 6},
+ { .name = "ocmb8@", .len = 6},
+ { .name = "ocmb9@", .len = 6},
+ { .name = "ocmb10@", .len = 6},
+ { .name = "ocmb11@", .len = 6},
+ { .name = "ocmb12@", .len = 6},
+ { .name = "ocmb13@", .len = 6},
+ { .name = "ocmb14@", .len = 6},
+ { .name = "ocmb15@", .len = 6},
+ { .name = "nx@", .len = 3},
+};
+
/*
* Due to Nest HW/OCC restriction, microcode will not support individual unit
* events for these nest units mcs0, mcs1 ... mcs7 in the accumulation mode.
@@ -377,7 +438,7 @@ static void disable_unavailable_units(struct dt_node *dev)
uint64_t avl_vec;
struct imc_chip_cb *cb;
struct dt_node *target;
- int i;
+ int i, j;
bool disable_all_nests = false;
struct proc_chip *chip;
@@ -415,14 +476,128 @@ static void disable_unavailable_units(struct dt_node *dev)
avl_vec = (0xffULL) << 56;
}
- 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_len(dev, nest_pmus[i].name, nest_pmus[i].len);
- if (!target)
- continue;
- /* Remove the device node */
- dt_free(target);
+ if (proc_gen == proc_gen_p9) {
+ for (i = 0; i < ARRAY_SIZE(nest_pmus_p9); i++) {
+ if (!(PPC_BITMASK(i, i) & avl_vec)) {
+ /* Check if the device node exists */
+ target = dt_find_by_name_len(dev, nest_pmus_p9[i].name, nest_pmus_p9[i].len);
+ if (!target)
+ continue;
+ /* Remove the device node */
+ dt_free(target);
+ }
+ }
+ } else if (proc_gen == proc_gen_p10) {
+ int val;
+ char al[8], xl[8], otl[8], phb[8];
+ for (i = 0; i < 11; i++) {
+ if (!(PPC_BITMASK(i, i) & avl_vec)) {
+ /* Check if the device node exists */
+ target = dt_find_by_name_len(dev, nest_pmus_p10[i].name, nest_pmus_p10[i].len);
+ if (!target)
+ continue;
+ /* Remove the device node */
+ dt_free(target);
+ }
+ }
+
+ for (i = 35; i < 41; i++) {
+ if (!(PPC_BITMASK(i, i) & avl_vec)) {
+ /* Check if the device node exists for phb */
+ for (j = 0; j < 3; j++) {
+ snprintf(phb, sizeof(phb), "phb%d_%d@", (i-35), j);
+ target = dt_find_by_name_len(dev, phb, 7);
+ if (!target)
+ continue;
+ /* Remove the device node */
+ dt_free(target);
+ }
+ }
+ }
+
+ for (i = 41; i < 58; i++) {
+ if (!(PPC_BITMASK(i, i) & avl_vec)) {
+ /* Check if the device node exists */
+ target = dt_find_by_name_len(dev, nest_pmus_p10[i].name, nest_pmus_p10[i].len);
+ if (!target)
+ continue;
+ /* Remove the device node */
+ dt_free(target);
+ }
+ }
+
+ for (i=0; i<8; i++) {
+ val = ((avl_vec & (0x7ULL << (29 + (3 * i)))) >> (29 + (3 * i)));
+ switch (val) {
+ case 0x5: //xlink configured and functional
+
+ snprintf(al, sizeof(al), "alink%1d@",(7-i));
+ target = dt_find_by_name_len(dev, al, 7);
+ if (target)
+ dt_free(target);
+
+ snprintf(otl, sizeof(otl),"otl%1d_0@",(7-i));
+ target = dt_find_by_name_len(dev, otl, 7);
+ if (target)
+ dt_free(target);
+
+ snprintf(otl,sizeof(otl),"otl%1d_1@",(7-i));
+ target = dt_find_by_name_len(dev, otl, 7);
+ if (target)
+ dt_free(target);
+
+ break;
+ case 0x6: //alink configured and functional
+
+ snprintf(xl,sizeof(xl),"xlink%1d@",(7-i));
+ target = dt_find_by_name_len(dev, xl, 7);
+ if (target)
+ dt_free(target);
+
+ snprintf(otl,sizeof(otl),"otl%1d_0@",(7-i));
+ target = dt_find_by_name_len(dev, otl, 7);
+ if (target)
+ dt_free(target);
+
+ snprintf(otl,sizeof(otl),"otl%1d_1@",(7-i));
+ target = dt_find_by_name_len(dev, otl, 7);
+ if (target)
+ dt_free(target);
+ break;
+
+ case 0x7: //CAPI configured and functional
+ snprintf(al,sizeof(al),"alink%1d@",(7-i));
+ target = dt_find_by_name_len(dev, al, 7);
+ if (target)
+ dt_free(target);
+
+ snprintf(xl,sizeof(xl),"xlink%1d@",(7-i));
+ target = dt_find_by_name_len(dev, xl, 7);
+ if (target)
+ dt_free(target);
+ break;
+ default:
+ snprintf(xl,sizeof(xl),"xlink%1d@",(7-i));
+ target = dt_find_by_name_len(dev, xl, 7);
+ if (target)
+ dt_free(target);
+
+ snprintf(al,sizeof(al),"alink%1d@",(7-i));
+ target = dt_find_by_name_len(dev, al, 7);
+ if (target)
+ dt_free(target);
+
+ snprintf(otl,sizeof(otl),"otl%1d_0@",(7-i));
+ target = dt_find_by_name_len(dev, otl, 7);
+ if (target)
+ dt_free(target);
+
+ snprintf(otl,sizeof(otl),"otl%1d_1@",(7-i));
+ target = dt_find_by_name_len(dev, otl, 7);
+ if (target)
+ dt_free(target);
+ break;
+ }
}
}
--
2.27.0
^ permalink raw reply related [flat|nested] 3+ messages in thread