From a5e76ed7af2ffd496d23129f8f3d989335f8b21c Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Mon, 30 Oct 2017 15:57:28 -0700 Subject: gpu: nvgpu: Remove pg419 emulation on pg418 Remove emulation of pg419 board with a pg418 which does not have a power sensor, but claims to have one in VBIOS. JIRA NVGPU-259 Change-Id: I6527d08dd05b79f96e505561685504bb239ab4ac Signed-off-by: Terje Bergstrom Reviewed-on: https://git-master.nvidia.com/r/1588732 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/gk20a.h | 4 ---- drivers/gpu/nvgpu/gp106/bios_gp106.c | 9 --------- drivers/gpu/nvgpu/gp106/hal_gp106.c | 7 ------- drivers/gpu/nvgpu/pmgr/pmgrpmu.c | 6 ------ drivers/gpu/nvgpu/pmgr/pwrdev.c | 6 ------ 5 files changed, 32 deletions(-) (limited to 'drivers/gpu/nvgpu') diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index 550e8a0c..20e0450e 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h @@ -1280,10 +1280,6 @@ struct gk20a { struct nvgpu_mem_alloc_tracker *kmallocs; #endif - /* Some boards might be missing power sensor, preventing - * from monitoring power, current and voltage */ - bool power_sensor_missing; - /* The minimum VBIOS version supported */ u32 vbios_min_version; diff --git a/drivers/gpu/nvgpu/gp106/bios_gp106.c b/drivers/gpu/nvgpu/gp106/bios_gp106.c index 9d75249d..d42f2e14 100644 --- a/drivers/gpu/nvgpu/gp106/bios_gp106.c +++ b/drivers/gpu/nvgpu/gp106/bios_gp106.c @@ -20,8 +20,6 @@ * DEALINGS IN THE SOFTWARE. */ -#include - #include #include #include @@ -220,13 +218,6 @@ int gp106_bios_init(struct gk20a *g) goto free_firmware; } - /* WAR for HW2.5 RevA (INA3221 is missing) */ - if ((g->pci_vendor_id == PCI_VENDOR_ID_NVIDIA) && - (g->pci_device_id == 0x1c75) && - (g->gpu_characteristics.vbios_version == 0x86065300)) { - g->power_sensor_missing = true; - } - gk20a_dbg_fn("done"); err = gp106_bios_devinit(g); diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c index c5b66201..3193a629 100644 --- a/drivers/gpu/nvgpu/gp106/hal_gp106.c +++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c @@ -202,13 +202,6 @@ static int gp106_init_gpu_characteristics(struct gk20a *g) __nvgpu_set_enabled(g, NVGPU_SUPPORT_DEVICE_EVENTS, true); __nvgpu_set_enabled(g, NVGPU_SUPPORT_SET_THERM_ALERT_LIMIT, true); - /* WAR for missing INA3221 on HW2.5 RevA */ - if (g->power_sensor_missing) { - __nvgpu_set_enabled(g, NVGPU_SUPPORT_GET_VOLTAGE, false); - __nvgpu_set_enabled(g, NVGPU_SUPPORT_GET_CURRENT, false); - __nvgpu_set_enabled(g, NVGPU_SUPPORT_GET_POWER, false); - } - return 0; } diff --git a/drivers/gpu/nvgpu/pmgr/pmgrpmu.c b/drivers/gpu/nvgpu/pmgr/pmgrpmu.c index 6bd07365..afc92d66 100644 --- a/drivers/gpu/nvgpu/pmgr/pmgrpmu.c +++ b/drivers/gpu/nvgpu/pmgr/pmgrpmu.c @@ -507,12 +507,6 @@ u32 pmgr_send_pmgr_tables_to_pmu(struct gk20a *g) } } - /* WAR for missing INA3221 on HW2.5 RevA */ - if (g->power_sensor_missing) { - nvgpu_warn(g, "no power device found, skipping power policy"); - goto exit; - } - if (!(BOARDOBJGRP_IS_EMPTY( &g->pmgr_pmu.pmgr_policyobjs.pwr_policies.super)) || !(BOARDOBJGRP_IS_EMPTY( diff --git a/drivers/gpu/nvgpu/pmgr/pwrdev.c b/drivers/gpu/nvgpu/pmgr/pwrdev.c index 42784c9b..97b236e1 100644 --- a/drivers/gpu/nvgpu/pmgr/pwrdev.c +++ b/drivers/gpu/nvgpu/pmgr/pwrdev.c @@ -305,12 +305,6 @@ u32 pmgr_device_sw_setup(struct gk20a *g) /* Override the Interfaces */ pboardobjgrp->pmudatainstget = _pwr_device_pmudata_instget; - /* WAR for missing INA3221 on HW2.5 RevA */ - if (g->power_sensor_missing) { - nvgpu_warn(g, "no power sensor, monitoring disabled"); - goto done; - } - status = devinit_get_pwr_device_table(g, ppwrdeviceobjs); if (status) goto done; -- cgit v1.2.2