From 68415d5e38ef04e647ad36d59f90c008a0414f56 Mon Sep 17 00:00:00 2001 From: Andrew Donnellan Date: Fri, 14 Sep 2018 13:46:24 +1000 Subject: hw/npu2: Common NPU2 init routine between NVLink and OpenCAPI Replace probe_npu2() and probe_npu2_opencapi() with a new shared probe_npu2(). Refactor some of the common NPU setup code into shared code. No functional change. This patch does not implement support for using both types of devices simultaneously on the same NPU - we expect to add this sometime in the future. Signed-off-by: Andrew Donnellan Acked-by: Reza Arbab Reviewed-by: Alistair Popple Reviewed-by: Frederic Barrat Signed-off-by: Stewart Smith --- core/init.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'core/init.c') diff --git a/core/init.c b/core/init.c index ca6c468..9095981 100644 --- a/core/init.c +++ b/core/init.c @@ -1126,8 +1126,6 @@ void __noreturn __nomcount main_cpu_entry(const void *fdt) /* Probe NPUs */ probe_npu(); probe_npu2(); - /* TODO: Eventually, we'll do NVLink and OpenCAPI together */ - probe_npu2_opencapi(); /* Initialize PCI */ pci_init_slots(); -- cgit v1.1