diff --git a/drivers/gpu/nvgpu/common/nvlink/intr_and_err_handling_gv100.c b/drivers/gpu/nvgpu/common/nvlink/intr_and_err_handling_gv100.c
index 48a283384..9631b5e00 100644
--- a/drivers/gpu/nvgpu/common/nvlink/intr_and_err_handling_gv100.c
+++ b/drivers/gpu/nvgpu/common/nvlink/intr_and_err_handling_gv100.c
@@ -253,7 +253,8 @@ static void gv100_nvlink_minion_isr(struct gk20a *g) {
 					minion_minion_intr_nonfatal_f(1));
 	}
 
-	links = minion_minion_intr_link_v(intr) & g->nvlink.enabled_links;
+	links = minion_minion_intr_link_v(intr) &
+					(unsigned long) g->nvlink.enabled_links;
 
 	if (links != 0UL) {
 		for_each_set_bit(bit, &links, NVLINK_MAX_LINKS_SW) {
diff --git a/drivers/gpu/nvgpu/common/nvlink/nvlink_gv100.c b/drivers/gpu/nvgpu/common/nvlink/nvlink_gv100.c
index e58c0a814..15bb96423 100644
--- a/drivers/gpu/nvgpu/common/nvlink/nvlink_gv100.c
+++ b/drivers/gpu/nvgpu/common/nvlink/nvlink_gv100.c
@@ -507,7 +507,7 @@ int gv100_nvlink_setup_pll(struct gk20a *g, unsigned long link_mask)
 	struct nvgpu_timeout timeout;
 	u32 pad_ctrl = 0U;
 	u32 swap_ctrl = 0U;
-	u32 pll_id;
+	u8 pll_id;
 	unsigned long bit;
 
 	reg = gk20a_readl(g, trim_sys_nvlink_uphy_cfg_r());