diff options
author | Andrew Donnellan <andrew.donnellan@au1.ibm.com> | 2018-08-06 12:17:42 +1000 |
---|---|---|
committer | Stewart Smith <stewart@linux.ibm.com> | 2018-08-06 02:57:41 -0500 |
commit | 8a8cc857fa3f4a635cd9ef4acbd5abdfbe7872bd (patch) | |
tree | a4dbbe7d7aa425879e7c7a58deaca75e03eee435 | |
parent | 7e529767704bcf47abd71f036f2019fe6fa9c59f (diff) | |
download | skiboot-8a8cc857fa3f4a635cd9ef4acbd5abdfbe7872bd.zip skiboot-8a8cc857fa3f4a635cd9ef4acbd5abdfbe7872bd.tar.gz skiboot-8a8cc857fa3f4a635cd9ef4acbd5abdfbe7872bd.tar.bz2 |
hw/npu2: Don't assert if we hit a mixed OpenCAPI/NVLink setup
If our device tree contains a mix of OpenCAPI and NVLink links, that's a
problem, but it's not fatal and we should simply abort NPU init rather than
kill the machine - this is helpful for doing further debugging.
Signed-off-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
-rw-r--r-- | hw/npu2.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1362,7 +1362,7 @@ static void npu2_probe_phb(struct dt_node *dn) if (ocapi_detected && nvlink_detected) { prlog(PR_ERR, "NPU: NVLink and OpenCAPI devices on same chip not supported\n"); - assert(false); + return; } else if (ocapi_detected) { prlog(PR_INFO, "NPU: OpenCAPI link configuration detected, not initialising NVLink\n"); return; |