tweak signature test code (Xilinx#1687)

OIEIEIO · Jul 19, 2019 · 68d48a8 · 68d48a8
1 parent b7eb85a
commit 68d48a8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/subdev/icap.c b/src/runtime_src/core/pcie/driver/linux/xocl/subdev/icap.c
@@ -2903,7 +2903,7 @@ static int icap_verify_signature(struct icap *icap,
 		(icap->sec_level == ICAP_SEC_SYSTEM) ? SYS_KEYS : icap_keys,
 		VERIFYING_UNSPECIFIED_SIGNATURE, NULL, NULL);
 	if (ret && icap->sec_level == 0) {
-		ICAP_INFO(icap, "signature verification failed");
+		ICAP_INFO(icap, "signature verification failed: %d", ret);
 		ret = 0;
 	}
 #else
@@ -2995,11 +2995,11 @@ static ssize_t sec_level_store(struct device *dev,
 				"can't lower security level from system level");
 			ret = -EINVAL;
 		}
+		icap_key_test(icap);
 	}
 
 	mutex_unlock(&icap->icap_lock);
 
-	icap_key_test(icap);
 	return ret;
 #endif
 }

diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/xocl_fdt.c b/src/runtime_src/core/pcie/driver/linux/xocl/xocl_fdt.c
@@ -102,7 +102,7 @@ static void *flash_build_priv(xdev_handle_t xdev_hdl, void *subdev, size_t *len)
 	if (!fdt_node_check_compatible(blob, node, "axi_qspi"))
 		flash_type = FLASH_TYPE_SPI;
 	else {
-		xocl_xdev_err(xdev_hdl, "UNKNOWN flash type %s", prop);
+		xocl_xdev_err(xdev_hdl, "UNKNOWN flash type");
 		goto failed;
 	}