From c78998f99bc3939ec3987ff6dc4f9df400592f6a Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Fri, 14 Jan 2022 09:44:59 -0800 Subject: [PATCH] gpu: nvgpu: leave LTC evicted_cb intr disabled The evicted_cb interrupt is occurring more frequently than expected and has no SW action that can be taken to avoid it. This interrupt is being disabled which is consistent with the HW POR value and the setting used on previous chips. Bug 3464717 Signed-off-by: Chris Johnson Change-Id: Ibc87f4bf287eeef158e46126a5e7f8a3cc575390 Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2654678 Reviewed-by: svcacv Reviewed-by: svc-mobile-coverity Reviewed-by: svc-mobile-misra Reviewed-by: svc-mobile-cert Reviewed-by: Vijayakumar Subbu Reviewed-by: mobile promotions GVS: Gerrit_Virtual_Submit Tested-by: mobile promotions --- drivers/gpu/nvgpu/hal/ltc/intr/ltc_intr_ga10b_fusa.c | 5 ++++- drivers/gpu/nvgpu/include/nvgpu/hw/ga10b/hw_ltc_ga10b.h | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/nvgpu/hal/ltc/intr/ltc_intr_ga10b_fusa.c b/drivers/gpu/nvgpu/hal/ltc/intr/ltc_intr_ga10b_fusa.c index 9df24acdd..54936384b 100644 --- a/drivers/gpu/nvgpu/hal/ltc/intr/ltc_intr_ga10b_fusa.c +++ b/drivers/gpu/nvgpu/hal/ltc/intr/ltc_intr_ga10b_fusa.c @@ -64,9 +64,12 @@ static void ga10b_ltc_intr1_configure(struct gk20a *g) * EVICTED_CB - indicates that a CB was demoted. * Normally this should not happen because the CBs should be flushed * during context switch and/or invalidated when no longer used. + * + * Note: this occurs more frequently than expected, so is being left + * disabled as on previous chips and consistent with HW POR value. */ reg = set_field(reg, ltc_ltcs_ltss_intr_en_evicted_cb_m(), - ltc_ltcs_ltss_intr_en_evicted_cb_enabled_f()); + ltc_ltcs_ltss_intr_en_evicted_cb_disabled_f()); /* * ILLEGAL_ATOMIC - unsupported atomic op and/or size received. diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/ga10b/hw_ltc_ga10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/ga10b/hw_ltc_ga10b.h index bb8591968..f71f4ddfd 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/ga10b/hw_ltc_ga10b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/ga10b/hw_ltc_ga10b.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2021, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2019-2022, 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"), @@ -154,6 +154,7 @@ #define ltc_ltcs_ltss_intr_evicted_cb_reset_f() (0x10U) #define ltc_ltcs_ltss_intr_en_evicted_cb_m() (U32(0x1U) << 20U) #define ltc_ltcs_ltss_intr_en_evicted_cb_enabled_f() (0x100000U) +#define ltc_ltcs_ltss_intr_en_evicted_cb_disabled_f() (0x0U) #define ltc_ltcs_ltss_intr_illegal_compstat_m() (U32(0x1U) << 5U) #define ltc_ltcs_ltss_intr_illegal_compstat_reset_f() (0x20U) #define ltc_ltcs_ltss_intr_en_illegal_compstat_m() (U32(0x1U) << 21U)