From 5215d65c25b5e76c19d9d12b03c52f69e2d40227 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Thu, 24 May 2018 15:25:41 -0700 Subject: gpu: nvgpu: Remove setting of PRI timeout PRI timeout should always use the HW initialization value. Do not set it explicitly. JIRA NVGPU-588 Change-Id: Idb63caba07c5fa7e0439e572861443f2783d0adc Signed-off-by: Terje Bergstrom Reviewed-on: https://git-master.nvidia.com/r/1730892 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/bus/bus_gk20a.c | 19 ++----------------- drivers/gpu/nvgpu/common/linux/driver_common.c | 1 - drivers/gpu/nvgpu/common/linux/pci.c | 9 --------- drivers/gpu/nvgpu/common/linux/platform_gk20a.h | 5 ----- 4 files changed, 2 insertions(+), 32 deletions(-) (limited to 'drivers/gpu/nvgpu/common') diff --git a/drivers/gpu/nvgpu/common/bus/bus_gk20a.c b/drivers/gpu/nvgpu/common/bus/bus_gk20a.c index d173123d..9f0446c6 100644 --- a/drivers/gpu/nvgpu/common/bus/bus_gk20a.c +++ b/drivers/gpu/nvgpu/common/bus/bus_gk20a.c @@ -32,29 +32,14 @@ void gk20a_bus_init_hw(struct gk20a *g) { - u32 timeout_period, intr_en_mask = 0; - - if (nvgpu_platform_is_silicon(g)) - timeout_period = g->default_pri_timeout ? - g->default_pri_timeout : 0x186A0; - else - timeout_period = 0x186A0; + u32 intr_en_mask = 0; if (nvgpu_platform_is_silicon(g) || nvgpu_platform_is_fpga(g)) { intr_en_mask = bus_intr_en_0_pri_squash_m() | bus_intr_en_0_pri_fecserr_m() | bus_intr_en_0_pri_timeout_m(); - gk20a_writel(g, - timer_pri_timeout_r(), - timer_pri_timeout_period_f(timeout_period) | - timer_pri_timeout_en_en_enabled_f()); - - } else { - gk20a_writel(g, - timer_pri_timeout_r(), - timer_pri_timeout_period_f(timeout_period) | - timer_pri_timeout_en_en_disabled_f()); } + gk20a_writel(g, bus_intr_en_0_r(), intr_en_mask); } diff --git a/drivers/gpu/nvgpu/common/linux/driver_common.c b/drivers/gpu/nvgpu/common/linux/driver_common.c index 2475912a..8f33c5d2 100644 --- a/drivers/gpu/nvgpu/common/linux/driver_common.c +++ b/drivers/gpu/nvgpu/common/linux/driver_common.c @@ -158,7 +158,6 @@ static void nvgpu_init_pm_vars(struct gk20a *g) __nvgpu_set_enabled(g, NVGPU_GPU_CAN_BLCG, nvgpu_platform_is_silicon(g) ? platform->can_blcg : false); - g->default_pri_timeout = platform->default_pri_timeout; g->aggressive_sync_destroy = platform->aggressive_sync_destroy; g->aggressive_sync_destroy_thresh = platform->aggressive_sync_destroy_thresh; g->has_syncpoints = platform->has_syncpoints; diff --git a/drivers/gpu/nvgpu/common/linux/pci.c b/drivers/gpu/nvgpu/common/linux/pci.c index 70125cbc..3d3c2a9f 100644 --- a/drivers/gpu/nvgpu/common/linux/pci.c +++ b/drivers/gpu/nvgpu/common/linux/pci.c @@ -90,7 +90,6 @@ static struct gk20a_platform nvgpu_pci_device[] = { .can_slcg = true, .can_blcg = true, .can_elcg = true, - .default_pri_timeout = 0x3ff, .disable_aspm = true, @@ -127,7 +126,6 @@ static struct gk20a_platform nvgpu_pci_device[] = { .can_slcg = true, .can_blcg = true, .can_elcg = true, - .default_pri_timeout = 0x3ff, .disable_aspm = true, @@ -164,7 +162,6 @@ static struct gk20a_platform nvgpu_pci_device[] = { .can_slcg = true, .can_blcg = true, .can_elcg = true, - .default_pri_timeout = 0x3ff, .disable_aspm = true, @@ -201,7 +198,6 @@ static struct gk20a_platform nvgpu_pci_device[] = { .can_slcg = true, .can_blcg = true, .can_elcg = true, - .default_pri_timeout = 0x3ff, .disable_aspm = true, @@ -238,7 +234,6 @@ static struct gk20a_platform nvgpu_pci_device[] = { .can_slcg = false, .can_blcg = false, .can_elcg = false, - .default_pri_timeout = 0x3ff, .disable_aspm = true, @@ -273,7 +268,6 @@ static struct gk20a_platform nvgpu_pci_device[] = { .can_slcg = false, .can_blcg = false, .can_elcg = false, - .default_pri_timeout = 0x3ff, .disable_aspm = true, @@ -308,7 +302,6 @@ static struct gk20a_platform nvgpu_pci_device[] = { .can_slcg = false, .can_blcg = false, .can_elcg = false, - .default_pri_timeout = 0x3ff, .disable_aspm = true, @@ -344,7 +337,6 @@ static struct gk20a_platform nvgpu_pci_device[] = { .can_slcg = true, .can_blcg = true, .can_elcg = true, - .default_pri_timeout = 0x3ff, .disable_aspm = true, @@ -380,7 +372,6 @@ static struct gk20a_platform nvgpu_pci_device[] = { .can_slcg = false, .can_blcg = false, .can_elcg = false, - .default_pri_timeout = 0x3ff, .disable_aspm = true, diff --git a/drivers/gpu/nvgpu/common/linux/platform_gk20a.h b/drivers/gpu/nvgpu/common/linux/platform_gk20a.h index 07e72247..9a99b7fe 100644 --- a/drivers/gpu/nvgpu/common/linux/platform_gk20a.h +++ b/drivers/gpu/nvgpu/common/linux/platform_gk20a.h @@ -120,11 +120,6 @@ struct gk20a_platform { */ bool force_reset_in_do_idle; - /* default pri timeout, on PCIe it should be lower than timeout - * detection - */ - u32 default_pri_timeout; - /* guest/vm id, needed for IPA to PA transation */ int vmid; -- cgit v1.2.2