Skip to content

Commit

Permalink
opal/hmi: Display correct chip id while printing NPU FIRs.
Browse files Browse the repository at this point in the history
HMIs for NPU xstops are broadcasted to all chips. All cores on all the
chips receive HMI. HMI handler correctly identifies and extracts the
NPU FIR details from affected chip, but while printing FIR data it
prints chip id and location code details of this_cpu()->chip_id which
may not be correct. This patch fixes this issue.

CC: stable # v6.0+
Fixes: 7bcbc78 ("Add location code to NPU2 HMI logging")
Signed-off-by: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>
[stewart: add fixes and cc stable]
Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
  • Loading branch information
maheshsal authored and stewartsmith committed Jun 4, 2018
1 parent e6e74c5 commit fa82d36
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions core/hmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,7 @@ static void dump_scoms(int flat_chip_id, const char *unit, uint32_t *scoms,
if (r != OPAL_SUCCESS)
continue;
prlog(PR_ERR, "%s: [Loc: %s] P:%d 0x%08x=0x%016llx\n",
unit, loc, this_cpu()->chip_id, *scoms, value);
unit, loc, flat_chip_id, *scoms, value);
scoms++;
}
}
Expand Down Expand Up @@ -691,13 +691,13 @@ static void find_npu2_checkstop_reason(int flat_chip_id,
fatal_errors = npu2_fir & ~npu2_fir_mask & npu2_fir_action0 & npu2_fir_action1;

if (fatal_errors) {
loc = chip_loc_code(this_cpu()->chip_id);
loc = chip_loc_code(flat_chip_id);
if (!loc)
loc = "Not Available";
prlog(PR_ERR, "NPU2: [Loc: %s] P:%d FIR#%d FIR 0x%016llx mask 0x%016llx\n",
loc, this_cpu()->chip_id, i, npu2_fir, npu2_fir_mask);
loc, flat_chip_id, i, npu2_fir, npu2_fir_mask);
prlog(PR_ERR, "NPU2: [Loc: %s] P:%d ACTION0 0x%016llx, ACTION1 0x%016llx\n",
loc, this_cpu()->chip_id, npu2_fir_action0, npu2_fir_action1);
loc, flat_chip_id, npu2_fir_action0, npu2_fir_action1);
total_errors++;
}

Expand Down

0 comments on commit fa82d36

Please sign in to comment.