7 files changed, 52 insertions, 1 deletions

diff --git a/drivers/gpu/nvgpu/boardobj/boardobj.c b/drivers/gpu/nvgpu/boardobj/boardobj.c
index c0646eb4..f9be6981 100644
--- a/drivers/gpu/nvgpu/boardobj/boardobj.c
+++ b/drivers/gpu/nvgpu/boardobj/boardobj.c
@@ -41,6 +41,7 @@ u32 boardobj_construct_super(struct gk20a *g, struct boardobj **ppboardobj,
                 *ppboardobj = nvgpu_kzalloc(g, size);
                 if (*ppboardobj == NULL)
                         return -ENOMEM;
+                (*ppboardobj)->allocated = true;
         }
 
         pboardobj = *ppboardobj;
@@ -53,6 +54,8 @@ u32 boardobj_construct_super(struct gk20a *g, struct boardobj **ppboardobj,
         pboardobj->destruct    = boardobj_destruct_super;
         pboardobj->pmudatainit = boardobj_pmudatainit_super;
 
+        nvgpu_list_add(&pboardobj->node, &g->boardobj_head);
+
         return 0;
 }
 
@@ -61,7 +64,11 @@ u32 boardobj_destruct_super(struct boardobj *pboardobj)
         gk20a_dbg_info("");
         if (pboardobj == NULL)
                 return -EINVAL;
-        nvgpu_kfree(pboardobj->g, pboardobj);
+
+        nvgpu_list_del(&pboardobj->node);
+        if (pboardobj->allocated)
+                nvgpu_kfree(pboardobj->g, pboardobj);
+
         return 0;
 }
 
