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

tsec: allow sending more than 1 cmd to same unit

Browse Source 
This change removes the check in tsec comms part of dce
which blocks sending more than 1 command to tsec fw for the
same unit. This is to let the display driver force send
command to tsec fw when it is in the middle of a command
to inform it about certain events ex: hotplug. Tsec driver
should trust that display driver is doing checks when sending
the command to tsec fw.

Bug 5008088

Change-Id: Id765c558a8350c501466685d3894a2c8349550eb
Signed-off-by: spatki <spatki@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3288182
Reviewed-by: Nikesh Oswal <noswal@nvidia.com>
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
spatki
2025-01-22 06:43:52 +00:00
committed by Jon Hunter
parent f552a45569
commit 0b1641eee3
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/video/tegra/tsec/Makefile
View File

@@ -3,5 +3,7 @@
GCOV_PROFILE := y GCOV_PROFILE := y
LINUXINCLUDE += -I$(srctree.nvidia-oot)/drivers/video/tegra/tsec
obj-m += tsecriscv.o obj-m += tsecriscv.o
tsecriscv-y := tsec_comms/tsec_comms.o tsec_boot.o tsec.o tsecriscv-y := tsec_comms/tsec_comms.o tsec_boot.o tsec.o

15
drivers/video/tegra/tsec/tsec_comms/tsec_comms.c
View File

@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* /*
* SPDX-FileCopyrightText: Copyright (c) 2022-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. * SPDX-FileCopyrightText: Copyright (c) 2022-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
* *
* Tegra TSEC Module Support * Tegra TSEC Module Support
*/ */
@@ -9,6 +9,7 @@
#include "tsec_comms.h" #include "tsec_comms.h"
#include "tsec_comms_regs.h" #include "tsec_comms_regs.h"
#include "tsec_comms_cmds.h" #include "tsec_comms_cmds.h"
#include "tsec_cmds.h"
#define TSEC_QUEUE_POLL_INTERVAL_US (50) #define TSEC_QUEUE_POLL_INTERVAL_US (50)
#define TSEC_QUEUE_POLL_COUNT (2000) #define TSEC_QUEUE_POLL_COUNT (2000)
@@ -71,6 +72,7 @@ shutdown_callback_func_t s_ext_fw_shutdown_cb;
struct callback_t { struct callback_t {
callback_func_t cb_func; callback_func_t cb_func;
void *cb_ctx; void *cb_ctx;
u8 cmd_type;
}; };
static struct callback_t s_callbacks[RM_GSP_UNIT_END]; static struct callback_t s_callbacks[RM_GSP_UNIT_END];
@@ -634,6 +636,7 @@ int tsec_comms_send_cmd(void *cmd, u32 queue_id,
u32 head; u32 head;
u32 tail; u32 tail;
u8 cmd_size; u8 cmd_size;
u8 cmd_type;
u32 cmd_size_aligned; u32 cmd_size_aligned;
u32 cmdq_head_reg; u32 cmdq_head_reg;
u32 cmdq_tail_reg; u32 cmdq_tail_reg;
@@ -682,13 +685,14 @@ int tsec_comms_send_cmd(void *cmd, u32 queue_id,
return -TSEC_EINVAL; return -TSEC_EINVAL;
} }
cmd_type = ((struct RM_FLCN_CMD_GSP *)cmd)->cmd.hdcp.cmdType;
cmd_hdr = (struct RM_FLCN_QUEUE_HDR *)cmd; cmd_hdr = (struct RM_FLCN_QUEUE_HDR *)cmd;
tsec_plat_acquire_comms_mutex(); tsec_plat_acquire_comms_mutex();
if (s_callbacks[cmd_hdr->unitId].cb_func) { if (s_callbacks[cmd_hdr->unitId].cb_func) {
tsec_plat_release_comms_mutex(); plat_print(LVL_DBG, "Force sending to Unit:0x%x Cmd:0x%x, \
plat_print(LVL_ERR, "more than 1 outstanding cmd for unit 0x%x\n", PendingCmd:0x%x",
cmd_hdr->unitId); cmd_hdr->unitId, cmd_type,
return -TSEC_EINVAL; s_callbacks[cmd_hdr->unitId].cmd_type);
} }
tsec_plat_release_comms_mutex(); tsec_plat_release_comms_mutex();
cmd_size = cmd_hdr->size; cmd_size = cmd_hdr->size;
@@ -742,6 +746,7 @@ enqueue:
tsec_plat_acquire_comms_mutex(); tsec_plat_acquire_comms_mutex();
s_callbacks[cmd_hdr->unitId].cb_func = cb_func; s_callbacks[cmd_hdr->unitId].cb_func = cb_func;
s_callbacks[cmd_hdr->unitId].cb_ctx = cb_ctx; s_callbacks[cmd_hdr->unitId].cb_ctx = cb_ctx;
s_callbacks[cmd_hdr->unitId].cmd_type = cmd_type;
tsec_plat_release_comms_mutex(); tsec_plat_release_comms_mutex();
if (ipc_write(head, (u8 *)cmd, cmd_size)) { if (ipc_write(head, (u8 *)cmd, cmd_size)) {
tsec_plat_acquire_comms_mutex(); tsec_plat_acquire_comms_mutex();