diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile
index bd43a5887..3af244582 100644
--- a/drivers/gpu/nvgpu/Makefile
+++ b/drivers/gpu/nvgpu/Makefile
@@ -41,6 +41,7 @@ ccflags-y += -DCONFIG_NVGPU_CHANNEL_TSG_CONTROL
 ccflags-y += -DCONFIG_NVGPU_POWER_PG
 ccflags-y += -DCONFIG_NVGPU_CE
 ccflags-y += -DCONFIG_NVGPU_COMPRESSION
+ccflags-y += -DCONFIG_NVGPU_SIM
 
 ifeq ($(CONFIG_NVGPU_LOGGING),y)
 ccflags-y += -DCONFIG_NVGPU_LOGGING=1
diff --git a/drivers/gpu/nvgpu/Makefile.shared.configs b/drivers/gpu/nvgpu/Makefile.shared.configs
index 11782d463..79a482e34 100644
--- a/drivers/gpu/nvgpu/Makefile.shared.configs
+++ b/drivers/gpu/nvgpu/Makefile.shared.configs
@@ -147,5 +147,9 @@ NVGPU_COMMON_CFLAGS             += -DCONFIG_NVGPU_LS_PMU
 CONFIG_NVGPU_POWER_PG           := 1
 NVGPU_COMMON_CFLAGS             += -DCONFIG_NVGPU_POWER_PG
 
+# Enable sim support for normal build
+CONFIG_NVGPU_SIM                := 1
+NVGPU_COMMON_CFLAGS             += -DCONFIG_NVGPU_SIM
+
 endif
 endif
diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources
index 49f55652b..46325deb2 100644
--- a/drivers/gpu/nvgpu/Makefile.sources
+++ b/drivers/gpu/nvgpu/Makefile.sources
@@ -36,7 +36,6 @@ srcs +=	os/posix/nvgpu.c \
 	os/posix/posix-channel.c \
 	os/posix/posix-tsg.c \
 	os/posix/stubs.c \
-	os/posix/posix-sim.c \
 	os/posix/posix-nvhost.c \
 	os/posix/posix-vgpu.c \
 	os/posix/posix-dt.c \
@@ -57,6 +56,10 @@ endif
 ifeq ($(CONFIG_NVGPU_LOGGING),1)
 srcs += os/posix/log.c
 endif
+
+ifeq ($(CONFIG_NVGPU_SIM),1)
+srcs += os/posix/posix-sim.c
+endif
 endif
 
 # POSIX sources shared between the POSIX and QNX builds.
@@ -75,9 +78,6 @@ srcs += common/utils/enabled.c \
 	common/utils/rbtree.c \
 	common/utils/string.c \
 	common/utils/worker.c \
-	common/sim/sim.c \
-	common/sim/sim_pci.c \
-	common/sim/sim_netlist.c \
 	common/init/nvgpu_init.c \
 	common/mm/allocators/nvgpu_allocator.c \
 	common/mm/allocators/bitmap_allocator.c \
@@ -551,3 +551,9 @@ ifeq ($(CONFIG_NVGPU_COMPRESSION),1)
 srcs +=	hal/cbc/cbc_tu104.c
 endif
 endif
+
+ifeq ($(CONFIG_NVGPU_SIM),1)
+srcs += common/sim/sim.c \
+	common/sim/sim_pci.c \
+	common/sim/sim_netlist.c
+endif
diff --git a/drivers/gpu/nvgpu/common/acr/acr.c b/drivers/gpu/nvgpu/common/acr/acr.c
index 38bc6337b..c4ec8c92e 100644
--- a/drivers/gpu/nvgpu/common/acr/acr.c
+++ b/drivers/gpu/nvgpu/common/acr/acr.c
@@ -41,7 +41,13 @@
 bool nvgpu_acr_is_lsf_lazy_bootstrap(struct gk20a *g, struct nvgpu_acr *acr,
 	u32 falcon_id)
 {
-	if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL) || acr == NULL) {
+#ifdef CONFIG_NVGPU_SIM
+	if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) {
+		return false;
+	}
+#endif
+
+	if (acr == NULL) {
 		return false;
 	}
 
