diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_timer_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_timer_gk20a.h
index f0dbfc304..972d68af8 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_timer_gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_timer_gk20a.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2013-2018, 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"),
@@ -98,15 +98,15 @@ static inline u32 timer_pri_timeout_save_0_r(void)
 }
 static inline u32 timer_pri_timeout_save_0_fecs_tgt_v(u32 r)
 {
-	return (r >> 31) & 0x1;
+	return (r >> 31U) & 0x1U;
 }
 static inline u32 timer_pri_timeout_save_0_addr_v(u32 r)
 {
-	return (r >> 2) & 0x3fffff;
+	return (r >> 2U) & 0x3fffffU;
 }
 static inline u32 timer_pri_timeout_save_0_write_v(u32 r)
 {
-	return (r >> 1) & 0x1;
+	return (r >> 1U) & 0x1U;
 }
 static inline u32 timer_pri_timeout_save_1_r(void)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_gr_gm20b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_gr_gm20b.h
index 30bce9f99..be05d0313 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_gr_gm20b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_gr_gm20b.h
@@ -184,6 +184,22 @@ static inline u32 gr_exception_sked_m(void)
 {
 	return 0x1U << 8U;
 }
+static inline u32 gr_exception_pd_m(void)
+{
+	return 0x1U << 2U;
+}
+static inline u32 gr_exception_scc_m(void)
+{
+	return 0x1U << 3U;
+}
+static inline u32 gr_exception_ssync_m(void)
+{
+	return 0x1U << 5U;
+}
+static inline u32 gr_exception_mme_m(void)
+{
+	return 0x1U << 7U;
+}
 static inline u32 gr_exception1_r(void)
 {
 	return 0x00400118U;
@@ -544,6 +560,10 @@ static inline u32 gr_fe_hww_esr_en_enable_f(void)
 {
 	return 0x80000000U;
 }
+static inline u32 gr_fe_hww_esr_info_r(void)
+{
+	return 0x004041b0U;
+}
 static inline u32 gr_fe_go_idle_timeout_r(void)
 {
 	return 0x00404154U;
@@ -596,6 +616,10 @@ static inline u32 gr_mme_hww_esr_en_enable_f(void)
 {
 	return 0x80000000U;
 }
+static inline u32 gr_mme_hww_esr_info_r(void)
+{
+	return 0x00404494U;
+}
 static inline u32 gr_memfmt_hww_esr_r(void)
 {
 	return 0x00404600U;
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_timer_gm20b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_timer_gm20b.h
index 38548645e..f40936790 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_timer_gm20b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_timer_gm20b.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2018, 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"),
@@ -96,6 +96,18 @@ static inline u32 timer_pri_timeout_save_0_r(void)
 {
 	return 0x00009084U;
 }
+static inline u32 timer_pri_timeout_save_0_fecs_tgt_v(u32 r)
+{
+	return (r >> 31U) & 0x1U;
+}
+static inline u32 timer_pri_timeout_save_0_addr_v(u32 r)
+{
+	return (r >> 2U) & 0x3fffffU;
+}
+static inline u32 timer_pri_timeout_save_0_write_v(u32 r)
+{
+	return (r >> 1U) & 0x1U;
+}
 static inline u32 timer_pri_timeout_save_1_r(void)
 {
 	return 0x00009088U;
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_gr_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_gr_gp106.h
index 7d3135f9c..3ebed7ea0 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_gr_gp106.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_gr_gp106.h
@@ -180,6 +180,26 @@ static inline u32 gr_exception_ds_m(void)
 {
 	return 0x1U << 4U;
 }
+static inline u32 gr_exception_sked_m(void)
+{
+	return 0x1U << 8U;
+}
+static inline u32 gr_exception_pd_m(void)
+{
+	return 0x1U << 2U;
+}
+static inline u32 gr_exception_scc_m(void)
+{
+	return 0x1U << 3U;
+}
+static inline u32 gr_exception_ssync_m(void)
+{
+	return 0x1U << 5U;
+}
+static inline u32 gr_exception_mme_m(void)
+{
+	return 0x1U << 7U;
+}
 static inline u32 gr_exception1_r(void)
 {
 	return 0x00400118U;
@@ -672,6 +692,10 @@ static inline u32 gr_fe_hww_esr_en_enable_f(void)
 {
 	return 0x80000000U;
 }
+static inline u32 gr_fe_hww_esr_info_r(void)
+{
+	return 0x004041b0U;
+}
 static inline u32 gr_fe_go_idle_timeout_r(void)
 {
 	return 0x00404154U;
@@ -724,6 +748,10 @@ static inline u32 gr_mme_hww_esr_en_enable_f(void)
 {
 	return 0x80000000U;
 }
+static inline u32 gr_mme_hww_esr_info_r(void)
+{
+	return 0x00404494U;
+}
 static inline u32 gr_memfmt_hww_esr_r(void)
 {
 	return 0x00404600U;
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_ram_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_ram_gp106.h
index 3ae3f3bba..1de8aa212 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_ram_gp106.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_ram_gp106.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2018, 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"),
@@ -124,6 +124,26 @@ static inline u32 ram_in_page_dir_base_fault_replay_gcc_true_f(void)
 {
 	return 0x20U;
 }
+static inline u32 ram_in_use_ver2_pt_format_f(u32 v)
+{
+	return (v & 0x1U) << 10U;
+}
+static inline u32 ram_in_use_ver2_pt_format_m(void)
+{
+	return 0x1U << 10U;
+}
+static inline u32 ram_in_use_ver2_pt_format_w(void)
+{
+	return 128U;
+}
+static inline u32 ram_in_use_ver2_pt_format_true_f(void)
+{
+	return 0x400U;
+}
+static inline u32 ram_in_use_ver2_pt_format_false_f(void)
+{
+	return 0x0U;
+}
 static inline u32 ram_in_big_page_size_f(u32 v)
 {
 	return (v & 0x1U) << 11U;
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_gr_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_gr_gp10b.h
index 4ae70aab1..efd8b555d 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_gr_gp10b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_gr_gp10b.h
@@ -184,6 +184,22 @@ static inline u32 gr_exception_sked_m(void)
 {
 	return 0x1U << 8U;
 }
+static inline u32 gr_exception_pd_m(void)
+{
+	return 0x1U << 2U;
+}
+static inline u32 gr_exception_scc_m(void)
+{
+	return 0x1U << 3U;
+}
+static inline u32 gr_exception_ssync_m(void)
+{
+	return 0x1U << 5U;
+}
+static inline u32 gr_exception_mme_m(void)
+{
+	return 0x1U << 7U;
+}
 static inline u32 gr_exception1_r(void)
 {
 	return 0x00400118U;
@@ -724,6 +740,10 @@ static inline u32 gr_fe_hww_esr_en_enable_f(void)
 {
 	return 0x80000000U;
 }
+static inline u32 gr_fe_hww_esr_info_r(void)
+{
+	return 0x004041b0U;
+}
 static inline u32 gr_fe_go_idle_timeout_r(void)
 {
 	return 0x00404154U;
@@ -776,6 +796,10 @@ static inline u32 gr_mme_hww_esr_en_enable_f(void)
 {
 	return 0x80000000U;
 }
+static inline u32 gr_mme_hww_esr_info_r(void)
+{
+	return 0x00404494U;
+}
 static inline u32 gr_memfmt_hww_esr_r(void)
 {
 	return 0x00404600U;
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_timer_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_timer_gp10b.h
index db752648d..54facfc4f 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_timer_gp10b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_timer_gp10b.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2014-2018, 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"),
@@ -96,6 +96,18 @@ static inline u32 timer_pri_timeout_save_0_r(void)
 {
 	return 0x00009084U;
 }
+static inline u32 timer_pri_timeout_save_0_fecs_tgt_v(u32 r)
+{
+	return (r >> 31U) & 0x1U;
+}
+static inline u32 timer_pri_timeout_save_0_addr_v(u32 r)
+{
+	return (r >> 2U) & 0x3fffffU;
+}
+static inline u32 timer_pri_timeout_save_0_write_v(u32 r)
+{
+	return (r >> 1U) & 0x1U;
+}
 static inline u32 timer_pri_timeout_save_1_r(void)
 {
 	return 0x00009088U;