[Skiboot] [PATCH 3/4] npu3: Improve SALT log output

Reza Arbab arbab at linux.ibm.com
Wed Oct 23 08:22:23 AEDT 2019


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 at linux.ibm.com>
---
 hw/npu3-nvlink.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/hw/npu3-nvlink.c b/hw/npu3-nvlink.c
index 0a185a1780be..3457b7314c35 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);
-- 
1.8.3.1



More information about the Skiboot mailing list