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: support upto four stall interrupt lines

Browse Source 
Add two new variables in nvgpu_mc struct to support
upto four stall interrupt lines.

Variables:-

Total number of stall interrupt lines:
u32 irq_stall_count

Array to store irq_stall interrupt number for upto 4
stall irq lines:
u32 irq_stall_lines[4]

JIRA NVGPU-4864

Change-Id: I9b43fc20c78dbcaf97fe8e685bb77963f06d3f99
Signed-off-by: Seema Khowala <seemaj@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2310377
Tested-by: Lakshmanan M <lm@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: Lakshmanan M <lm@nvidia.com>
Reviewed-by: automaticguardword <automaticguardword@nvidia.com>
Reviewed-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Reviewed-by: Vinod Gopalakrishnakurup <vinodg@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
GVS: Gerrit_Virtual_Submit
This commit is contained in:
Seema Khowala
2020-03-10 14:51:07 -07:00
committed by Alex Waterman
parent 4aff9bcd4e
commit 007ecfb5bc
3 changed files with 64 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/gpu/nvgpu/include/nvgpu/mc.h
View File

@@ -289,6 +289,15 @@ struct nvgpu_mc {
u32 irq_nonstall;
/** @cond DOXYGEN_SHOULD_SKIP_THIS */
/** Total number of stall interrupt lines */
u32 irq_stall_count;
/**
* Array to store irq_stall interrupt number for upto 4
* stall irq lines.
*/
u32 irq_stall_lines[4];
#if defined(CONFIG_NVGPU_NON_FUSA) && defined(CONFIG_NVGPU_NEXT)
struct nvgpu_next_mc nvgpu_next;
#endif

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

@@ -551,8 +551,12 @@ static int gk20a_lockout_registers(struct gk20a *g)
int nvgpu_enable_irqs(struct gk20a *g)
{
u32 i;
if (!g->mc.irqs_enabled) {
enable_irq(g->mc.irq_stall);
for (i = 0U; i < g->mc.irq_stall_count; i++) {
enable_irq(g->mc.irq_stall_lines[i]);
}
if (g->mc.irq_stall != g->mc.irq_nonstall)
enable_irq(g->mc.irq_nonstall);
g->mc.irqs_enabled = true;
@@ -563,8 +567,12 @@ int nvgpu_enable_irqs(struct gk20a *g)
void nvgpu_disable_irqs(struct gk20a *g)
{
u32 i;
if (g->mc.irqs_enabled) {
disable_irq(g->mc.irq_stall);
for (i = 0U; i < g->mc.irq_stall_count; i++) {
disable_irq(g->mc.irq_stall_lines[i]);
}
if (g->mc.irq_stall != g->mc.irq_nonstall)
disable_irq(g->mc.irq_nonstall);
g->mc.irqs_enabled = false;
@@ -1174,8 +1182,11 @@ static int gk20a_pm_unrailgate(struct device *dev)
void nvgpu_free_irq(struct gk20a *g)
{
struct device *dev = dev_from_gk20a(g);
u32 i;
devm_free_irq(dev, g->mc.irq_stall, g);
for (i = 0U; i < g->mc.irq_stall_count; i++) {
devm_free_irq(dev, g->mc.irq_stall_lines[i], g);
}
if (g->mc.irq_stall != g->mc.irq_nonstall)
devm_free_irq(dev, g->mc.irq_nonstall, g);
}
@@ -1539,6 +1550,7 @@ static int gk20a_probe(struct platform_device *dev)
int err;
struct gk20a_platform *platform = NULL;
struct device_node *np;
u32 i;
if (dev->dev.of_node) {
const struct of_device_id *match;
@@ -1591,35 +1603,54 @@ static int gk20a_probe(struct platform_device *dev)
if (nvgpu_platform_is_simulation(gk20a))
nvgpu_set_enabled(gk20a, NVGPU_IS_FMODEL, true);
/* Number of stall interrupt lines = total irq - 1 (for nonstall irq) */
gk20a->mc.irq_stall_count = platform_irq_count(dev) - 1;
gk20a->mc.irq_stall = platform_get_irq(dev, 0);
gk20a->mc.irq_stall_lines[0] = gk20a->mc.irq_stall;
gk20a->mc.irq_nonstall = platform_get_irq(dev, 1);
if ((int)gk20a->mc.irq_stall < 0 || (int)gk20a->mc.irq_nonstall < 0) {
err = -ENXIO;
goto return_err;
}
err = devm_request_threaded_irq(&dev->dev,
gk20a->mc.irq_stall,
if (gk20a->mc.irq_stall_count > 1) {
for (i = 1U; i < gk20a->mc.irq_stall_count; i++) {
gk20a->mc.irq_stall_lines[i] =
platform_get_irq(dev, i + 1);
}
}
for (i = 0U; i < gk20a->mc.irq_stall_count; i++) {
err = devm_request_threaded_irq(&dev->dev,
gk20a->mc.irq_stall_lines[i],
gk20a_intr_isr_stall,
gk20a_intr_thread_stall,
0, "gk20a_stall", gk20a);
if (err) {
dev_err(&dev->dev,
if (err) {
dev_err(&dev->dev,
"failed to request stall intr irq @ %d\n",
gk20a->mc.irq_stall);
goto return_err;
gk20a->mc.irq_stall_lines[i]);
goto return_err;
}
}
err = devm_request_irq(&dev->dev,
gk20a->mc.irq_nonstall,
gk20a_intr_isr_nonstall,
0, "gk20a_nonstall", gk20a);
if (err) {
dev_err(&dev->dev,
"failed to request non-stall intr irq @ %d\n",
gk20a->mc.irq_nonstall);
goto return_err;
if (gk20a->mc.irq_stall != gk20a->mc.irq_nonstall) {
err = devm_request_irq(&dev->dev,
gk20a->mc.irq_nonstall,
gk20a_intr_isr_nonstall,
0, "gk20a_nonstall", gk20a);
if (err) {
dev_err(&dev->dev,
"failed to request non-stall intr irq @ %d\n",
gk20a->mc.irq_nonstall);
goto return_err;
}
}
for (i = 0U; i < gk20a->mc.irq_stall_count; i++) {
disable_irq(gk20a->mc.irq_stall_lines[i]);
}
disable_irq(gk20a->mc.irq_stall);
if (gk20a->mc.irq_stall != gk20a->mc.irq_nonstall)
disable_irq(gk20a->mc.irq_nonstall);

5
drivers/gpu/nvgpu/os/linux/pci.c
View File

@@ -560,6 +560,11 @@ static int nvgpu_pci_probe(struct pci_dev *pdev,
goto err_disable_msi;
}
/* Number of stall interrupt line = 1 (for dgpu <= tu10x) */
g->mc.irq_stall_count = 1;
g->mc.irq_stall_lines[0] = g->mc.irq_stall;
err = devm_request_threaded_irq(&pdev->dev,
g->mc.irq_stall,
nvgpu_pci_isr,