Merge remote-tracking branch 'remotes/origin/dev/merge-nvgpu-t18x-into-nvgpu' into dev-kernel

Merge T186 - gp10b/gp106 code into common nvgpu repo

Bug 200266498

Change-Id: Ibf100ee38010cbed85c149b69b99147256f9a005
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>

8 files changed, 750 insertions, 0 deletions

diff --git a/drivers/gpu/nvgpu/therm/thrm.c b/drivers/gpu/nvgpu/therm/thrm.c
new file mode 100644
index 00000000..731cf89e
--- /dev/null
+++ b/drivers/gpu/nvgpu/therm/thrm.c
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ */
+
+#include "gk20a/gk20a.h"
+#include "thrm.h"
+#include "thrmpmu.h"
+
+u32 therm_domain_sw_setup(struct gk20a *g)
+{
+        u32 status;
+
+        status = therm_device_sw_setup(g);
+        if (status) {
+                gk20a_err(dev_from_gk20a(g),
+                        "error creating boardobjgrp for therm devices, status - 0x%x",
+                        status);
+                goto exit;
+        }
+
+        status = therm_channel_sw_setup(g);
+        if (status) {
+                gk20a_err(dev_from_gk20a(g),
+                        "error creating boardobjgrp for therm channel, status - 0x%x",
+                        status);
+                goto exit;
+        }
+
+exit:
+        return status;
+}
+
+u32 therm_domain_pmu_setup(struct gk20a *g)
+{
+        return therm_send_pmgr_tables_to_pmu(g);
+}
diff --git a/drivers/gpu/nvgpu/therm/thrm.h b/drivers/gpu/nvgpu/therm/thrm.h
new file mode 100644
index 00000000..1db93b49
--- /dev/null
+++ b/drivers/gpu/nvgpu/therm/thrm.h
@@ -0,0 +1,29 @@
+/*
+ * general thermal table structures & definitions
+ *
+ * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ */
+#ifndef _THRM_H_
+#define _THRM_H_
+
+#include "thrmdev.h"
+#include "thrmchannel.h"
+
+struct therm_pmupstate {
+        struct therm_devices therm_deviceobjs;
+        struct therm_channels therm_channelobjs;
+};
+
+u32 therm_domain_sw_setup(struct gk20a *g);
+u32 therm_domain_pmu_setup(struct gk20a *g);
+
+#endif
diff --git a/drivers/gpu/nvgpu/therm/thrmchannel.c b/drivers/gpu/nvgpu/therm/thrmchannel.c
new file mode 100644
index 00000000..b5a7dfd2
--- /dev/null
+++ b/drivers/gpu/nvgpu/therm/thrmchannel.c
@@ -0,0 +1,246 @@
+/*
+ * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ */
+
+#include "gk20a/gk20a.h"
+#include "thrmchannel.h"
+#include "include/bios.h"
+#include "boardobj/boardobjgrp.h"
+#include "boardobj/boardobjgrp_e32.h"
+#include "pmuif/gpmuifboardobj.h"
+#include "pmuif/gpmuifthermsensor.h"
+#include "gm206/bios_gm206.h"
+#include "gk20a/pmu_gk20a.h"
+
+static u32 _therm_channel_pmudatainit_device(struct gk20a *g,
+                        struct boardobj *board_obj_ptr,
+                        struct nv_pmu_boardobj *ppmudata)
+{
+        u32 status = 0;
+        struct therm_channel *pchannel;
+        struct therm_channel_device *ptherm_channel;
+        struct nv_pmu_therm_therm_channel_device_boardobj_set *pset;
+
+        status = boardobj_pmudatainit_super(g, board_obj_ptr, ppmudata);
+        if (status) {
+                gk20a_err(dev_from_gk20a(g),
+                        "error updating pmu boardobjgrp for therm channel 0x%x",
+                        status);
+                status = -ENOMEM;
+                goto done;
+        }
+
+        pchannel = (struct therm_channel *)board_obj_ptr;
+        pset = (struct nv_pmu_therm_therm_channel_device_boardobj_set *)ppmudata;
+        ptherm_channel = (struct therm_channel_device *)board_obj_ptr;
+
+        pset->super.scaling = pchannel->scaling;
+        pset->super.offset = pchannel->offset;
+        pset->super.temp_min = pchannel->temp_min;
+        pset->super.temp_max = pchannel->temp_max;
+
+        pset->therm_dev_idx = ptherm_channel->therm_dev_idx;
+        pset->therm_dev_prov_idx = ptherm_channel->therm_dev_prov_idx;
+
+done:
+        return status;
+}
+static struct boardobj *construct_channel_device(struct gk20a *g,
+                        void *pargs, u16 pargs_size, u8 type)
+{
+        struct boardobj *board_obj_ptr = NULL;
+        struct therm_channel *pchannel;
+        struct therm_channel_device *pchannel_device;
+        u32 status;
+        struct therm_channel_device *therm_device = (struct therm_channel_device*)pargs;
+
+        status = boardobj_construct_super(g, &board_obj_ptr,
+                pargs_size, pargs);
+        if (status)
+                return NULL;
+
+        /* Set Super class interfaces */
+        board_obj_ptr->pmudatainit = _therm_channel_pmudatainit_device;
+
+        pchannel = (struct therm_channel *)board_obj_ptr;
+        pchannel_device = (struct therm_channel_device *)board_obj_ptr;
+
+        g->ops.therm.get_internal_sensor_limits(&pchannel->temp_max,
+                &pchannel->temp_min);
+        pchannel->scaling = (1 << 8);
+        pchannel->offset = 0;
+
+        pchannel_device->therm_dev_idx = therm_device->therm_dev_idx;
+        pchannel_device->therm_dev_prov_idx = therm_device->therm_dev_prov_idx;
+
+        gk20a_dbg_info(" Done");
+
+        return board_obj_ptr;
+}
+
+static u32 _therm_channel_pmudata_instget(struct gk20a *g,
+                        struct nv_pmu_boardobjgrp *pmuboardobjgrp,
+                        struct nv_pmu_boardobj **ppboardobjpmudata,
+                        u8 idx)
+{
+        struct nv_pmu_therm_therm_channel_boardobj_grp_set *pgrp_set =
+                (struct nv_pmu_therm_therm_channel_boardobj_grp_set *)
+                pmuboardobjgrp;
+
+        gk20a_dbg_info("");
+
+        /*check whether pmuboardobjgrp has a valid boardobj in index*/
+        if (((u32)BIT(idx) &
+                        pgrp_set->hdr.data.super.obj_mask.super.data[0]) == 0)
+                return -EINVAL;
+
+        *ppboardobjpmudata = (struct nv_pmu_boardobj *)
+                &pgrp_set->objects[idx].data.board_obj;
+
+        gk20a_dbg_info(" Done");
+
+        return 0;
+}
+
+static u32 devinit_get_therm_channel_table(struct gk20a *g,
+                                struct therm_channels *pthermchannelobjs)
+{
+        u32 status = 0;
+        u8 *therm_channel_table_ptr = NULL;
+        u8 *curr_therm_channel_table_ptr = NULL;
+        struct boardobj *boardobj;
+        struct therm_channel_1x_header therm_channel_table_header = { 0 };
+        struct therm_channel_1x_entry *therm_channel_table_entry = NULL;
+        u32 index;
+        u32 obj_index = 0;
+        u16 therm_channel_size = 0;
+        union {
+                struct boardobj boardobj;
+                struct therm_channel therm_channel;
+                struct therm_channel_device device;
+        } therm_channel_data;
+
+        gk20a_dbg_info("");
+
+        if (g->ops.bios.get_perf_table_ptrs) {
+                therm_channel_table_ptr = (u8 *)g->ops.bios.get_perf_table_ptrs(g,
+                                g->bios.perf_token, THERMAL_CHANNEL_TABLE);
+                if (therm_channel_table_ptr == NULL) {
+                        status = -EINVAL;
+                        goto done;
+                }
+        }
+
+        memcpy(&therm_channel_table_header, therm_channel_table_ptr,
+                VBIOS_THERM_CHANNEL_1X_HEADER_SIZE_09);
+
+        if (therm_channel_table_header.version !=
+                        VBIOS_THERM_CHANNEL_VERSION_1X) {
+                status = -EINVAL;
+                goto done;
+        }
+
+        if (therm_channel_table_header.header_size <
+                        VBIOS_THERM_CHANNEL_1X_HEADER_SIZE_09) {
+                status = -EINVAL;
+                goto done;
+        }
+
+        curr_therm_channel_table_ptr = (therm_channel_table_ptr +
+                VBIOS_THERM_CHANNEL_1X_HEADER_SIZE_09);
+
+        for (index = 0; index < therm_channel_table_header.num_table_entries;
+                index++) {
+                therm_channel_table_entry = (struct therm_channel_1x_entry *)
+                        (curr_therm_channel_table_ptr +
+                                (therm_channel_table_header.table_entry_size * index));
+
+                if (therm_channel_table_entry->class_id !=
+                                NV_VBIOS_THERM_CHANNEL_1X_ENTRY_CLASS_DEVICE) {
+                        continue;
+                }
+
+                therm_channel_data.device.therm_dev_idx = therm_channel_table_entry->param0;
+                therm_channel_data.device.therm_dev_prov_idx = therm_channel_table_entry->param1;
+
+                therm_channel_size = sizeof(struct therm_channel_device);
+                therm_channel_data.boardobj.type = CTRL_THERMAL_THERM_CHANNEL_CLASS_DEVICE;
+
+                boardobj = construct_channel_device(g, &therm_channel_data,
+                                        therm_channel_size, therm_channel_data.boardobj.type);
+
+                if (!boardobj) {
+                        gk20a_err(dev_from_gk20a(g),
+                                "unable to create thermal device for %d type %d",
+                                index, therm_channel_data.boardobj.type);
+                        status = -EINVAL;
+                        goto done;
+                }
+
+                status = boardobjgrp_objinsert(&pthermchannelobjs->super.super,
+                                boardobj, obj_index);
+
+                if (status) {
+                        gk20a_err(dev_from_gk20a(g),
+                        "unable to insert thermal device boardobj for %d", index);
+                        status = -EINVAL;
+                        goto done;
+                }
+
+                ++obj_index;
+        }
+
+done:
+        gk20a_dbg_info(" done status %x", status);
+        return status;
+}
+
+u32 therm_channel_sw_setup(struct gk20a *g)
+{
+        u32 status;
+        struct boardobjgrp *pboardobjgrp = NULL;
+        struct therm_channels *pthermchannelobjs;
+
+        /* Construct the Super Class and override the Interfaces */
+        status = boardobjgrpconstruct_e32(&g->therm_pmu.therm_channelobjs.super);
+        if (status) {
+                gk20a_err(dev_from_gk20a(g),
+                          "error creating boardobjgrp for therm devices, status - 0x%x",
+                          status);
+                goto done;
+        }
+
+        pboardobjgrp = &g->therm_pmu.therm_channelobjs.super.super;
+        pthermchannelobjs = &(g->therm_pmu.therm_channelobjs);
+
+        /* Override the Interfaces */
+        pboardobjgrp->pmudatainstget = _therm_channel_pmudata_instget;
+
+        status = devinit_get_therm_channel_table(g, pthermchannelobjs);
+        if (status)
+                goto done;
+
+        BOARDOBJGRP_PMU_CONSTRUCT(pboardobjgrp, THERM, THERM_CHANNEL);
+
+        status = BOARDOBJGRP_PMU_CMD_GRP_SET_CONSTRUCT(g, pboardobjgrp,
+                        therm, THERM, therm_channel, THERM_CHANNEL);
+        if (status) {
+                gk20a_err(dev_from_gk20a(g),
+                          "error constructing PMU_BOARDOBJ_CMD_GRP_SET interface - 0x%x",
+                          status);
+                goto done;
+        }
+
+done:
+        gk20a_dbg_info(" done status %x", status);
+        return status;
+}
diff --git a/drivers/gpu/nvgpu/therm/thrmchannel.h b/drivers/gpu/nvgpu/therm/thrmchannel.h
new file mode 100644
index 00000000..4b9d19da
--- /dev/null
+++ b/drivers/gpu/nvgpu/therm/thrmchannel.h
@@ -0,0 +1,42 @@
+/*
+ * general thermal device structures & definitions
+ *
+ * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ */
+#ifndef _THRMCHANNEL_H_
+#define _THRMCHANNEL_H_
+
+#include "boardobj/boardobj.h"
+#include "boardobj/boardobjgrp.h"
+#include "ctrl/ctrltherm.h"
+
+struct therm_channel {
+        struct boardobj super;
+        s16 scaling;
+        s16 offset;
+        s32 temp_min;
+        s32 temp_max;
+};
+
+struct therm_channels {
+        struct boardobjgrp_e32 super;
+};
+
+struct therm_channel_device {
+        struct therm_channel super;
+        u8 therm_dev_idx;
+        u8 therm_dev_prov_idx;
+};
+
+u32 therm_channel_sw_setup(struct gk20a *g);
+
+#endif
diff --git a/drivers/gpu/nvgpu/therm/thrmdev.c b/drivers/gpu/nvgpu/therm/thrmdev.c
new file mode 100644
index 00000000..83ac9739
--- /dev/null
+++ b/drivers/gpu/nvgpu/therm/thrmdev.c
@@ -0,0 +1,193 @@
+/*
+ * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ */
+
+#include "gk20a/gk20a.h"
+#include "thrmdev.h"
+#include "include/bios.h"
+#include "boardobj/boardobjgrp.h"
+#include "boardobj/boardobjgrp_e32.h"
+#include "pmuif/gpmuifboardobj.h"
+#include "pmuif/gpmuifthermsensor.h"
+#include "gm206/bios_gm206.h"
+#include "gk20a/pmu_gk20a.h"
+#include "ctrl/ctrltherm.h"
+
+static struct boardobj *construct_therm_device(struct gk20a *g,
+                        void *pargs, u16 pargs_size, u8 type)
+{
+        struct boardobj *board_obj_ptr = NULL;
+        u32 status;
+
+        status = boardobj_construct_super(g, &board_obj_ptr,
+                pargs_size, pargs);
+        if (status)
+                return NULL;
+
+        gk20a_dbg_info(" Done");
+
+        return board_obj_ptr;
+}
+
+static u32 _therm_device_pmudata_instget(struct gk20a *g,
+                        struct nv_pmu_boardobjgrp *pmuboardobjgrp,
+                        struct nv_pmu_boardobj **ppboardobjpmudata,
+                        u8 idx)
+{
+        struct nv_pmu_therm_therm_device_boardobj_grp_set *pgrp_set =
+                (struct nv_pmu_therm_therm_device_boardobj_grp_set *)
+                pmuboardobjgrp;
+
+        gk20a_dbg_info("");
+
+        /*check whether pmuboardobjgrp has a valid boardobj in index*/
+        if (((u32)BIT(idx) &
+                        pgrp_set->hdr.data.super.obj_mask.super.data[0]) == 0)
+                return -EINVAL;
+
+        *ppboardobjpmudata = (struct nv_pmu_boardobj *)
+                &pgrp_set->objects[idx].data;
+
+        gk20a_dbg_info(" Done");
+
+        return 0;
+}
+
+static u32 devinit_get_therm_device_table(struct gk20a *g,
+                                struct therm_devices *pthermdeviceobjs)
+{
+        u32 status = 0;
+        u8 *therm_device_table_ptr = NULL;
+        u8 *curr_therm_device_table_ptr = NULL;
+        struct boardobj *boardobj;
+        struct therm_device_1x_header therm_device_table_header = { 0 };
+        struct therm_device_1x_entry *therm_device_table_entry = NULL;
+        u32 index;
+        u32 obj_index = 0;
+        u16 therm_device_size = 0;
+        union {
+                struct boardobj boardobj;
+                struct therm_device therm_device;
+        } therm_device_data;
+
+        gk20a_dbg_info("");
+
+        if (g->ops.bios.get_perf_table_ptrs) {
+                therm_device_table_ptr = (u8 *)g->ops.bios.get_perf_table_ptrs(g,
+                                g->bios.perf_token, THERMAL_DEVICE_TABLE);
+                if (therm_device_table_ptr == NULL) {
+                        status = -EINVAL;
+                        goto done;
+                }
+        }
+
+        memcpy(&therm_device_table_header, therm_device_table_ptr,
+                VBIOS_THERM_DEVICE_1X_HEADER_SIZE_04);
+
+        if (therm_device_table_header.version !=
+                        VBIOS_THERM_DEVICE_VERSION_1X) {
+                status = -EINVAL;
+                goto done;
+        }
+
+        if (therm_device_table_header.header_size <
+                        VBIOS_THERM_DEVICE_1X_HEADER_SIZE_04) {
+                status = -EINVAL;
+                goto done;
+        }
+
+        curr_therm_device_table_ptr = (therm_device_table_ptr +
+                VBIOS_THERM_DEVICE_1X_HEADER_SIZE_04);
+
+        for (index = 0; index < therm_device_table_header.num_table_entries;
+                index++) {
+                therm_device_table_entry = (struct therm_device_1x_entry *)
+                        (curr_therm_device_table_ptr +
+                                (therm_device_table_header.table_entry_size * index));
+
+                if (therm_device_table_entry->class_id !=
+                                NV_VBIOS_THERM_DEVICE_1X_ENTRY_CLASS_GPU) {
+                        continue;
+                }
+
+                therm_device_size = sizeof(struct therm_device);
+                therm_device_data.boardobj.type = CTRL_THERMAL_THERM_DEVICE_CLASS_GPU;
+
+                boardobj = construct_therm_device(g, &therm_device_data,
+                                        therm_device_size, therm_device_data.boardobj.type);
+
+                if (!boardobj) {
+                        gk20a_err(dev_from_gk20a(g),
+                                "unable to create thermal device for %d type %d",
+                                index, therm_device_data.boardobj.type);
+                        status = -EINVAL;
+                        goto done;
+                }
+
+                status = boardobjgrp_objinsert(&pthermdeviceobjs->super.super,
+                                boardobj, obj_index);
+
+                if (status) {
+                        gk20a_err(dev_from_gk20a(g),
+                        "unable to insert thermal device boardobj for %d", index);
+                        status = -EINVAL;
+                        goto done;
+                }
+
+                ++obj_index;
+        }
+
+done:
+        gk20a_dbg_info(" done status %x", status);
+        return status;
+}
+
+u32 therm_device_sw_setup(struct gk20a *g)
+{
+        u32 status;
+        struct boardobjgrp *pboardobjgrp = NULL;
+        struct therm_devices *pthermdeviceobjs;
+
+        /* Construct the Super Class and override the Interfaces */
+        status = boardobjgrpconstruct_e32(&g->therm_pmu.therm_deviceobjs.super);
+        if (status) {
+                gk20a_err(dev_from_gk20a(g),
+                          "error creating boardobjgrp for therm devices, status - 0x%x",
+                          status);
+                goto done;
+        }
+
+        pboardobjgrp = &g->therm_pmu.therm_deviceobjs.super.super;
+        pthermdeviceobjs = &(g->therm_pmu.therm_deviceobjs);
+
+        /* Override the Interfaces */
+        pboardobjgrp->pmudatainstget = _therm_device_pmudata_instget;
+
+        status = devinit_get_therm_device_table(g, pthermdeviceobjs);
+        if (status)
+                goto done;
+
+        BOARDOBJGRP_PMU_CONSTRUCT(pboardobjgrp, THERM, THERM_DEVICE);
+
+        status = BOARDOBJGRP_PMU_CMD_GRP_SET_CONSTRUCT(g, pboardobjgrp,
+                        therm, THERM, therm_device, THERM_DEVICE);
+        if (status) {
+                gk20a_err(dev_from_gk20a(g),
+                          "error constructing PMU_BOARDOBJ_CMD_GRP_SET interface - 0x%x",
+                          status);
+                goto done;
+        }
+
+done:
+        gk20a_dbg_info(" done status %x", status);
+        return status;
+}
diff --git a/drivers/gpu/nvgpu/therm/thrmdev.h b/drivers/gpu/nvgpu/therm/thrmdev.h
new file mode 100644
index 00000000..35be47c0
--- /dev/null
+++ b/drivers/gpu/nvgpu/therm/thrmdev.h
@@ -0,0 +1,31 @@
+/*
+ * general thermal device structures & definitions
+ *
+ * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ */
+#ifndef _THRMDEV_H_
+#define _THRMDEV_H_
+
+#include "boardobj/boardobj.h"
+#include "boardobj/boardobjgrp.h"
+
+struct therm_devices {
+        struct boardobjgrp_e32 super;
+};
+
+struct therm_device {
+        struct therm_devices super;
+};
+
+u32 therm_device_sw_setup(struct gk20a *g);
+
+#endif
diff --git a/drivers/gpu/nvgpu/therm/thrmpmu.c b/drivers/gpu/nvgpu/therm/thrmpmu.c
new file mode 100644
index 00000000..0d0a4b3a
--- /dev/null
+++ b/drivers/gpu/nvgpu/therm/thrmpmu.c
@@ -0,0 +1,142 @@
+/*
+ * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ */
+
+#include "gk20a/gk20a.h"
+#include "include/bios.h"
+#include "boardobj/boardobjgrp.h"
+#include "boardobj/boardobjgrp_e32.h"
+#include "pmuif/gpmuifboardobj.h"
+#include "thrmpmu.h"
+#include "pmuif/gpmuiftherm.h"
+
+struct therm_pmucmdhandler_params {
+        struct nv_pmu_therm_rpc *prpccall;
+        u32 success;
+};
+
+static void therm_pmucmdhandler(struct gk20a *g, struct pmu_msg *msg,
+                        void *param, u32 handle, u32 status)
+{
+        struct therm_pmucmdhandler_params *phandlerparams =
+                (struct therm_pmucmdhandler_params *)param;
+
+        if (msg->msg.therm.msg_type != NV_PMU_THERM_MSG_ID_RPC) {
+                gk20a_err(dev_from_gk20a(g),
+                        "unknow msg %x",
+                        msg->msg.pmgr.msg_type);
+                return;
+        }
+
+        if (!phandlerparams->prpccall->b_supported)
+                gk20a_err(dev_from_gk20a(g),
+                        "RPC msg %x failed",
+                        msg->msg.pmgr.msg_type);
+        else
+                phandlerparams->success = 1;
+}
+
+u32 therm_send_pmgr_tables_to_pmu(struct gk20a *g)
+{
+        u32 status = 0;
+        struct boardobjgrp *pboardobjgrp = NULL;
+
+        if (!BOARDOBJGRP_IS_EMPTY(&g->therm_pmu.therm_deviceobjs.super.super)) {
+                pboardobjgrp = &g->therm_pmu.therm_deviceobjs.super.super;
+                status = pboardobjgrp->pmuinithandle(g, pboardobjgrp);
+                if (status) {
+                        gk20a_err(dev_from_gk20a(g),
+                                "therm_send_pmgr_tables_to_pmu - therm_device failed %x",
+                                status);
+                        goto exit;
+                }
+        }
+
+        if (!BOARDOBJGRP_IS_EMPTY(
+                        &g->therm_pmu.therm_channelobjs.super.super)) {
+                pboardobjgrp = &g->therm_pmu.therm_channelobjs.super.super;
+                status = pboardobjgrp->pmuinithandle(g, pboardobjgrp);
+                if (status) {
+                        gk20a_err(dev_from_gk20a(g),
+                                "therm_send_pmgr_tables_to_pmu - therm_channel failed %x",
+                                status);
+                        goto exit;
+                }
+        }
+
+exit:
+        return status;
+}
+
+u32 therm_set_warn_temp_limit(struct gk20a *g)
+{
+        u32 status;
+        u32 seqdesc = 0;
+        struct pmu_cmd cmd = { {0} };
+        struct pmu_msg msg = { {0} };
+        struct pmu_payload payload = { {0} };
+        struct nv_pmu_therm_rpc rpccall = {0};
+        struct therm_pmucmdhandler_params handlerparams = {0};
+
+        rpccall.function = NV_PMU_THERM_RPC_ID_SLCT_EVENT_TEMP_TH_SET;
+        rpccall.params.slct_event_temp_th_set.event_id =
+                NV_PMU_THERM_EVENT_THERMAL_1;
+        rpccall.params.slct_event_temp_th_set.temp_threshold = g->curr_warn_temp;
+        rpccall.b_supported = 0;
+
+        cmd.hdr.unit_id = PMU_UNIT_THERM;
+        cmd.hdr.size = ((u32)sizeof(struct nv_pmu_therm_cmd) +
+                        (u32)sizeof(struct pmu_hdr));
+        cmd.cmd.therm.cmd_type = NV_PMU_THERM_CMD_ID_RPC;
+
+        msg.hdr.size = sizeof(struct pmu_msg);
+
+        payload.in.buf = (u8 *)&rpccall;
+        payload.in.size = (u32)sizeof(struct nv_pmu_therm_rpc);
+        payload.in.fb_size = PMU_CMD_SUBMIT_PAYLOAD_PARAMS_FB_SIZE_UNUSED;
+        payload.in.offset = NV_PMU_THERM_CMD_RPC_ALLOC_OFFSET;
+
+        payload.out.buf = (u8 *)&rpccall;
+        payload.out.size = (u32)sizeof(struct nv_pmu_therm_rpc);
+        payload.out.fb_size = PMU_CMD_SUBMIT_PAYLOAD_PARAMS_FB_SIZE_UNUSED;
+        payload.out.offset = NV_PMU_CLK_MSG_RPC_ALLOC_OFFSET;
+
+        /* Setup the handler params to communicate back results.*/
+        handlerparams.success = 0;
+        handlerparams.prpccall = &rpccall;
+
+        status = gk20a_pmu_cmd_post(g, &cmd, NULL, &payload,
+                                PMU_COMMAND_QUEUE_LPQ,
+                                therm_pmucmdhandler,
+                                (void *)&handlerparams,
+                                &seqdesc, ~0);
+        if (status) {
+                gk20a_err(dev_from_gk20a(g),
+                        "unable to post pmgr cmd for unit %x cmd id %x size %x",
+                        cmd.hdr.unit_id, cmd.cmd.therm.cmd_type, cmd.hdr.size);
+                goto exit;
+        }
+
+        pmu_wait_message_cond(&g->pmu,
+                        gk20a_get_gr_idle_timeout(g),
+                        &handlerparams.success, 1);
+
+        if (handlerparams.success == 0) {
+                gk20a_err(dev_from_gk20a(g), "could not process cmd\n");
+                status = -ETIMEDOUT;
+                goto exit;
+        }
+
+exit:
+        return status;
+}
+
diff --git a/drivers/gpu/nvgpu/therm/thrmpmu.h b/drivers/gpu/nvgpu/therm/thrmpmu.h
new file mode 100644
index 00000000..e6f70411
--- /dev/null
+++ b/drivers/gpu/nvgpu/therm/thrmpmu.h
@@ -0,0 +1,22 @@
+/*
+ * general thermal pmu control structures & definitions
+ *
+ * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ */
+#ifndef _THRMPMU_H_
+#define _THRMPMU_H_
+
+u32 therm_send_pmgr_tables_to_pmu(struct gk20a *g);
+
+u32 therm_set_warn_temp_limit(struct gk20a *g);
+
+#endif