[v3,10/10] npu: Add CONFIG_NPU to optionally skip NPU code

diff --git a/Makefile b/Makefile
index a9807c4dc..115c97fcd 100644
--- a/Makefile
+++ b/Makefile
@@ -67,6 +67,8 @@  DEAD_CODE_ELIMINATION ?= 0
 CONFIG_FSP?=1
 # Try to build without POWER8 support
 CONFIG_P8?=1
+# Try and build without any NPU support
+CONFIG_NPU?=1
 
 #
 # Where is the source directory, must be a full path (no ~)
diff --git a/Makefile.main b/Makefile.main
index 2a346a6c9..dce0338da 100644
--- a/Makefile.main
+++ b/Makefile.main
@@ -165,6 +165,10 @@  ifeq ($(CONFIG_P8),1)
 CFLAGS += -DCONFIG_P8=1
 endif
 
+ifeq ($(CONFIG_NPU),1)
+CFLAGS += -DCONFIG_NPU=1
+endif
+
 CFLAGS += $(call try-cflag,$(CC),-Wjump-misses-init) \
 	  $(call try-cflag,$(CC),-Wsuggest-attribute=const) \
 	  $(call try-cflag,$(CC),-Wsuggest-attribute=noreturn) \
diff --git a/core/hmi.c b/core/hmi.c
index 55eaa59c6..279f8b8cf 100644
--- a/core/hmi.c
+++ b/core/hmi.c
@@ -717,6 +717,7 @@  static void find_nx_checkstop_reason(int flat_chip_id,
 	queue_hmi_event(hmi_evt, 0, out_flags);
 }
 
