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

tegra: nvmap: make sciipc_id as 64 bit

Browse Source 
Make SciIpc_Id as 64 bit.

Bug 3715617

Change-Id: If0f6db9d42b527554b77c4768d0f42d276c6a97c
Signed-off-by: Puneet Saxena <puneets@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2783704
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: svc-mobile-cert <svc-mobile-cert@nvidia.com>
Reviewed-by: Pritesh Raithatha <praithatha@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
Puneet Saxena
2022-09-28 16:06:19 +00:00
committed by Laxman Dewangan
parent a3201ec3fe
commit d1c06c1dce
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/video/tegra/nvmap/nvmap_sci_ipc.c
View File

@@ -46,7 +46,7 @@ struct nvmap_sci_ipc_entry {
struct rb_node entry; struct rb_node entry;
struct nvmap_client *client; struct nvmap_client *client;
struct nvmap_handle *handle; struct nvmap_handle *handle;
u32 sci_ipc_id; u64 sci_ipc_id;
u64 peer_vuid; u64 peer_vuid;
u32 flags; u32 flags;
u32 refcount; u32 refcount;
@@ -80,10 +80,10 @@ out:
return ret; return ret;
} }
static u32 nvmap_unique_sci_ipc_id(void) static u64 nvmap_unique_sci_ipc_id(void)
{ {
static atomic_t unq_id = { 0 }; static atomic_t unq_id = { 0 };
u32 id; u64 id;
if (!list_empty(&nvmapsciipc->free_sid_list)) { if (!list_empty(&nvmapsciipc->free_sid_list)) {
struct free_sid_node *fnode = list_first_entry( struct free_sid_node *fnode = list_first_entry(
@@ -129,7 +129,7 @@ static void nvmap_insert_sci_ipc_entry(struct rb_root *root,
{ {
struct nvmap_sci_ipc_entry *entry; struct nvmap_sci_ipc_entry *entry;
struct rb_node *parent = NULL; struct rb_node *parent = NULL;
u32 sid = new->sci_ipc_id; u64 sid = new->sci_ipc_id;
struct rb_node **link; struct rb_node **link;
link = &root->rb_node; link = &root->rb_node;
@@ -152,14 +152,14 @@ static void nvmap_insert_sci_ipc_entry(struct rb_root *root,
int nvmap_create_sci_ipc_id(struct nvmap_client *client, int nvmap_create_sci_ipc_id(struct nvmap_client *client,
struct nvmap_handle *h, struct nvmap_handle *h,
u32 flags, u32 flags,
u32 *sci_ipc_id, u64 *sci_ipc_id,
NvSciIpcEndpointVuid peer_vuid, NvSciIpcEndpointVuid peer_vuid,
bool is_ro) bool is_ro)
{ {
struct nvmap_sci_ipc_entry *new_entry; struct nvmap_sci_ipc_entry *new_entry;
struct nvmap_sci_ipc_entry *entry; struct nvmap_sci_ipc_entry *entry;
int ret = -EINVAL; int ret = -EINVAL;
u32 id; u64 id;
mutex_lock(&nvmapsciipc->mlock); mutex_lock(&nvmapsciipc->mlock);
@@ -168,7 +168,7 @@ int nvmap_create_sci_ipc_id(struct nvmap_client *client,
if (entry) { if (entry) {
entry->refcount++; entry->refcount++;
*sci_ipc_id = entry->sci_ipc_id; *sci_ipc_id = entry->sci_ipc_id;
pr_debug("%d: matched Sci_Ipc_Id:%u\n", __LINE__, *sci_ipc_id); pr_debug("%d: matched Sci_Ipc_Id:%llu\n", __LINE__, *sci_ipc_id);
ret = 0; ret = 0;
goto unlock; goto unlock;
} else { } else {
@@ -186,7 +186,7 @@ int nvmap_create_sci_ipc_id(struct nvmap_client *client,
new_entry->flags = flags; new_entry->flags = flags;
new_entry->refcount = 1; new_entry->refcount = 1;
pr_debug("%d: New Sci_ipc_id %d entry->pr_vuid: %llu entry->flags: %u new_entry->handle:0x%p\n", pr_debug("%d: New Sci_ipc_id %lld entry->pr_vuid: %llu entry->flags: %u new_entry->handle:0x%p\n",
__LINE__, new_entry->sci_ipc_id, new_entry->peer_vuid, __LINE__, new_entry->sci_ipc_id, new_entry->peer_vuid,
new_entry->flags, new_entry->handle); new_entry->flags, new_entry->handle);
@@ -202,7 +202,7 @@ unlock:
} }
static struct nvmap_sci_ipc_entry *nvmap_find_entry_for_id(struct rb_root *es, static struct nvmap_sci_ipc_entry *nvmap_find_entry_for_id(struct rb_root *es,
u32 id) u64 id)
{ {
struct nvmap_sci_ipc_entry *e = NULL; struct nvmap_sci_ipc_entry *e = NULL;
struct rb_node *n; struct rb_node *n;
@@ -217,7 +217,7 @@ found:
} }
int nvmap_get_handle_from_sci_ipc_id(struct nvmap_client *client, u32 flags, int nvmap_get_handle_from_sci_ipc_id(struct nvmap_client *client, u32 flags,
u32 sci_ipc_id, NvSciIpcEndpointVuid localu_vuid, u32 *handle) u64 sci_ipc_id, NvSciIpcEndpointVuid localu_vuid, u32 *handle)
{ {
bool is_ro = (flags == PROT_READ) ? true : false, dmabuf_created = false; bool is_ro = (flags == PROT_READ) ? true : false, dmabuf_created = false;
struct nvmap_handle_ref *ref = NULL; struct nvmap_handle_ref *ref = NULL;
@@ -229,14 +229,14 @@ int nvmap_get_handle_from_sci_ipc_id(struct nvmap_client *client, u32 flags,
mutex_lock(&nvmapsciipc->mlock); mutex_lock(&nvmapsciipc->mlock);
pr_debug("%d: Sci_Ipc_Id %d local_vuid: %llu flags: %u\n", pr_debug("%d: Sci_Ipc_Id %lld local_vuid: %llu flags: %u\n",
__LINE__, sci_ipc_id, localu_vuid, flags); __LINE__, sci_ipc_id, localu_vuid, flags);
entry = nvmap_find_entry_for_id(&nvmapsciipc->entries, sci_ipc_id); entry = nvmap_find_entry_for_id(&nvmapsciipc->entries, sci_ipc_id);
if ((entry == NULL) || (entry->handle == NULL) || if ((entry == NULL) || (entry->handle == NULL) ||
(entry->peer_vuid != localu_vuid) || (entry->flags != flags)) { (entry->peer_vuid != localu_vuid) || (entry->flags != flags)) {
pr_debug("%d: No matching Sci_Ipc_Id %d found\n", pr_debug("%d: No matching Sci_Ipc_Id %lld found\n",
__LINE__, sci_ipc_id); __LINE__, sci_ipc_id);
ret = -EINVAL; ret = -EINVAL;

6
drivers/video/tegra/nvmap/nvmap_sci_ipc.h
View File

@@ -3,7 +3,7 @@
* *
* mapping between nvmap_hnadle and sci_ipc entery * mapping between nvmap_hnadle and sci_ipc entery
* *
* Copyright (c) 2019-2021, NVIDIA CORPORATION. All rights reserved. * Copyright (c) 2019-2022, NVIDIA CORPORATION. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License, * under the terms and conditions of the GNU General Public License,
@@ -25,13 +25,13 @@ int nvmap_validate_sci_ipc_params(struct nvmap_client *client,
int nvmap_create_sci_ipc_id(struct nvmap_client *client, int nvmap_create_sci_ipc_id(struct nvmap_client *client,
struct nvmap_handle *h, struct nvmap_handle *h,
u32 flags, u32 flags,
u32 *sci_ipc_id, u64 *sci_ipc_id,
NvSciIpcEndpointVuid pr_vuid, NvSciIpcEndpointVuid pr_vuid,
bool is_ro); bool is_ro);
int nvmap_get_handle_from_sci_ipc_id(struct nvmap_client *client, int nvmap_get_handle_from_sci_ipc_id(struct nvmap_client *client,
u32 flags, u32 flags,
u32 sci_ipc_id, u64 sci_ipc_id,
NvSciIpcEndpointVuid localusr_vuid, NvSciIpcEndpointVuid localusr_vuid,
u32 *h); u32 *h);
#endif /* __VIDEO_TEGRA_NVMAP_SCI_IPC_H */ #endif /* __VIDEO_TEGRA_NVMAP_SCI_IPC_H */

2
include/uapi/linux/nvmap.h
View File

@@ -221,7 +221,7 @@ struct nvmap_heap_size {
struct nvmap_sciipc_map { struct nvmap_sciipc_map {
__u64 auth_token; /* AuthToken */ __u64 auth_token; /* AuthToken */
__u32 flags; /* Exporter permission flags */ __u32 flags; /* Exporter permission flags */
__u32 sci_ipc_id; /* FromImportId */ __u64 sci_ipc_id; /* FromImportId */
__u32 handle; /* Nvmap handle */ __u32 handle; /* Nvmap handle */
}; };