@@ -51,9 +57,11 @@ bool nvgpu_acr_is_lsf_lazy_bootstrap(struct gk20a *g, struct nvgpu_acr *acr,
 int nvgpu_acr_alloc_blob_prerequisite(struct gk20a *g, struct nvgpu_acr *acr,
 	size_t size)
 {
+#ifdef CONFIG_NVGPU_SIM
 	if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) {
 		return 0;
 	}
+#endif
 
 	if (acr == NULL) {
 		return -EINVAL;
@@ -67,9 +75,11 @@ int nvgpu_acr_bootstrap_hs_acr(struct gk20a *g, struct nvgpu_acr *acr)
 {
 	int err = 0;
 
+#ifdef CONFIG_NVGPU_SIM
 	if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) {
 		return 0;
 	}
+#endif
 
 	if (acr == NULL) {
 		return -EINVAL;
@@ -87,10 +97,11 @@ int nvgpu_acr_construct_execute(struct gk20a *g, struct nvgpu_acr *acr)
 {
 	int err = 0;
 
+#ifdef CONFIG_NVGPU_SIM
 	if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) {
 		return 0;
 	}
-
+#endif
 	if (acr == NULL) {
 		return -EINVAL;
 	}
@@ -117,9 +128,11 @@ int nvgpu_acr_init(struct gk20a *g, struct nvgpu_acr **acr)
 					g->params.gpu_impl);
 	int err = 0;
 
+#ifdef CONFIG_NVGPU_SIM
 	if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) {
 		goto done;
 	}
+#endif
 
 	if (*acr != NULL) {
 		/*
diff --git a/drivers/gpu/nvgpu/common/gr/gr_falcon.c b/drivers/gpu/nvgpu/common/gr/gr_falcon.c
index 7745eda08..10ed4e83b 100644
--- a/drivers/gpu/nvgpu/common/gr/gr_falcon.c
+++ b/drivers/gpu/nvgpu/common/gr/gr_falcon.c
@@ -503,9 +503,11 @@ int nvgpu_gr_falcon_load_ctxsw_ucode(struct gk20a *g,
 
 	nvgpu_log_fn(g, " ");
 
+#ifdef CONFIG_NVGPU_SIM
 	if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) {
 		g->ops.gr.falcon.configure_fmodel(g);
 	}
+#endif
 
 	/*
 	 * In case bootloader is not supported, revert to the old way of
@@ -551,9 +553,11 @@ int nvgpu_gr_falcon_load_secure_ctxsw_ucode(struct gk20a *g,
 
 	nvgpu_log_fn(g, " ");
 
+#ifdef CONFIG_NVGPU_SIM
 	if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) {
 		g->ops.gr.falcon.configure_fmodel(g);
 	}
+#endif
 
 	if (nvgpu_is_enabled(g, NVGPU_PMU_FECS_BOOTSTRAP_DONE)) {
 		/* this must be recovery so bootstrap fecs and gpccs */
diff --git a/drivers/gpu/nvgpu/common/mm/vidmem.c b/drivers/gpu/nvgpu/common/mm/vidmem.c
index 8ca95c445..a4fcdd204 100644
--- a/drivers/gpu/nvgpu/common/mm/vidmem.c
+++ b/drivers/gpu/nvgpu/common/mm/vidmem.c
@@ -333,9 +333,11 @@ int nvgpu_vidmem_init(struct mm_gk20a *mm)
 
 	vidmem_dbg(g, "init begin");
 
+#ifdef CONFIG_NVGPU_SIM
 	if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) {
 		bootstrap_size = SZ_32M;
 	}
+#endif
 
 	bootstrap_co.base = size - bootstrap_size;
 	bootstrap_co.length = bootstrap_size;
diff --git a/drivers/gpu/nvgpu/common/netlist/netlist.c b/drivers/gpu/nvgpu/common/netlist/netlist.c
index 2ee5a6c74..f1d13a072 100644
--- a/drivers/gpu/nvgpu/common/netlist/netlist.c
+++ b/drivers/gpu/nvgpu/common/netlist/netlist.c
@@ -535,9 +535,12 @@ int nvgpu_netlist_init_ctx_vars(struct gk20a *g)
 		return -ENOMEM;
 	}
 
+#ifdef CONFIG_NVGPU_SIM
 	if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) {
 		return nvgpu_init_sim_netlist_ctx_vars(g);
-	} else {
+	} else
+#endif
+	{
 		return nvgpu_netlist_init_ctx_vars_fw(g);
 	}
 }
