diff --git a/drivers/gpu/nvgpu/common/init/nvgpu_init.c b/drivers/gpu/nvgpu/common/init/nvgpu_init.c
index b7231d146..fc12dbb67 100644
--- a/drivers/gpu/nvgpu/common/init/nvgpu_init.c
+++ b/drivers/gpu/nvgpu/common/init/nvgpu_init.c
@@ -195,7 +195,7 @@ static int nvgpu_sw_quiesce_init_support(struct gk20a *g)
 	return 0;
 }
 
-void nvgpu_sw_quiesce(struct gk20a *g)
+void nvgpu_sw_quiesce_with_trace(struct gk20a *g, const char *fname, int line)
 {
 	if (g->is_virtual || (g->enabled_flags == NULL) ||
 		nvgpu_is_enabled(g, NVGPU_DISABLE_SW_QUIESCE)) {
@@ -209,11 +209,11 @@ void nvgpu_sw_quiesce(struct gk20a *g)
 	}
 
 	if (g->sw_quiesce_pending) {
-		nvgpu_err(g, "SW quiesce already pending");
+		nvgpu_err(g, "%s:%d SW quiesce already pending", fname, line);
 		return;
 	}
 
-	nvgpu_err(g, "SW quiesce requested");
+	nvgpu_err(g, "%s:%d SW quiesce requested", fname, line);
 
 	/*
 	 * When this flag is set, interrupt handlers should
diff --git a/drivers/gpu/nvgpu/include/nvgpu/nvgpu_init.h b/drivers/gpu/nvgpu/include/nvgpu/nvgpu_init.h
index c7afacde0..5507bb9ee 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/nvgpu_init.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/nvgpu_init.h
@@ -164,7 +164,9 @@ int nvgpu_prepare_poweroff(struct gk20a *g);
  * still ring doorbell, but this will not trigger any work on
  * engines since fifo scheduling is disabled.
  */
-void nvgpu_sw_quiesce(struct gk20a *g);
+void nvgpu_sw_quiesce_with_trace(struct gk20a *g, const char *fname, int line);
+#define nvgpu_sw_quiesce(g)	\
+	nvgpu_sw_quiesce_with_trace(g, __func__, __LINE__)
 
 /**
  * @brief Cleanup SW Quiesce state
diff --git a/libs/dgpu/libnvgpu-drv-dgpu_safe.export b/libs/dgpu/libnvgpu-drv-dgpu_safe.export
index 766cd223b..f2738d415 100644
--- a/libs/dgpu/libnvgpu-drv-dgpu_safe.export
+++ b/libs/dgpu/libnvgpu-drv-dgpu_safe.export
@@ -721,7 +721,7 @@ nvgpu_spinlock_acquire
 nvgpu_spinlock_init
 nvgpu_spinlock_release
 nvgpu_strnadd_u32
-nvgpu_sw_quiesce
+nvgpu_sw_quiesce_with_trace
 nvgpu_sw_quiesce_remove_support
 nvgpu_swprofile_initialize
 nvgpu_swprofile_snapshot
diff --git a/libs/igpu/libnvgpu-drv-igpu_safe.export b/libs/igpu/libnvgpu-drv-igpu_safe.export
index 2d12a30e9..0589023ac 100644
--- a/libs/igpu/libnvgpu-drv-igpu_safe.export
+++ b/libs/igpu/libnvgpu-drv-igpu_safe.export
@@ -751,7 +751,7 @@ nvgpu_spinlock_acquire
 nvgpu_spinlock_init
 nvgpu_spinlock_release
 nvgpu_strnadd_u32
-nvgpu_sw_quiesce
+nvgpu_sw_quiesce_with_trace
 nvgpu_sw_quiesce_remove_support
 nvgpu_swprofile_initialize
 nvgpu_swprofile_snapshot