summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/nvgpu/gv100/nvlink_gv100.c3
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_minion_gv100.h16
2 files changed, 17 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gv100/nvlink_gv100.c b/drivers/gpu/nvgpu/gv100/nvlink_gv100.c
index b51fc6fa..6d6fb4fd 100644
--- a/drivers/gpu/nvgpu/gv100/nvlink_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/nvlink_gv100.c
@@ -34,7 +34,6 @@
34#include "gk20a/gk20a.h" 34#include "gk20a/gk20a.h"
35#include "nvlink_gv100.h" 35#include "nvlink_gv100.h"
36 36
37#include <nvgpu/hw/gv100/hw_falcon_gv100.h>
38#include <nvgpu/hw/gv100/hw_top_gv100.h> 37#include <nvgpu/hw/gv100/hw_top_gv100.h>
39#include <nvgpu/hw/gv100/hw_nvlinkip_discovery_gv100.h> 38#include <nvgpu/hw/gv100/hw_nvlinkip_discovery_gv100.h>
40#include <nvgpu/hw/gv100/hw_nvlipt_gv100.h> 39#include <nvgpu/hw/gv100/hw_nvlipt_gv100.h>
@@ -329,7 +328,7 @@ static bool gv100_nvlink_minion_falcon_isr(struct gk20a *g)
329 if (!intr) 328 if (!intr)
330 return true; 329 return true;
331 330
332 if (intr & falcon_falcon_irqstat_exterr_true_f()) { 331 if (intr & minion_falcon_irqstat_exterr_true_f()) {
333 nvgpu_err(g, "FALCON EXT ADDR: 0x%x 0x%x 0x%x", 332 nvgpu_err(g, "FALCON EXT ADDR: 0x%x 0x%x 0x%x",
334 MINION_REG_RD32(g, 0x244), 333 MINION_REG_RD32(g, 0x244),
335 MINION_REG_RD32(g, 0x248), 334 MINION_REG_RD32(g, 0x248),
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_minion_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_minion_gv100.h
index a57ea97a..e4bbf23f 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_minion_gv100.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_minion_gv100.h
@@ -104,6 +104,22 @@ static inline u32 minion_falcon_irqstat_halt_v(u32 r)
104{ 104{
105 return (r >> 4U) & 0x1U; 105 return (r >> 4U) & 0x1U;
106} 106}
107static inline u32 minion_falcon_irqstat_exterr_f(u32 v)
108{
109 return (v & 0x1U) << 5U;
110}
111static inline u32 minion_falcon_irqstat_exterr_v(u32 r)
112{
113 return (r >> 5U) & 0x1U;
114}
115static inline u32 minion_falcon_irqstat_exterr_true_v(void)
116{
117 return 0x00000001U;
118}
119static inline u32 minion_falcon_irqstat_exterr_true_f(void)
120{
121 return 0x20U;
122}
107static inline u32 minion_falcon_irqmask_r(void) 123static inline u32 minion_falcon_irqmask_r(void)
108{ 124{
109 return 0x00000018U; 125 return 0x00000018U;