+#ifdef CONFIG_NPU
 static bool phb_is_npu2(struct dt_node *dn)
 {
 	return (dt_node_is_compatible(dn, "ibm,power9-npu-pciex") ||
@@ -847,7 +848,7 @@  static void find_npu2_checkstop_reason(int flat_chip_id,
 	npu2_hmi_verbose = true;
 
 	if (npu2_hmi_verbose) {
-		npu2_dump_scoms(flat_chip_id);
+		phb->ops->dump_debug_data(flat_chip_id);
 		prlog(PR_ERR, " _________________________ \n");
 		prlog(PR_ERR, "<    It's Debug time!     >\n");
 		prlog(PR_ERR, " ------------------------- \n");
@@ -935,6 +936,13 @@  static void find_npu_checkstop_reason(int flat_chip_id,
 	/* The HMI is "recoverable" because it shouldn't crash the system */
 	queue_hmi_event(hmi_evt, 1, out_flags);
 }
+#else
+static void find_npu_checkstop_reason(int flat_chip_id __unused,
+				      struct OpalHMIEvent *hmi_evt __unused,
+				      uint64_t *out_flags __unused)
+{
+}
+#endif
 
 static void decode_malfunction(struct OpalHMIEvent *hmi_evt, uint64_t *out_flags)
 {
diff --git a/core/platform.c b/core/platform.c
index 320fdea03..3f4c8bdd5 100644
--- a/core/platform.c
+++ b/core/platform.c
@@ -226,7 +226,6 @@  static struct platform generic_platform = {
 	.start_preload_resource	= generic_start_preload_resource,
 	.resource_loaded	= generic_resource_loaded,
 	.ocapi		= &generic_ocapi,
-	.npu2_device_detect = npu2_i2c_presence_detect, /* Assumes ZZ */
 };
 
 const struct bmc_platform *bmc_platform = &generic_bmc;
diff --git a/hw/Makefile.inc b/hw/Makefile.inc
index ff207b166..627b1a022 100644
--- a/hw/Makefile.inc
+++ b/hw/Makefile.inc
@@ -5,15 +5,21 @@  HW_OBJS += homer.o slw.o occ.o fsi-master.o centaur.o imc.o
 HW_OBJS += nx.o nx-rng.o nx-crypto.o nx-compress.o nx-842.o nx-gzip.o
 HW_OBJS += sfc-ctrl.o fake-rtc.o bt.o p8-i2c.o prd.o
 HW_OBJS += dts.o lpc-rtc.o xive.o phb4.o
-HW_OBJS += fake-nvram.o lpc-mbox.o npu2.o npu2-hw-procedures.o
-HW_OBJS += npu2-common.o npu2-opencapi.o phys-map.o sbe-p9.o capp.o
-HW_OBJS += occ-sensor.o vas.o sbe-p8.o dio-p9.o lpc-port80h.o cache-p9.o
+HW_OBJS += fake-nvram.o lpc-mbox.o
+ifeq ($(CONFIG_NPU),1)
+HW_OBJS += npu2.o npu2-hw-procedures.o
+HW_OBJS += npu2-common.o npu2-opencapi.o
 HW_OBJS += npu-opal.o npu3.o npu3-nvlink.o npu3-hw-procedures.o
+endif
+HW_OBJS += phys-map.o sbe-p9.o capp.o
+HW_OBJS += occ-sensor.o vas.o sbe-p8.o dio-p9.o lpc-port80h.o cache-p9.o
 HW_OBJS += ocmb.o xive2.o
 ifeq ($(CONFIG_P8),1)
 HW_OBJS += phb3.o
+ifeq ($(CONFIG_NPU),1)
 HW_OBJS += npu.o npu-hw-procedures.o
 endif
+endif
 HW=hw/built-in.a
 
 include $(SRC)/hw/fsp/Makefile.inc
diff --git a/hw/npu2.c b/hw/npu2.c
index cf57eeb0c..e18a1b7b1 100644
--- a/hw/npu2.c
+++ b/hw/npu2.c
@@ -1316,6 +1316,7 @@  static const struct phb_ops npu_ops = {
 	.set_capi_mode		= NULL,
 	.set_capp_recovery	= NULL,
 	.tce_kill		= npu2_tce_kill,
+	.dump_debug_data	= npu2_dump_scoms,
 };
 
 static void assign_mmio_bars(uint64_t gcid, uint32_t scom, uint64_t reg[2], uint64_t mm_win[2])
diff --git a/include/npu2.h b/include/npu2.h
index eb7c45587..6ab33c702 100644
--- a/include/npu2.h
+++ b/include/npu2.h
@@ -212,7 +212,13 @@  static inline struct phb *npu2_dev_to_phb(struct npu2_dev *ndev)
 	}
 }
 
+#ifdef CONFIG_NPU
 void npu2_i2c_presence_detect(struct npu2 *npu);
+#else
+static inline void npu2_i2c_presence_detect(struct npu2 *npu __unused)
+{
+}
+#endif
 int npu2_opencapi_init_npu(struct npu2 *npu);
 int npu2_nvlink_init_npu(struct npu2 *npu);
 void npu2_nvlink_create_phb(struct npu2 *npu, struct dt_node *dn);
diff --git a/include/pci.h b/include/pci.h
index 05d02171b..c70a507dc 100644
--- a/include/pci.h
+++ b/include/pci.h
@@ -343,6 +343,9 @@  struct phb_ops {
 
 	/* Currently only used by NPU HMI code */
 	void (*set_fence_state)(struct phb *phb, bool fence);
+
+	/* The most terrible of situtions, dump debug data to console. */
+	void (*dump_debug_data)(int flat_chip_id);
 };
 
 enum phb_type {
diff --git a/platforms/astbmc/Makefile.inc b/platforms/astbmc/Makefile.inc
index 1cdf37f2a..be2267d3f 100644
--- a/platforms/astbmc/Makefile.inc
+++ b/platforms/astbmc/Makefile.inc
@@ -1,16 +1,23 @@ 
 SUBDIRS += $(PLATDIR)/astbmc
 
 ASTBMC_OBJS = pnor.o common.o slots.o \
-	      witherspoon.o zaius.o romulus.o p9dsu.o \
-	      nicole.o mihawk.o mowgli.o \
+	      witherspoon.o romulus.o p9dsu.o \
+	      nicole.o mowgli.o \
 	      talos.o blackbird.o \
-	      swift.o rainier.o
+	      rainier.o
+
+ifeq ($(CONFIG_NPU),1)
+ASTBMC_OBJS += zaius.o mihawk.o swift.o
+endif
 
 ifeq ($(CONFIG_P8),1)
 ASTBMC_OBJS += palmetto.o habanero.o firestone.o \
 	      p8dtu.o p8dnu.o \
-	      garrison.o barreleye.o \
+	      barreleye.o \
 	      vesnin.o
+ifeq ($(CONFIG_NPU),1)
+ASTBMC_OBJS += garrison.o
+endif
 endif
 
 ASTBMC = $(PLATDIR)/astbmc/built-in.a