diff --git a/drivers/gpu/nvgpu/common/pmu/lsfm/lsfm.c b/drivers/gpu/nvgpu/common/pmu/lsfm/lsfm.c
index 9a531c826..d8e5052ea 100644
--- a/drivers/gpu/nvgpu/common/pmu/lsfm/lsfm.c
+++ b/drivers/gpu/nvgpu/common/pmu/lsfm/lsfm.c
@@ -37,9 +37,14 @@
 static bool is_lsfm_supported(struct gk20a *g,
 	struct nvgpu_pmu *pmu, struct nvgpu_pmu_lsfm *lsfm)
 {
+#ifdef CONFIG_NVGPU_SIM
 	if (nvgpu_is_enabled(g, NVGPU_SEC_PRIVSECURITY) &&
 			!nvgpu_is_enabled(g, NVGPU_IS_FMODEL) &&
 			(lsfm != NULL)) {
+#else
+	if (nvgpu_is_enabled(g, NVGPU_SEC_PRIVSECURITY) &&
+			(lsfm != NULL)) {
+#endif
 		return true;
 	}
 
@@ -126,8 +131,12 @@ int nvgpu_pmu_lsfm_init(struct gk20a *g, struct nvgpu_pmu_lsfm **lsfm)
 	u32 ver = g->params.gpu_arch + g->params.gpu_impl;
 	int err = 0;
 
-	if (!nvgpu_is_enabled(g, NVGPU_SEC_PRIVSECURITY) ||
-		nvgpu_is_enabled(g, NVGPU_IS_FMODEL)){
+#ifdef CONFIG_NVGPU_SIM
+	if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) {
+		return 0;
+	}
+#endif
+	if (!nvgpu_is_enabled(g, NVGPU_SEC_PRIVSECURITY)) {
 		return 0;
 	}
 
diff --git a/drivers/gpu/nvgpu/common/vbios/bios.c b/drivers/gpu/nvgpu/common/vbios/bios.c
index d729761a3..ca4ad4257 100644
--- a/drivers/gpu/nvgpu/common/vbios/bios.c
+++ b/drivers/gpu/nvgpu/common/vbios/bios.c
@@ -157,9 +157,11 @@ int nvgpu_bios_sw_init(struct gk20a *g,
 	u32 ver = nvgpu_safe_add_u32(g->params.gpu_arch, g->params.gpu_impl);
 	int err = 0;
 
+#ifdef CONFIG_NVGPU_SIM
 	if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) {
 		goto done;
 	}
+#endif
 
 	if (nvgpu_bios_check_dgpu(g, ver) == false) {
 		goto done;
diff --git a/drivers/gpu/nvgpu/common/vbios/bios_sw_tu104.c b/drivers/gpu/nvgpu/common/vbios/bios_sw_tu104.c
index 101a1f969..278a5e00c 100644
--- a/drivers/gpu/nvgpu/common/vbios/bios_sw_tu104.c
+++ b/drivers/gpu/nvgpu/common/vbios/bios_sw_tu104.c
@@ -67,9 +67,11 @@ int tu104_bios_verify_devinit(struct gk20a *g)
 
 int tu104_bios_init(struct gk20a *g)
 {
+#ifdef CONFIG_NVGPU_SIM
 	if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) {
 		return 0;
 	}
+#endif
 
 	return gv100_bios_init(g);
 }
diff --git a/drivers/gpu/nvgpu/hal/cbc/cbc_gm20b.c b/drivers/gpu/nvgpu/hal/cbc/cbc_gm20b.c
index 747e3570a..085ce7843 100644
--- a/drivers/gpu/nvgpu/hal/cbc/cbc_gm20b.c
+++ b/drivers/gpu/nvgpu/hal/cbc/cbc_gm20b.c
@@ -238,10 +238,13 @@ void gm20b_cbc_init(struct gk20a *g, struct nvgpu_cbc *cbc)
 	u64 compbit_store_iova;
 	u64 compbit_base_post_divide64;
 
+#ifdef CONFIG_NVGPU_SIM
 	if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) {
 		compbit_store_iova = nvgpu_mem_get_phys_addr(g,
 						&cbc->compbit_store.mem);
-	} else {
+	} else
+#endif
+	{
 		compbit_store_iova = nvgpu_mem_get_addr(g,
 						&cbc->compbit_store.mem);
 	}
diff --git a/drivers/gpu/nvgpu/hal/fb/fb_gv11b.c b/drivers/gpu/nvgpu/hal/fb/fb_gv11b.c
index 5dac1471d..ca28dd4b1 100644
--- a/drivers/gpu/nvgpu/hal/fb/fb_gv11b.c
+++ b/drivers/gpu/nvgpu/hal/fb/fb_gv11b.c
@@ -125,10 +125,13 @@ void gv11b_fb_cbc_configure(struct gk20a *g, struct nvgpu_cbc *cbc)
 	u64 compbit_store_iova;
 	u64 compbit_base_post_divide64;
 
+#ifdef CONFIG_NVGPU_SIM
 	if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) {
 		compbit_store_iova = nvgpu_mem_get_phys_addr(g,
 						&cbc->compbit_store.mem);
-	} else {
+	} else
+#endif
+	{
 		compbit_store_iova = nvgpu_mem_get_addr(g,
 						&cbc->compbit_store.mem);
 	}
diff --git a/drivers/gpu/nvgpu/hal/fb/fb_tu104.c b/drivers/gpu/nvgpu/hal/fb/fb_tu104.c
index bda67e7f4..ce737fe4e 100644
--- a/drivers/gpu/nvgpu/hal/fb/fb_tu104.c
+++ b/drivers/gpu/nvgpu/hal/fb/fb_tu104.c
@@ -264,10 +264,12 @@ size_t tu104_fb_get_vidmem_size(struct gk20a *g)
 	u32 ecc = fb_mmu_local_memory_range_ecc_mode_v(range);
 	size_t bytes = ((size_t)mag << scale) * SZ_1M;
 
