aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Kardashevskiy <aik@ozlabs.ru>2017-10-24 16:55:29 +1100
committerStewart Smith <stewart@linux.vnet.ibm.com>2017-10-29 18:48:02 -0500
commit3e4577939bbff8f422d661c0bac5bb7dc3516ac6 (patch)
tree0739c09d7b69ca7fd8263233f77eeb8ddca42785
parent896cb12ce237ac8e43228297f313d93c6e83e88f (diff)
downloadskiboot-3e4577939bbff8f422d661c0bac5bb7dc3516ac6.zip
skiboot-3e4577939bbff8f422d661c0bac5bb7dc3516ac6.tar.gz
skiboot-3e4577939bbff8f422d661c0bac5bb7dc3516ac6.tar.bz2
npu: Fix broken fast reset
0679f61244b "fast-reset: by default (if possible)" broke NPU - now the NV links does not get enabled after reboot. This disables fast reboot for NPU machines till a better solution is found. Suggested-by: Andrew Donnellan <andonnel@au1.ibm.com> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
-rw-r--r--hw/npu.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/hw/npu.c b/hw/npu.c
index b113800..85750c9 100644
--- a/hw/npu.c
+++ b/hw/npu.c
@@ -1153,6 +1153,9 @@ static void npu_probe_phb(struct dt_node *dn)
dt_add_property_cells(np, "ibm,links", links);
dt_add_property(np, "ibm,mmio-window", mm_win, sizeof(mm_win));
dt_add_property_cells(np, "ibm,phb-diag-data-size", 0);
+
+ /* Disable fast reboot - not currently supported */
+ disable_fast_reboot("NVLink device enabled");
}
static void npu_dev_populate_vendor_cap(struct npu_dev_cap *cap)