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

video: tegra: virt: separate dev and dt for init

Browse Source 
The dt node that includes ivc properties and the dev does not have to be
same node. GPU could be PCIE endpoint device which does not have
corresponding dt node, so GPU driver uses PCIE controller node to store
ivc properties.

Jira GVSCI-15779

Change-Id: Ibf9c8f17eac1accceee5fe8d5eca3521cda934b9
Signed-off-by: Richard Zhao <rizhao@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2884313
Reviewed-by: svcacv <svcacv@nvidia.com>
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: svc-mobile-cert <svc-mobile-cert@nvidia.com>
Reviewed-by: Austin Tajiri <atajiri@nvidia.com>
Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
Richard Zhao
2023-04-06 23:05:56 -07:00
committed by mobile promotions
parent be01df015d
commit 054f2a1a22
2 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/video/tegra/virt/tegra_gr_comm.c
View File

@@ -12,7 +12,6 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/of_platform.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <linux/kthread.h> #include <linux/kthread.h>
@@ -31,7 +30,7 @@ struct gr_comm_ivc_context {
wait_queue_head_t wq; wait_queue_head_t wq;
struct tegra_hv_ivc_cookie *cookie; struct tegra_hv_ivc_cookie *cookie;
struct gr_comm_queue *queue; struct gr_comm_queue *queue;
struct platform_device *pdev; struct device *dev;
bool irq_requested; bool irq_requested;
}; };
@@ -180,7 +179,7 @@ static irqreturn_t ivc_intr_isr(int irq, void *dev_id)
static irqreturn_t ivc_intr_thread(int irq, void *dev_id) static irqreturn_t ivc_intr_thread(int irq, void *dev_id)
{ {
struct gr_comm_ivc_context *ctx = dev_id; struct gr_comm_ivc_context *ctx = dev_id;
struct device *dev = &ctx->pdev->dev; struct device *dev = ctx->dev;
/* handle ivc state changes -- MUST BE FIRST */ /* handle ivc state changes -- MUST BE FIRST */
if (tegra_hv_ivc_channel_notified(ctx->cookie)) if (tegra_hv_ivc_channel_notified(ctx->cookie))
@@ -199,10 +198,9 @@ static irqreturn_t ivc_intr_thread(int irq, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int setup_mempool(struct platform_device *pdev, static int setup_mempool(struct device *dev, struct device_node *dn,
u32 queue_start, u32 queue_end) u32 queue_start, u32 queue_end)
{ {
struct device *dev = &pdev->dev;
int i, ret = -EINVAL; int i, ret = -EINVAL;
for (i = queue_start; i < queue_end; ++i) { for (i = queue_start; i < queue_end; ++i) {
@@ -214,7 +212,7 @@ static int setup_mempool(struct platform_device *pdev,
goto fail; goto fail;
} }
if (of_property_read_u32_index(dev->of_node, name, if (of_property_read_u32_index(dn, name,
PROP_MEMPOOL_INST, &inst) == 0) { PROP_MEMPOOL_INST, &inst) == 0) {
struct gr_comm_mempool_context *ctx; struct gr_comm_mempool_context *ctx;
struct gr_comm_queue *queue = struct gr_comm_queue *queue =
@@ -252,10 +250,9 @@ fail:
return ret; return ret;
} }
static int setup_ivc(struct platform_device *pdev, static int setup_ivc(struct device *dev, struct device_node *dn,
u32 queue_start, u32 queue_end) u32 queue_start, u32 queue_end)
{ {
struct device *dev = &pdev->dev;
int i, ret = -EINVAL; int i, ret = -EINVAL;
for (i = queue_start; i < queue_end; ++i) { for (i = queue_start; i < queue_end; ++i) {
@@ -267,7 +264,7 @@ static int setup_ivc(struct platform_device *pdev,
goto fail; goto fail;
} }
if (of_property_read_u32_index(dev->of_node, name, if (of_property_read_u32_index(dn, name,
PROP_IVC_INST, &inst) == 0) { PROP_IVC_INST, &inst) == 0) {
struct device_node *hv_dn; struct device_node *hv_dn;
struct gr_comm_ivc_context *ctx; struct gr_comm_ivc_context *ctx;
@@ -275,7 +272,7 @@ static int setup_ivc(struct platform_device *pdev,
&comm_context.queue[i]; &comm_context.queue[i];
int err; int err;
hv_dn = of_parse_phandle(dev->of_node, name, hv_dn = of_parse_phandle(dn, name,
PROP_IVC_NODE); PROP_IVC_NODE);
if (!hv_dn) if (!hv_dn)
goto fail; goto fail;
@@ -286,7 +283,7 @@ static int setup_ivc(struct platform_device *pdev,
goto fail; goto fail;
} }
ctx->pdev = pdev; ctx->dev = dev;
ctx->queue = queue; ctx->queue = queue;
init_waitqueue_head(&ctx->wq); init_waitqueue_head(&ctx->wq);
@@ -338,12 +335,11 @@ fail:
return ret; return ret;
} }
int tegra_gr_comm_init(struct platform_device *pdev, u32 elems, int tegra_gr_comm_init(struct device *dev, struct device_node *dn, u32 elems,
const size_t *queue_sizes, u32 queue_start, u32 num_queues) const size_t *queue_sizes, u32 queue_start, u32 num_queues)
{ {
int i = 0, j; int i = 0, j;
int ret = 0; int ret = 0;
struct device *dev = &pdev->dev;
u32 queue_end = queue_start + num_queues; u32 queue_end = queue_start + num_queues;
if (queue_end > NUM_QUEUES) if (queue_end > NUM_QUEUES)
@@ -398,13 +394,13 @@ int tegra_gr_comm_init(struct platform_device *pdev, u32 elems,
queue->valid = true; queue->valid = true;
} }
ret = setup_ivc(pdev, queue_start, queue_end); ret = setup_ivc(dev, dn, queue_start, queue_end);
if (ret) { if (ret) {
dev_err(dev, "invalid IVC DT data\n"); dev_err(dev, "invalid IVC DT data\n");
goto fail; goto fail;
} }
ret = setup_mempool(pdev, queue_start, queue_end); ret = setup_mempool(dev, dn, queue_start, queue_end);
if (ret) { if (ret) {
dev_err(dev, "mempool setup failed\n"); dev_err(dev, "mempool setup failed\n");
goto fail; goto fail;
@@ -496,11 +492,11 @@ int tegra_gr_comm_send(u32 peer, u32 index, void *data,
msecs_to_jiffies(500)); msecs_to_jiffies(500));
if (!ret) { if (!ret) {
if (retries > 0) { if (retries > 0) {
dev_warn(&ivc_ctx->pdev->dev, dev_warn(ivc_ctx->dev,
"%s retrying (remaining %d times)\n", "%s retrying (remaining %d times)\n",
__func__, retries--); __func__, retries--);
} else { } else {
dev_err(&ivc_ctx->pdev->dev, dev_err(ivc_ctx->dev,
"%s timeout waiting for buffer\n", "%s timeout waiting for buffer\n",
__func__); __func__);
return -ENOMEM; return -ENOMEM;
@@ -565,7 +561,7 @@ int tegra_gr_comm_sendrecv(u32 peer, u32 index, void **handle,
goto fail; goto fail;
err = tegra_gr_comm_recv(index, handle, data, size, NULL); err = tegra_gr_comm_recv(index, handle, data, size, NULL);
if (unlikely(err)) if (unlikely(err))
dev_err(&queue->ivc_ctx->pdev->dev, dev_err(queue->ivc_ctx->dev,
"tegra_gr_comm_recv: timeout for response!\n"); "tegra_gr_comm_recv: timeout for response!\n");
fail: fail:
mutex_unlock(&queue->resp_lock); mutex_unlock(&queue->resp_lock);

4
include/linux/tegra_gr_comm.h
View File

@@ -8,11 +8,11 @@
#ifndef __TEGRA_GR_COMM_H #ifndef __TEGRA_GR_COMM_H
#define __TEGRA_GR_COMM_H #define __TEGRA_GR_COMM_H
#include <linux/platform_device.h> #include <linux/device.h>
#define TEGRA_GR_COMM_ID_SELF (0xFF) #define TEGRA_GR_COMM_ID_SELF (0xFF)
int tegra_gr_comm_init(struct platform_device *pdev, u32 elems, int tegra_gr_comm_init(struct device *dev, struct device_node *dn, u32 elems,
const size_t *queue_sizes, u32 queue_start, u32 num_queues); const size_t *queue_sizes, u32 queue_start, u32 num_queues);
void tegra_gr_comm_deinit(u32 queue_start, u32 num_queues); void tegra_gr_comm_deinit(u32 queue_start, u32 num_queues);
int tegra_gr_comm_send(u32 peer, u32 index, void *data, int tegra_gr_comm_send(u32 peer, u32 index, void *data,