|
@@ -11813,17 +11813,14 @@ static int init_cntrs(struct hfi1_devdata *dd)
|
|
sz = 0;
|
|
sz = 0;
|
|
|
|
|
|
for (i = 0; i < DEV_CNTR_LAST; i++) {
|
|
for (i = 0; i < DEV_CNTR_LAST; i++) {
|
|
- hfi1_dbg_early("Init cntr %s\n", dev_cntrs[i].name);
|
|
|
|
if (dev_cntrs[i].flags & CNTR_DISABLED) {
|
|
if (dev_cntrs[i].flags & CNTR_DISABLED) {
|
|
hfi1_dbg_early("\tSkipping %s\n", dev_cntrs[i].name);
|
|
hfi1_dbg_early("\tSkipping %s\n", dev_cntrs[i].name);
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
|
|
|
|
if (dev_cntrs[i].flags & CNTR_VL) {
|
|
if (dev_cntrs[i].flags & CNTR_VL) {
|
|
- hfi1_dbg_early("\tProcessing VL cntr\n");
|
|
|
|
dev_cntrs[i].offset = dd->ndevcntrs;
|
|
dev_cntrs[i].offset = dd->ndevcntrs;
|
|
for (j = 0; j < C_VL_COUNT; j++) {
|
|
for (j = 0; j < C_VL_COUNT; j++) {
|
|
- memset(name, '\0', C_MAX_NAME);
|
|
|
|
snprintf(name, C_MAX_NAME, "%s%d",
|
|
snprintf(name, C_MAX_NAME, "%s%d",
|
|
dev_cntrs[i].name,
|
|
dev_cntrs[i].name,
|
|
vl_from_idx(j));
|
|
vl_from_idx(j));
|
|
@@ -11832,16 +11829,11 @@ static int init_cntrs(struct hfi1_devdata *dd)
|
|
if (dev_cntrs[i].flags & CNTR_32BIT)
|
|
if (dev_cntrs[i].flags & CNTR_32BIT)
|
|
sz += bit_type_32_sz;
|
|
sz += bit_type_32_sz;
|
|
sz++;
|
|
sz++;
|
|
- hfi1_dbg_early("\t\t%s\n", name);
|
|
|
|
dd->ndevcntrs++;
|
|
dd->ndevcntrs++;
|
|
}
|
|
}
|
|
} else if (dev_cntrs[i].flags & CNTR_SDMA) {
|
|
} else if (dev_cntrs[i].flags & CNTR_SDMA) {
|
|
- hfi1_dbg_early(
|
|
|
|
- "\tProcessing per SDE counters chip enginers %u\n",
|
|
|
|
- dd->chip_sdma_engines);
|
|
|
|
dev_cntrs[i].offset = dd->ndevcntrs;
|
|
dev_cntrs[i].offset = dd->ndevcntrs;
|
|
for (j = 0; j < dd->chip_sdma_engines; j++) {
|
|
for (j = 0; j < dd->chip_sdma_engines; j++) {
|
|
- memset(name, '\0', C_MAX_NAME);
|
|
|
|
snprintf(name, C_MAX_NAME, "%s%d",
|
|
snprintf(name, C_MAX_NAME, "%s%d",
|
|
dev_cntrs[i].name, j);
|
|
dev_cntrs[i].name, j);
|
|
sz += strlen(name);
|
|
sz += strlen(name);
|
|
@@ -11849,7 +11841,6 @@ static int init_cntrs(struct hfi1_devdata *dd)
|
|
if (dev_cntrs[i].flags & CNTR_32BIT)
|
|
if (dev_cntrs[i].flags & CNTR_32BIT)
|
|
sz += bit_type_32_sz;
|
|
sz += bit_type_32_sz;
|
|
sz++;
|
|
sz++;
|
|
- hfi1_dbg_early("\t\t%s\n", name);
|
|
|
|
dd->ndevcntrs++;
|
|
dd->ndevcntrs++;
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
@@ -11860,7 +11851,6 @@ static int init_cntrs(struct hfi1_devdata *dd)
|
|
sz += bit_type_32_sz;
|
|
sz += bit_type_32_sz;
|
|
dev_cntrs[i].offset = dd->ndevcntrs;
|
|
dev_cntrs[i].offset = dd->ndevcntrs;
|
|
dd->ndevcntrs++;
|
|
dd->ndevcntrs++;
|
|
- hfi1_dbg_early("\tAdding %s\n", dev_cntrs[i].name);
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -11886,7 +11876,6 @@ static int init_cntrs(struct hfi1_devdata *dd)
|
|
/* Nothing */
|
|
/* Nothing */
|
|
} else if (dev_cntrs[i].flags & CNTR_VL) {
|
|
} else if (dev_cntrs[i].flags & CNTR_VL) {
|
|
for (j = 0; j < C_VL_COUNT; j++) {
|
|
for (j = 0; j < C_VL_COUNT; j++) {
|
|
- memset(name, '\0', C_MAX_NAME);
|
|
|
|
snprintf(name, C_MAX_NAME, "%s%d",
|
|
snprintf(name, C_MAX_NAME, "%s%d",
|
|
dev_cntrs[i].name,
|
|
dev_cntrs[i].name,
|
|
vl_from_idx(j));
|
|
vl_from_idx(j));
|
|
@@ -11903,7 +11892,6 @@ static int init_cntrs(struct hfi1_devdata *dd)
|
|
}
|
|
}
|
|
} else if (dev_cntrs[i].flags & CNTR_SDMA) {
|
|
} else if (dev_cntrs[i].flags & CNTR_SDMA) {
|
|
for (j = 0; j < dd->chip_sdma_engines; j++) {
|
|
for (j = 0; j < dd->chip_sdma_engines; j++) {
|
|
- memset(name, '\0', C_MAX_NAME);
|
|
|
|
snprintf(name, C_MAX_NAME, "%s%d",
|
|
snprintf(name, C_MAX_NAME, "%s%d",
|
|
dev_cntrs[i].name, j);
|
|
dev_cntrs[i].name, j);
|
|
memcpy(p, name, strlen(name));
|
|
memcpy(p, name, strlen(name));
|
|
@@ -11950,17 +11938,14 @@ static int init_cntrs(struct hfi1_devdata *dd)
|
|
sz = 0;
|
|
sz = 0;
|
|
dd->nportcntrs = 0;
|
|
dd->nportcntrs = 0;
|
|
for (i = 0; i < PORT_CNTR_LAST; i++) {
|
|
for (i = 0; i < PORT_CNTR_LAST; i++) {
|
|
- hfi1_dbg_early("Init pcntr %s\n", port_cntrs[i].name);
|
|
|
|
if (port_cntrs[i].flags & CNTR_DISABLED) {
|
|
if (port_cntrs[i].flags & CNTR_DISABLED) {
|
|
hfi1_dbg_early("\tSkipping %s\n", port_cntrs[i].name);
|
|
hfi1_dbg_early("\tSkipping %s\n", port_cntrs[i].name);
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
|
|
|
|
if (port_cntrs[i].flags & CNTR_VL) {
|
|
if (port_cntrs[i].flags & CNTR_VL) {
|
|
- hfi1_dbg_early("\tProcessing VL cntr\n");
|
|
|
|
port_cntrs[i].offset = dd->nportcntrs;
|
|
port_cntrs[i].offset = dd->nportcntrs;
|
|
for (j = 0; j < C_VL_COUNT; j++) {
|
|
for (j = 0; j < C_VL_COUNT; j++) {
|
|
- memset(name, '\0', C_MAX_NAME);
|
|
|
|
snprintf(name, C_MAX_NAME, "%s%d",
|
|
snprintf(name, C_MAX_NAME, "%s%d",
|
|
port_cntrs[i].name,
|
|
port_cntrs[i].name,
|
|
vl_from_idx(j));
|
|
vl_from_idx(j));
|
|
@@ -11969,7 +11954,6 @@ static int init_cntrs(struct hfi1_devdata *dd)
|
|
if (port_cntrs[i].flags & CNTR_32BIT)
|
|
if (port_cntrs[i].flags & CNTR_32BIT)
|
|
sz += bit_type_32_sz;
|
|
sz += bit_type_32_sz;
|
|
sz++;
|
|
sz++;
|
|
- hfi1_dbg_early("\t\t%s\n", name);
|
|
|
|
dd->nportcntrs++;
|
|
dd->nportcntrs++;
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
@@ -11980,7 +11964,6 @@ static int init_cntrs(struct hfi1_devdata *dd)
|
|
sz += bit_type_32_sz;
|
|
sz += bit_type_32_sz;
|
|
port_cntrs[i].offset = dd->nportcntrs;
|
|
port_cntrs[i].offset = dd->nportcntrs;
|
|
dd->nportcntrs++;
|
|
dd->nportcntrs++;
|
|
- hfi1_dbg_early("\tAdding %s\n", port_cntrs[i].name);
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -11997,7 +11980,6 @@ static int init_cntrs(struct hfi1_devdata *dd)
|
|
|
|
|
|
if (port_cntrs[i].flags & CNTR_VL) {
|
|
if (port_cntrs[i].flags & CNTR_VL) {
|
|
for (j = 0; j < C_VL_COUNT; j++) {
|
|
for (j = 0; j < C_VL_COUNT; j++) {
|
|
- memset(name, '\0', C_MAX_NAME);
|
|
|
|
snprintf(name, C_MAX_NAME, "%s%d",
|
|
snprintf(name, C_MAX_NAME, "%s%d",
|
|
port_cntrs[i].name,
|
|
port_cntrs[i].name,
|
|
vl_from_idx(j));
|
|
vl_from_idx(j));
|