aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReza Arbab <arbab@linux.ibm.com>2019-10-22 16:22:23 -0500
committerOliver O'Halloran <oohall@gmail.com>2019-11-04 10:52:47 +1100
commit3ea336e768429bc2851f6170f0f24c181d0fb301 (patch)
tree48ec2f187613f405e8dd0fb7cb4190e1b8ecfc17
parent03e7420e05921d60244ffc6b223bedcd3fb3ca05 (diff)
downloadskiboot-3ea336e768429bc2851f6170f0f24c181d0fb301.zip
skiboot-3ea336e768429bc2851f6170f0f24c181d0fb301.tar.gz
skiboot-3ea336e768429bc2851f6170f0f24c181d0fb301.tar.bz2
npu3: Improve SALT log output
Add a log line for when the PPE indicates it's not in the ready state, and make all the SALT lines start with a capital to look nicer. Signed-off-by: Reza Arbab <arbab@linux.ibm.com> Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
-rw-r--r--hw/npu3-nvlink.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/hw/npu3-nvlink.c b/hw/npu3-nvlink.c
index 0a185a1..3457b73 100644
--- a/hw/npu3-nvlink.c
+++ b/hw/npu3-nvlink.c
@@ -1223,8 +1223,10 @@ static int64_t npu3_dev_salt(void *pvd, struct pci_cfg_reg_filter *pcrf,
/* Check for another command in progress */
val = npu3_dev_ppe_sram_read(dev, OB_PPE_SALT_CMD);
- if (GETFIELD(OB_PPE_SALT_CMD_READY, val))
+ if (GETFIELD(OB_PPE_SALT_CMD_READY, val)) {
+ NPU3DEVINF(dev, "SALT_CMD 0x%x: Not ready\n", cmd_reg);
return OPAL_BUSY;
+ }
val = OB_PPE_SALT_CMD_READY;
val = SETFIELD(OB_PPE_SALT_CMD_RW, val, write);
@@ -1240,7 +1242,7 @@ static int64_t npu3_dev_salt(void *pvd, struct pci_cfg_reg_filter *pcrf,
while (GETFIELD(OB_PPE_SALT_CMD_READY, val)) {
if (tb_compare(mftb(), timeout) == TB_AAFTERB) {
- NPU3DEVINF(dev, "SALT_CMD 0x%x: timeout\n", cmd_reg);
+ NPU3DEVINF(dev, "SALT_CMD 0x%x: Timeout\n", cmd_reg);
return OPAL_BUSY;
}
@@ -1248,7 +1250,7 @@ static int64_t npu3_dev_salt(void *pvd, struct pci_cfg_reg_filter *pcrf,
}
if (GETFIELD(OB_PPE_SALT_CMD_ERR, val))
- NPU3DEVINF(dev, "SALT_CMD 0x%x: error\n", cmd_reg);
+ NPU3DEVINF(dev, "SALT_CMD 0x%x: Error\n", cmd_reg);
if (!write)
*data = GETFIELD(OB_PPE_SALT_CMD_DATA, val);