nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-22 17:36:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: Move intr data members from MC to CIC

Browse Source 
Move interrupt specific data-members from common.mc to common.cic
Some of these data members like sw_irq_stall_last_handled_cond need
To be initialized much earlier during the OS specific init/probe stage.
Also, some more members from struct nvgpu_interrupts(like stall_size,
stall_lines[]), which will soon be moved to CIC will also need to be
initialized early during the OS specific probe stage.
However, the chip specific LUT can only be initialized after the
hal_init stage where the HALs are all initialized.
Split the CIC init to accommodate the above initialization requirements.

JIRA NVGPU-6899

Change-Id: I9333db4cde59bb0aa8f6eb9f8472f00369817a5d
Signed-off-by: Tejal Kudav <tkudav@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2552535
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Tejal Kudav
2021-05-27 03:22:47 +00:00
committed by mobile promotions
parent 695dcab297
commit b33079d47e
23 changed files with 477 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/gpu/nvgpu/os/linux/module.c
View File

@@ -1598,6 +1598,12 @@ static int gk20a_probe(struct platform_device *dev)
if (nvgpu_platform_is_simulation(gk20a))
nvgpu_set_enabled(gk20a, NVGPU_IS_FMODEL, true);
err = nvgpu_cic_mon_setup(gk20a);
if (err != 0) {
nvgpu_err(gk20a, "CIC-MON setup failed");
goto return_err_cic_mon;
}
intr_size = platform_irq_count(dev);
if (intr_size > 0U && intr_size <= NVGPU_MAX_INTERRUPTS) {
irq_idx = 0U;
@@ -1698,6 +1704,8 @@ static int gk20a_probe(struct platform_device *dev)
return 0;
return_err:
nvgpu_cic_mon_remove(gk20a);
return_err_cic_mon:
nvgpu_free_enabled_flags(gk20a);
return_err_errata:
nvgpu_free_errata_flags(gk20a);
@@ -1762,6 +1770,12 @@ int nvgpu_remove(struct device *dev)
nvgpu_mutex_destroy(&g->clk_arb_enable_lock);
err = nvgpu_cic_rm_deinit_vars(g);
if (err != 0) {
nvgpu_err(g, "CIC-RM deinit vars failed.");
return err;
}
nvgpu_log_fn(g, "removed");
return err;
@@ -1779,6 +1793,18 @@ static int __exit gk20a_remove(struct platform_device *pdev)
err = nvgpu_remove(dev);
err = nvgpu_cic_mon_remove(g);
if (err != 0) {
nvgpu_err(g, "CIC-MON remove failed");
return err;
}
err = nvgpu_cic_rm_remove(g);
if (err != 0) {
nvgpu_err(g, "CIC-RM remove failed.");
return err;
}
gk20a_dma_buf_priv_list_clear(l);
nvgpu_mutex_destroy(&l->dmabuf_priv_list_lock);