nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-23 01:50:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: Remove pg419 emulation on pg418

Browse Source 
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 <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1588732
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Terje Bergstrom
2017-10-30 15:57:28 -07:00
committed by mobile promotions
parent 7e59e0b09b
commit a5e76ed7af
5 changed files with 0 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/nvgpu/gk20a/gk20a.h
View File

@@ -1280,10 +1280,6 @@ struct gk20a {
struct nvgpu_mem_alloc_tracker *kmallocs; struct nvgpu_mem_alloc_tracker *kmallocs;
#endif #endif
/* Some boards might be missing power sensor, preventing
* from monitoring power, current and voltage */
bool power_sensor_missing;
/* The minimum VBIOS version supported */ /* The minimum VBIOS version supported */
u32 vbios_min_version; u32 vbios_min_version;

9
drivers/gpu/nvgpu/gp106/bios_gp106.c
View File

@@ -20,8 +20,6 @@
* DEALINGS IN THE SOFTWARE. * DEALINGS IN THE SOFTWARE.
*/ */
#include <linux/pci_ids.h>
#include <nvgpu/bios.h> #include <nvgpu/bios.h>
#include <nvgpu/kmem.h> #include <nvgpu/kmem.h>
#include <nvgpu/nvgpu_common.h> #include <nvgpu/nvgpu_common.h>
@@ -220,13 +218,6 @@ int gp106_bios_init(struct gk20a *g)
goto free_firmware; 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"); gk20a_dbg_fn("done");
err = gp106_bios_devinit(g); err = gp106_bios_devinit(g);

7
drivers/gpu/nvgpu/gp106/hal_gp106.c
View File

@@ -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_DEVICE_EVENTS, true);
__nvgpu_set_enabled(g, NVGPU_SUPPORT_SET_THERM_ALERT_LIMIT, 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; return 0;
} }

6
drivers/gpu/nvgpu/pmgr/pmgrpmu.c
View File

@@ -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( if (!(BOARDOBJGRP_IS_EMPTY(
&g->pmgr_pmu.pmgr_policyobjs.pwr_policies.super)) || &g->pmgr_pmu.pmgr_policyobjs.pwr_policies.super)) ||
!(BOARDOBJGRP_IS_EMPTY( !(BOARDOBJGRP_IS_EMPTY(

6
drivers/gpu/nvgpu/pmgr/pwrdev.c
View File

@@ -305,12 +305,6 @@ u32 pmgr_device_sw_setup(struct gk20a *g)
/* Override the Interfaces */ /* Override the Interfaces */
pboardobjgrp->pmudatainstget = _pwr_device_pmudata_instget; 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); status = devinit_get_pwr_device_table(g, ppwrdeviceobjs);
if (status) if (status)
goto done; goto done;