From 3e4577939bbff8f422d661c0bac5bb7dc3516ac6 Mon Sep 17 00:00:00 2001 From: Alexey Kardashevskiy Date: Tue, 24 Oct 2017 16:55:29 +1100 Subject: [PATCH] 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 Signed-off-by: Alexey Kardashevskiy Signed-off-by: Stewart Smith --- hw/npu.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/npu.c b/hw/npu.c index b113800b9afd..85750c924268 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)