+#ifdef CONFIG_NVGPU_SIM
 	if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL) && (bytes == 0)) {
 		/* 192 MB */
 		bytes = 192*1024*1024;
 	}
+#endif
 
 	if (ecc != 0U) {
 		bytes = bytes / 16U * 15U;
diff --git a/drivers/gpu/nvgpu/hal/fuse/fuse_gm20b.c b/drivers/gpu/nvgpu/hal/fuse/fuse_gm20b.c
index ff0decc8f..47c4a1fec 100644
--- a/drivers/gpu/nvgpu/hal/fuse/fuse_gm20b.c
+++ b/drivers/gpu/nvgpu/hal/fuse/fuse_gm20b.c
@@ -38,12 +38,14 @@ int gm20b_fuse_check_priv_security(struct gk20a *g)
 	bool is_wpr_enabled = false;
 	bool is_auto_fetch_disable = false;
 
+#ifdef CONFIG_NVGPU_SIM
 	if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) {
 		nvgpu_set_enabled(g, NVGPU_SEC_PRIVSECURITY, true);
 		nvgpu_set_enabled(g, NVGPU_SEC_SECUREGPCCS, false);
 		nvgpu_log(g, gpu_dbg_info, "priv sec is enabled in fmodel");
 		return 0;
 	}
+#endif
 
 	if (g->ops.fuse.read_gcplex_config_fuse(g, &gcplex_config) != 0) {
 		nvgpu_err(g, "err reading gcplex config fuse, check fuse clk");
diff --git a/drivers/gpu/nvgpu/hal/fuse/fuse_gp10b.c b/drivers/gpu/nvgpu/hal/fuse/fuse_gp10b.c
index 1b0a132e0..f87b8b54f 100644
--- a/drivers/gpu/nvgpu/hal/fuse/fuse_gp10b.c
+++ b/drivers/gpu/nvgpu/hal/fuse/fuse_gp10b.c
@@ -39,12 +39,14 @@ int gp10b_fuse_check_priv_security(struct gk20a *g)
 	bool is_wpr_enabled = false;
 	bool is_auto_fetch_disable = false;
 
+#ifdef CONFIG_NVGPU_SIM
 	if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) {
 		nvgpu_set_enabled(g, NVGPU_SEC_PRIVSECURITY, false);
 		nvgpu_set_enabled(g, NVGPU_SEC_SECUREGPCCS, false);
 		nvgpu_log(g, gpu_dbg_info, "priv sec is disabled in fmodel");
 		return 0;
 	}
+#endif
 
 	if (g->ops.fuse.read_gcplex_config_fuse(g, &gcplex_config) != 0) {
 		nvgpu_err(g, "err reading gcplex config fuse, check fuse clk");
diff --git a/drivers/gpu/nvgpu/hal/gr/falcon/gr_falcon_gm20b.c b/drivers/gpu/nvgpu/hal/gr/falcon/gr_falcon_gm20b.c
index 92af09e53..c23862b98 100644
--- a/drivers/gpu/nvgpu/hal/gr/falcon/gr_falcon_gm20b.c
+++ b/drivers/gpu/nvgpu/hal/gr/falcon/gr_falcon_gm20b.c
@@ -179,6 +179,7 @@ u32 gm20b_gr_falcon_get_gpccs_start_reg_offset(void)
 	return (gr_gpcs_gpccs_falcon_hwcfg_r() - gr_fecs_falcon_hwcfg_r());
 }
 
+#ifdef CONFIG_NVGPU_SIM
 void gm20b_gr_falcon_configure_fmodel(struct gk20a *g)
 {
 	nvgpu_log_fn(g, " ");
@@ -189,6 +190,7 @@ void gm20b_gr_falcon_configure_fmodel(struct gk20a *g)
 		gr_gpccs_ctxsw_mailbox_value_f(0xc0de7777U));
 
 }
