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: Unify remove/shutdown codepaths

Browse Source 
The following changes are part of the porting of the bind/unbind
functionality.

These changes reuse the shutdown codepaths in iGPU and dGPU and fix a locking
issue with in gk20a_busy() where the usage count can lead to a deadlock during
the driver shutdown. It fixes a racing condition with the gr/mm code by
invalidating the sw ready flag while holding the busy lock

JIRA: EVLR-1739

Change-Id: I62ce47378436b21f447f4cd93388759ed3f9bad1
Signed-off-by: David Nieto <dmartineznie@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1554959
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
This commit is contained in:
David Nieto
2017-09-07 16:12:44 -07:00
committed by mobile promotions
parent 980bf96bf2
commit ef6ea3475c
4 changed files with 88 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
drivers/gpu/nvgpu/common/linux/pci.c
View File

@@ -513,52 +513,34 @@ static int nvgpu_pci_probe(struct pci_dev *pdev,
static void nvgpu_pci_remove(struct pci_dev *pdev)
{
struct gk20a_platform *platform = gk20a_get_platform(&pdev->dev);
struct gk20a *g = get_gk20a(&pdev->dev);
struct nvgpu_os_linux *l = nvgpu_os_linux_from_gk20a(g);
struct device *dev = dev_from_gk20a(g);
int err;
gk20a_dbg(gpu_dbg_shutdown, "Removing nvgpu driver!\n");
/* no support yet for unbind if DGPU is in VGPU mode */
if (gk20a_gpu_is_virtual(dev))
return;
if (g->irqs_enabled)
disable_irq(g->irq_stall);
/* only idle the GPU if the GPU is powered on */
if (g->power_on) {
gk20a_driver_start_unload(g);
err = nvgpu_quiesce(g);
/* TODO: handle failure to idle */
WARN(err, "gpu failed to idle during driver removal");
}
devm_free_irq(&pdev->dev, g->irq_stall, g);
nvgpu_remove(dev, &nvgpu_pci_class);
#if defined(CONFIG_PCI_MSI)
if (g->msi_enabled) {
if (g->msi_enabled)
pci_disable_msi(pdev);
g->msi_enabled = false;
else {
/* IRQ does not need to be enabled in MSI as the line is not
* shared
*/
enable_irq(g->irq_stall);
}
#endif
gk20a_dbg(gpu_dbg_shutdown, "IRQs disabled.\n");
/*
* Wait for the driver to finish up all the IOCTLs it's working on
* before cleaning up the driver's data structures.
*/
gk20a_driver_start_unload(g);
gk20a_dbg(gpu_dbg_shutdown, "Driver idle.\n");
#ifdef CONFIG_ARCH_TEGRA_18x_SOC
nvgpu_clk_arb_cleanup_arbiter(g);
#endif
gk20a_user_deinit(dev_from_gk20a(g), &nvgpu_pci_class);
gk20a_dbg(gpu_dbg_shutdown, "User de-init done.\b");
#ifdef CONFIG_DEBUG_FS
debugfs_remove_recursive(l->debugfs);
debugfs_remove_recursive(l->debugfs_alias);
#endif
nvgpu_remove_sysfs(dev_from_gk20a(g));
if (platform->remove)
platform->remove(dev_from_gk20a(g));
gk20a_dbg(gpu_dbg_shutdown, "Platform remove done.\b");
enable_irq(g->irq_stall);
gk20a_get_platform(&pdev->dev)->g = NULL;
gk20a_put(g);
}