diff --git a/drivers/gpu/nvgpu/boardobj/boardobj.h b/drivers/gpu/nvgpu/boardobj/boardobj.h
index 5c1b4b81..a433fda8 100644
--- a/drivers/gpu/nvgpu/boardobj/boardobj.h
+++ b/drivers/gpu/nvgpu/boardobj/boardobj.h
@@ -71,6 +71,8 @@ struct boardobj {
 
         u8 type; /*type of the device*/
         u8 idx;  /*index of boardobj within in its group*/
+        /* true if allocated in constructor. destructor should free */
+        u8 allocated;
         u32 type_mask; /*mask of types this boardobjimplements*/
         boardobj_implements  *implements;
         boardobj_destruct    *destruct;
@@ -79,6 +81,7 @@ struct boardobj {
         * that inherit from BOARDOBJ
         */
         boardobj_pmudatainit *pmudatainit;
+        struct nvgpu_list_node node;
 };
 
 boardobj_construct   boardobj_construct_super;
@@ -89,4 +92,11 @@ boardobj_pmudatainit boardobj_pmudatainit_super;
 #define BOARDOBJ_GET_TYPE(pobj) (((struct boardobj *)(pobj))->type)
 #define BOARDOBJ_GET_IDX(pobj) (((struct boardobj *)(pobj))->idx)
 
+static inline struct boardobj *
+boardobj_from_node(struct nvgpu_list_node *node)
+{
+        return (struct boardobj *)
+                ((uintptr_t)node - offsetof(struct boardobj, node));
+};
+
 #endif
diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp.c b/drivers/gpu/nvgpu/boardobj/boardobjgrp.c
index 66c87e08..caed11e9 100644
--- a/drivers/gpu/nvgpu/boardobj/boardobjgrp.c
+++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp.c
@@ -86,6 +86,8 @@ u32 boardobjgrp_construct_super(struct gk20a *g, struct boardobjgrp *pboardobjgr
         pboardobjgrp->objmaxidx = CTRL_BOARDOBJ_IDX_INVALID;
         pboardobjgrp->bconstructed = true;
 
+        nvgpu_list_add(&pboardobjgrp->node, &g->boardobjgrp_head);
+
         return 0;
 }
 
@@ -144,6 +146,8 @@ u32 boardobjgrp_destruct_super(struct boardobjgrp *pboardobjgrp)
         if (status == 0)
                 status = stat;
 
+        nvgpu_list_del(&pboardobjgrp->node);
+
         pboardobjgrp->bconstructed = false;
 
         return status;
diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp.h b/drivers/gpu/nvgpu/boardobj/boardobjgrp.h
index 14d7c1bb..32e92ae0 100644
--- a/drivers/gpu/nvgpu/boardobj/boardobjgrp.h
+++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp.h
@@ -199,6 +199,7 @@ struct boardobjgrp {
 
         boardobjgrp_pmudatainstget *pmudatainstget;
         boardobjgrp_pmustatusinstget *pmustatusinstget;
+        struct nvgpu_list_node node;
 };
 
 /*
@@ -404,4 +405,12 @@ void boardobjgrpe32hdrset(struct nv_pmu_boardobjgrp *hdr, u32 objmask);
                 idx += 1;                   \
         (n32) = idx;                        \
 }
+
+static inline struct boardobjgrp *
+boardobjgrp_from_node(struct nvgpu_list_node *node)
+{
+        return (struct boardobjgrp *)
+                ((uintptr_t)node - offsetof(struct boardobjgrp, node));
+};
+
 #endif
diff --git a/drivers/gpu/nvgpu/common/linux/driver_common.c b/drivers/gpu/nvgpu/common/linux/driver_common.c
index 0dd0d62c..1c6002de 100644
--- a/drivers/gpu/nvgpu/common/linux/driver_common.c
+++ b/drivers/gpu/nvgpu/common/linux/driver_common.c
@@ -67,6 +67,9 @@ static void nvgpu_init_vars(struct gk20a *g)
         nvgpu_raw_spinlock_init(&g->pending_sema_waits_lock);
 
         nvgpu_init_list_node(&g->profiler_objects);
+
+        nvgpu_init_list_node(&g->boardobj_head);
+        nvgpu_init_list_node(&g->boardobjgrp_head);
 }
 
 static void nvgpu_init_timeout(struct gk20a *g)
diff --git a/drivers/gpu/nvgpu/common/pmu/pmu_fw.c b/drivers/gpu/nvgpu/common/pmu/pmu_fw.c
index 20eadb50..654fde21 100644
--- a/drivers/gpu/nvgpu/common/pmu/pmu_fw.c
+++ b/drivers/gpu/nvgpu/common/pmu/pmu_fw.c
@@ -29,6 +29,9 @@
 
 #include "gk20a/gk20a.h"
 
+#include "boardobj/boardobj.h"
+#include "boardobj/boardobjgrp.h"
+
 /* PMU NS UCODE IMG */
 #define NVGPU_PMU_NS_UCODE_IMAGE        "gpmu_ucode.bin"
 
@@ -2228,12 +2231,24 @@ static void nvgpu_remove_pmu_support(struct nvgpu_pmu *pmu)
         struct gk20a *g = gk20a_from_pmu(pmu);
         struct mm_gk20a *mm = &g->mm;
         struct vm_gk20a *vm = mm->pmu.vm;
+        struct boardobj *pboardobj, *pboardobj_tmp;
+        struct boardobjgrp *pboardobjgrp, *pboardobjgrp_tmp;
 
         nvgpu_log_fn(g, " ");
 
         if (nvgpu_alloc_initialized(&pmu->dmem))
                 nvgpu_alloc_destroy(&pmu->dmem);
 
+        nvgpu_list_for_each_entry_safe(pboardobjgrp, pboardobjgrp_tmp,
+                &g->boardobjgrp_head, boardobjgrp, node) {
+                pboardobjgrp->destruct(pboardobjgrp);
+        }
+
+        nvgpu_list_for_each_entry_safe(pboardobj, pboardobj_tmp,
+                        &g->boardobj_head, boardobj, node) {
+                pboardobj->destruct(pboardobj);
+        }
+
         if (pmu->fw)
                 nvgpu_release_firmware(g, pmu->fw);
 
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index 5b22d1a4..365c7252 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -1295,6 +1295,9 @@ struct gk20a {
         u32             syncpt_size;
 #endif
         struct nvgpu_mem syncpt_mem;
+
+        struct nvgpu_list_node boardobj_head;
+        struct nvgpu_list_node boardobjgrp_head;
 };
 
 static inline unsigned long gk20a_get_gr_idle_timeout(struct gk20a *g)