+#endif
 
 void gm20b_gr_falcon_start_ucode(struct gk20a *g)
 {
diff --git a/drivers/gpu/nvgpu/hal/gr/falcon/gr_falcon_gm20b.h b/drivers/gpu/nvgpu/hal/gr/falcon/gr_falcon_gm20b.h
index 157d3e251..9c04ba72b 100644
--- a/drivers/gpu/nvgpu/hal/gr/falcon/gr_falcon_gm20b.h
+++ b/drivers/gpu/nvgpu/hal/gr/falcon/gr_falcon_gm20b.h
@@ -47,7 +47,9 @@ void gm20b_gr_falcon_load_gpccs_imem(struct gk20a *g,
 			const u32 *ucode_u32_data, u32 ucode_u32_size);
 void gm20b_gr_falcon_load_fecs_imem(struct gk20a *g,
 			const u32 *ucode_u32_data, u32 ucode_u32_size);
+#ifdef CONFIG_NVGPU_SIM
 void gm20b_gr_falcon_configure_fmodel(struct gk20a *g);
+#endif
 void gm20b_gr_falcon_start_ucode(struct gk20a *g);
 void gm20b_gr_falcon_start_gpccs(struct gk20a *g);
 void gm20b_gr_falcon_start_fecs(struct gk20a *g);
diff --git a/drivers/gpu/nvgpu/hal/gr/init/gr_init_gm20b.c b/drivers/gpu/nvgpu/hal/gr/init/gr_init_gm20b.c
index 18398b641..f83c6f82a 100644
--- a/drivers/gpu/nvgpu/hal/gr/init/gr_init_gm20b.c
+++ b/drivers/gpu/nvgpu/hal/gr/init/gr_init_gm20b.c
@@ -593,9 +593,11 @@ int gm20b_gr_init_wait_fe_idle(struct gk20a *g)
 	struct nvgpu_timeout timeout;
 	int err = 0;
 
+#ifdef CONFIG_NVGPU_SIM
 	if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) {
 		return 0;
 	}
+#endif
 
 	nvgpu_log_fn(g, " ");
 
@@ -628,9 +630,11 @@ int gm20b_gr_init_fe_pwr_mode_force_on(struct gk20a *g, bool force_on)
 	int ret = 0;
 	u32 reg_val;
 
+#ifdef CONFIG_NVGPU_SIM
 	if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) {
 		return 0;
 	}
