diff options
author | Andrew Donnellan <andrew.donnellan@au1.ibm.com> | 2018-09-14 13:46:24 +1000 |
---|---|---|
committer | Stewart Smith <stewart@linux.ibm.com> | 2018-09-17 21:39:01 -0500 |
commit | 68415d5e38ef04e647ad36d59f90c008a0414f56 (patch) | |
tree | d8834d1d88bd4eb4b33bf4dd310d454edb289f1c /core/init.c | |
parent | 7ecb29651c311e35e30fbbebc675cae3e97c8d53 (diff) | |
download | skiboot-68415d5e38ef04e647ad36d59f90c008a0414f56.zip skiboot-68415d5e38ef04e647ad36d59f90c008a0414f56.tar.gz skiboot-68415d5e38ef04e647ad36d59f90c008a0414f56.tar.bz2 |
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 <andrew.donnellan@au1.ibm.com>
Acked-by: Reza Arbab <arbab@linux.ibm.com>
Reviewed-by: Alistair Popple <alistair@popple.id.au>
Reviewed-by: Frederic Barrat <fbarrat@linux.ibm.com>
Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
Diffstat (limited to 'core/init.c')
-rw-r--r-- | core/init.c | 2 |
1 files changed, 0 insertions, 2 deletions
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(); |