aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorAndrew Donnellan <andrew.donnellan@au1.ibm.com>2018-06-25 11:40:03 +1000
committerStewart Smith <stewart@linux.ibm.com>2018-06-27 17:19:01 +1000
commit44709b88491c63d75febc5f4859a0b1a580a9232 (patch)
treebeffe45940c43b1c48ac4643a31fd3298d59c062 /core
parent861350941f9a3fb76ebcae3e5a32b3cbec929d03 (diff)
downloadskiboot-44709b88491c63d75febc5f4859a0b1a580a9232.zip
skiboot-44709b88491c63d75febc5f4859a0b1a580a9232.tar.gz
skiboot-44709b88491c63d75febc5f4859a0b1a580a9232.tar.bz2
hw/npu2, core/hmi: Use NPU instead of NPU2 as log message prefix
The NPU2{DBG,INF,ERR} macros use "NPU%d" as a prefix to identify messages relating to a particular NPU. It's slightly confusing to have per-NPU messages prefixed with "NPU0" or "NPU1" and NPU-generic messages prefixed with "NPU2". On some future system we could potentially have a NPU #2 in which case it'd be really confusing. Use NPU rather than NPU2 for NPU-generic log messages. There's no risk of confusion with the original npu.c code since that's only for P8. Signed-off-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> Acked-by: Reza Arbab <arbab@linux.ibm.com> Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
Diffstat (limited to 'core')
-rw-r--r--core/hmi.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/hmi.c b/core/hmi.c
index 3bbdb2a..e6fed40 100644
--- a/core/hmi.c
+++ b/core/hmi.c
@@ -694,9 +694,9 @@ static void find_npu2_checkstop_reason(int flat_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",
+ prlog(PR_ERR, "NPU: [Loc: %s] P:%d FIR#%d FIR 0x%016llx mask 0x%016llx\n",
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",
+ prlog(PR_ERR, "NPU: [Loc: %s] P:%d ACTION0 0x%016llx, ACTION1 0x%016llx\n",
loc, flat_chip_id, npu2_fir_action0, npu2_fir_action1);
total_errors++;
}
@@ -718,7 +718,7 @@ static void find_npu2_checkstop_reason(int flat_chip_id,
if (npu2_hmi_verbose) {
_xscom_lock();
- dump_scoms(flat_chip_id, "NPU2", npu2_scom_dump, loc);
+ dump_scoms(flat_chip_id, "NPU", npu2_scom_dump, loc);
_xscom_unlock();
prlog(PR_ERR, " _________________________ \n");
prlog(PR_ERR, "< It's Driver Debug time! >\n");