+#endif
 
 	if (force_on) {
 		reg_val = gr_fe_pwr_mode_req_send_f() |
diff --git a/drivers/gpu/nvgpu/hal/init/hal_gm20b.c b/drivers/gpu/nvgpu/hal/init/hal_gm20b.c
index d262eac64..2c8732231 100644
--- a/drivers/gpu/nvgpu/hal/init/hal_gm20b.c
+++ b/drivers/gpu/nvgpu/hal/init/hal_gm20b.c
@@ -478,7 +478,9 @@ static const struct gpu_ops gm20b_ops = {
 			.load_fecs_dmem = gm20b_gr_falcon_load_fecs_dmem,
 			.load_gpccs_imem = gm20b_gr_falcon_load_gpccs_imem,
 			.load_fecs_imem = gm20b_gr_falcon_load_fecs_imem,
+#ifdef CONFIG_NVGPU_SIM
 			.configure_fmodel = gm20b_gr_falcon_configure_fmodel,
+#endif
 			.start_ucode = gm20b_gr_falcon_start_ucode,
 			.start_gpccs = gm20b_gr_falcon_start_gpccs,
 			.start_fecs = gm20b_gr_falcon_start_fecs,
diff --git a/drivers/gpu/nvgpu/hal/init/hal_gp10b.c b/drivers/gpu/nvgpu/hal/init/hal_gp10b.c
index f99bab979..972de6c15 100644
--- a/drivers/gpu/nvgpu/hal/init/hal_gp10b.c
+++ b/drivers/gpu/nvgpu/hal/init/hal_gp10b.c
@@ -547,7 +547,9 @@ static const struct gpu_ops gp10b_ops = {
 			.load_fecs_dmem = gm20b_gr_falcon_load_fecs_dmem,
 			.load_gpccs_imem = gm20b_gr_falcon_load_gpccs_imem,
 			.load_fecs_imem = gm20b_gr_falcon_load_fecs_imem,
+#ifdef CONFIG_NVGPU_SIM
 			.configure_fmodel = gm20b_gr_falcon_configure_fmodel,
+#endif
 			.start_ucode = gm20b_gr_falcon_start_ucode,
 			.start_gpccs = gm20b_gr_falcon_start_gpccs,
 			.start_fecs = gm20b_gr_falcon_start_fecs,
diff --git a/drivers/gpu/nvgpu/hal/init/hal_gv11b.c b/drivers/gpu/nvgpu/hal/init/hal_gv11b.c
index 2c738cf80..fb087e214 100644
--- a/drivers/gpu/nvgpu/hal/init/hal_gv11b.c
+++ b/drivers/gpu/nvgpu/hal/init/hal_gv11b.c
@@ -651,7 +651,9 @@ static const struct gpu_ops gv11b_ops = {
 			.load_fecs_dmem = gm20b_gr_falcon_load_fecs_dmem,
 			.load_gpccs_imem = gm20b_gr_falcon_load_gpccs_imem,
 			.load_fecs_imem = gm20b_gr_falcon_load_fecs_imem,
+#ifdef CONFIG_NVGPU_SIM
 			.configure_fmodel = gm20b_gr_falcon_configure_fmodel,
+#endif
 			.start_ucode = gm20b_gr_falcon_start_ucode,
 			.start_gpccs = gm20b_gr_falcon_start_gpccs,
 			.start_fecs = gm20b_gr_falcon_start_fecs,
diff --git a/drivers/gpu/nvgpu/hal/init/hal_tu104.c b/drivers/gpu/nvgpu/hal/init/hal_tu104.c
index 09288d451..90b248bc4 100644
--- a/drivers/gpu/nvgpu/hal/init/hal_tu104.c
+++ b/drivers/gpu/nvgpu/hal/init/hal_tu104.c
@@ -689,7 +689,9 @@ static const struct gpu_ops tu104_ops = {
 			.load_fecs_dmem = gm20b_gr_falcon_load_fecs_dmem,
 			.load_gpccs_imem = gm20b_gr_falcon_load_gpccs_imem,
 			.load_fecs_imem = gm20b_gr_falcon_load_fecs_imem,
+#ifdef CONFIG_NVGPU_SIM
 			.configure_fmodel = gm20b_gr_falcon_configure_fmodel,
+#endif
 			.start_ucode = gm20b_gr_falcon_start_ucode,
 			.start_gpccs = gm20b_gr_falcon_start_gpccs,
 			.start_fecs = gm20b_gr_falcon_start_fecs,
@@ -1529,6 +1531,7 @@ int tu104_init_hal(struct gk20a *g)
 	nvgpu_pramin_ops_init(g);
 
 	/* dGpu VDK support */
+#ifdef CONFIG_NVGPU_SIM
 	if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)){
 		/* Disable compression */
 #ifdef CONFIG_NVGPU_COMPRESSION
@@ -1552,7 +1555,9 @@ int tu104_init_hal(struct gk20a *g)
 		gops->clk_arb.get_arbiter_clk_domains = NULL;
 		gops->clk.support_clk_freq_controller = false;
 
-	} else {
+	} else
+#endif
+	{
 		nvgpu_set_enabled(g, NVGPU_PMU_PSTATE, true);
 		nvgpu_set_enabled(g, NVGPU_GR_USE_DMA_FOR_FW_BOOTSTRAP, true);
 	}
diff --git a/drivers/gpu/nvgpu/hal/pmu/pmu_tu104.c b/drivers/gpu/nvgpu/hal/pmu/pmu_tu104.c
index 699acb947..0ff9547a2 100644
--- a/drivers/gpu/nvgpu/hal/pmu/pmu_tu104.c
+++ b/drivers/gpu/nvgpu/hal/pmu/pmu_tu104.c
@@ -28,10 +28,13 @@
 
 bool tu104_is_pmu_supported(struct gk20a *g)
 {
+#ifdef CONFIG_NVGPU_SIM
 	/* PMU not supported in dGpu Simulation */
 	if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) {
 		return false;
-	} else {
+	} else
+#endif
+	{
 		return true;
 	}
 }
diff --git a/drivers/gpu/nvgpu/hal/priv_ring/priv_ring_gm20b.c b/drivers/gpu/nvgpu/hal/priv_ring/priv_ring_gm20b.c
index 269254a07..fb4293989 100644
--- a/drivers/gpu/nvgpu/hal/priv_ring/priv_ring_gm20b.c
+++ b/drivers/gpu/nvgpu/hal/priv_ring/priv_ring_gm20b.c
@@ -38,10 +38,12 @@
 
 void gm20b_priv_ring_enable(struct gk20a *g)
 {
+#ifdef CONFIG_NVGPU_SIM
 	if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) {
 		nvgpu_log_info(g, "priv ring is already enabled");
 		return;
 	}
+#endif
 
 	nvgpu_log_info(g, "enabling priv ring");
 
@@ -63,10 +65,12 @@ void gm20b_priv_ring_isr(struct gk20a *g)
 	u32 gpc_priv_stride;
 	u32 gpc_offset;
 
+#ifdef CONFIG_NVGPU_SIM
 	if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) {
 		nvgpu_err(g, "unhandled priv ring intr");
 		return;
 	}
+#endif
 
 	status0 = nvgpu_readl(g, pri_ringmaster_intr_status0_r());
 	status1 = nvgpu_readl(g, pri_ringmaster_intr_status1_r());
diff --git a/drivers/gpu/nvgpu/hal/priv_ring/priv_ring_gp10b.c b/drivers/gpu/nvgpu/hal/priv_ring/priv_ring_gp10b.c
index b2d21aaaa..c113e0152 100644
--- a/drivers/gpu/nvgpu/hal/priv_ring/priv_ring_gp10b.c
+++ b/drivers/gpu/nvgpu/hal/priv_ring/priv_ring_gp10b.c
@@ -116,10 +116,12 @@ void gp10b_priv_ring_isr(struct gk20a *g)
 	u32 error_info;
 	u32 error_code;
 
+#ifdef CONFIG_NVGPU_SIM
 	if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) {
 		nvgpu_info(g, "unhandled priv ring intr");
 		return;
 	}
+#endif
 
 	status0 = nvgpu_readl(g, pri_ringmaster_intr_status0_r());
 	status1 = nvgpu_readl(g, pri_ringmaster_intr_status1_r());
diff --git a/drivers/gpu/nvgpu/hal/therm/therm_gm20b.c b/drivers/gpu/nvgpu/hal/therm/therm_gm20b.c
index 6a24dbeed..5af5f5443 100644
--- a/drivers/gpu/nvgpu/hal/therm/therm_gm20b.c
+++ b/drivers/gpu/nvgpu/hal/therm/therm_gm20b.c
@@ -95,11 +95,13 @@ int gm20b_elcg_init_idle_filters(struct gk20a *g)
 		active_engine_id = f->active_engines_list[engine_id];
 		gate_ctrl = nvgpu_readl(g, therm_gate_ctrl_r(active_engine_id));
 
+#ifdef CONFIG_NVGPU_SIM
 		if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) {
 			gate_ctrl = set_field(gate_ctrl,
 				therm_gate_ctrl_eng_delay_after_m(),
 				therm_gate_ctrl_eng_delay_after_f(4));
 		}
+#endif
 
 		/* 2 * (1 << 9) = 1024 clks */
 		gate_ctrl = set_field(gate_ctrl,
diff --git a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
index ea043dc65..4a62ab2c2 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
@@ -544,7 +544,9 @@ struct gpu_ops {
 					const u32 *ucode_u32_data, u32 size);
 			void (*load_fecs_imem)(struct gk20a *g,
 					const u32 *ucode_u32_data, u32 size);
+#ifdef CONFIG_NVGPU_SIM
 			void (*configure_fmodel)(struct gk20a *g);
+#endif
 			void (*start_ucode)(struct gk20a *g);
 			void (*start_gpccs)(struct gk20a *g);
 			void (*start_fecs)(struct gk20a *g);
@@ -1895,7 +1897,9 @@ struct gk20a {
 	struct nvgpu_nvlink_dev nvlink;
 	struct nvgpu_gr *gr;
 	struct nvgpu_fbp *fbp;
+#ifdef CONFIG_NVGPU_SIM
 	struct sim_nvgpu *sim;
+#endif
 	struct mm_gk20a mm;
 	struct nvgpu_pmu *pmu;
 	struct nvgpu_acr *acr;
diff --git a/drivers/gpu/nvgpu/include/nvgpu/sim.h b/drivers/gpu/nvgpu/include/nvgpu/sim.h
index e79b83658..bf4285b1d 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/sim.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/sim.h
@@ -22,6 +22,8 @@
 #ifndef NVGPU_SIM_H
 #define NVGPU_SIM_H
 
+#ifdef CONFIG_NVGPU_SIM
+
 #include <nvgpu/nvgpu_mem.h>
 
 struct gk20a;
@@ -58,4 +60,5 @@ void sim_writel(struct sim_nvgpu *sim, u32 r, u32 v);
 u32 sim_readl(struct sim_nvgpu *sim, u32 r);
 int nvgpu_init_sim_netlist_ctx_vars(struct gk20a *g);
 
+#endif
 #endif /* NVGPU_SIM_H */
diff --git a/userspace/required_tests.json b/userspace/required_tests.json
index 7fcec5795..a501ce050 100644
--- a/userspace/required_tests.json
+++ b/userspace/required_tests.json
@@ -389,11 +389,6 @@
         "test_level": 0,
         "unit": "fuse"
     },
-    {
-        "test": "fuse_gm20b_check_fmodel",
-        "test_level": 0,
-        "unit": "fuse"
-    },
     {
         "test": "fuse_gm20b_check_gcplex_fail",
         "test_level": 0,
@@ -424,11 +419,6 @@
         "test_level": 0,
         "unit": "fuse"
     },
-    {
-        "test": "fuse_gp10b_check_fmodel",
-        "test_level": 0,
-        "unit": "fuse"
-    },
     {
         "test": "fuse_gp10b_check_gcplex_fail",
         "test_level": 0,
diff --git a/userspace/units/fuse/nvgpu-fuse-gm20b.c b/userspace/units/fuse/nvgpu-fuse-gm20b.c
index e9facaf00..ad49c02f2 100644
--- a/userspace/units/fuse/nvgpu-fuse-gm20b.c
+++ b/userspace/units/fuse/nvgpu-fuse-gm20b.c
@@ -302,6 +302,7 @@ int test_fuse_gm20b_basic_fuses(struct unit_module *m,
 	return ret;
 }
 
+#ifdef CONFIG_NVGPU_SIM
 /* Verify when FMODEL is enabled, fuse module reports non-secure */
 int test_fuse_gm20b_check_fmodel(struct unit_module *m,
 				 struct gk20a *g, void *__args)
@@ -331,3 +332,4 @@ int test_fuse_gm20b_check_fmodel(struct unit_module *m,
 	nvgpu_set_enabled(g, NVGPU_IS_FMODEL, false);
 	return ret;
 }
+#endif
diff --git a/userspace/units/fuse/nvgpu-fuse-gm20b.h b/userspace/units/fuse/nvgpu-fuse-gm20b.h
index 1bc888108..6eff3d7ff 100644
--- a/userspace/units/fuse/nvgpu-fuse-gm20b.h
+++ b/userspace/units/fuse/nvgpu-fuse-gm20b.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2018-2019, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -39,7 +39,8 @@ int test_fuse_gm20b_check_non_sec(struct unit_module *m,
 				  struct gk20a *g, void *__args);
 int test_fuse_gm20b_basic_fuses(struct unit_module *m,
 				struct gk20a *g, void *__args);
+#ifdef CONFIG_NVGPU_SIM
 int test_fuse_gm20b_check_fmodel(struct unit_module *m,
 				 struct gk20a *g, void *__args);
-
+#endif
 #endif /* __UNIT_NVGPU_FUSE_GM20B_H__ */
diff --git a/userspace/units/fuse/nvgpu-fuse-gp10b.c b/userspace/units/fuse/nvgpu-fuse-gp10b.c
index 9a9018c03..9ac811ebd 100644
--- a/userspace/units/fuse/nvgpu-fuse-gp10b.c
+++ b/userspace/units/fuse/nvgpu-fuse-gp10b.c
@@ -235,6 +235,7 @@ int test_fuse_gp10b_feature_override_disable(struct unit_module *m,
 	return ret;
 }
 
+#ifdef CONFIG_NVGPU_SIM
 /* Verify when FMODEL is enabled, fuse module reports non-secure */
 int test_fuse_gp10b_check_fmodel(struct unit_module *m,
 				 struct gk20a *g, void *__args)
@@ -264,3 +265,4 @@ int test_fuse_gp10b_check_fmodel(struct unit_module *m,
 	nvgpu_set_enabled(g, NVGPU_IS_FMODEL, false);
 	return ret;
 }
+#endif
diff --git a/userspace/units/fuse/nvgpu-fuse-gp10b.h b/userspace/units/fuse/nvgpu-fuse-gp10b.h
index 781e5823b..ddddd95cc 100644
--- a/userspace/units/fuse/nvgpu-fuse-gp10b.h
+++ b/userspace/units/fuse/nvgpu-fuse-gp10b.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2018-2019, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -37,7 +37,8 @@ int test_fuse_gp10b_ecc(struct unit_module *m,
 			struct gk20a *g, void *__args);
 int test_fuse_gp10b_feature_override_disable(struct unit_module *m,
 					     struct gk20a *g, void *__args);
+#ifdef CONFIG_NVGPU_SIM
 int test_fuse_gp10b_check_fmodel(struct unit_module *m,
 				 struct gk20a *g, void *__args);
-
+#endif
 #endif /* __UNIT_NVGPU_FUSE_GP10B_H__ */
diff --git a/userspace/units/fuse/nvgpu-fuse.c b/userspace/units/fuse/nvgpu-fuse.c
index acbbffc82..6a675327c 100644
--- a/userspace/units/fuse/nvgpu-fuse.c
+++ b/userspace/units/fuse/nvgpu-fuse.c
@@ -158,7 +158,9 @@ struct unit_module_test fuse_tests[] = {
 	UNIT_TEST(fuse_gp10b_ecc, test_fuse_gp10b_ecc, NULL, 0),
 	UNIT_TEST(fuse_gp10b_feature_override_disable,
 		  test_fuse_gp10b_feature_override_disable, NULL, 0),
+#ifdef CONFIG_NVGPU_SIM
 	UNIT_TEST(fuse_gp10b_check_fmodel, test_fuse_gp10b_check_fmodel, NULL, 0),
+#endif
 	UNIT_TEST(fuse_gp10b_cleanup, test_fuse_device_common_cleanup,
 		  &gp10b_init_args, 0),
 
@@ -178,7 +180,9 @@ struct unit_module_test fuse_tests[] = {
 		  NULL,
 		  0),
 	UNIT_TEST(fuse_gm20b_basic_fuses, test_fuse_gm20b_basic_fuses, NULL, 0),
+#ifdef CONFIG_NVGPU_SIM
 	UNIT_TEST(fuse_gm20b_check_fmodel, test_fuse_gm20b_check_fmodel, NULL, 0),
+#endif
 	UNIT_TEST(fuse_gm20b_cleanup, test_fuse_device_common_cleanup,
 		  &gm20b_init_args, 0),