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

misc: mods: update from Perforce

Browse Source 
Change-Id: Ie6a243dffa4b57eb42e514f77a58c811ba5f0a0a
Signed-off-by: Chris Dragan <kdragan@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3004417
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
Reviewed-by: svcacv <svcacv@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
This commit is contained in:
Chris Dragan
2023-10-26 06:20:31 -07:00
committed by mobile promotions
parent fe6d0617eb
commit 5cfb7fef0a
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/misc/mods/mods_bpmpipc.c
View File

@@ -10,10 +10,6 @@
#include <soc/tegra/ivc.h> #include <soc/tegra/ivc.h>
#include <soc/tegra/bpmp.h> #include <soc/tegra/bpmp.h>
#if (KERNEL_VERSION(6, 2, 0) <= MODS_KERNEL_VERSION)
#include <linux/iosys-map.h>
#endif
#define IVC_CHANNEL_SIZE 256 #define IVC_CHANNEL_SIZE 256
#define MRQ_MSG_SIZE 128 #define MRQ_MSG_SIZE 128
#define BPMP_MAIL_DO_ACK (1U << 0U) #define BPMP_MAIL_DO_ACK (1U << 0U)
@@ -68,7 +64,7 @@ static int bpmp_ipc_send(struct mods_client *client,
const void *data, const void *data,
size_t sz) size_t sz)
{ {
#if (KERNEL_VERSION(6, 2, 0) <= MODS_KERNEL_VERSION) #if (KERNEL_VERSION(6, 2, 0) <= MODS_KERNEL_VERSION) || defined(__IOSYS_MAP_H__)
int err; int err;
struct iosys_map ob; struct iosys_map ob;
@@ -101,7 +97,7 @@ static int bpmp_ipc_recv(struct mods_client *client,
u32 timeout_ms) u32 timeout_ms)
{ {
int err; int err;
#if (KERNEL_VERSION(6, 2, 0) <= MODS_KERNEL_VERSION) #if (KERNEL_VERSION(6, 2, 0) <= MODS_KERNEL_VERSION) || defined(__IOSYS_MAP_H__)
struct iosys_map ib; struct iosys_map ib;
#else #else
const void *frame; const void *frame;
@@ -110,7 +106,7 @@ static int bpmp_ipc_recv(struct mods_client *client,
end = ktime_add_ms(ktime_get(), timeout_ms); end = ktime_add_ms(ktime_get(), timeout_ms);
#if (KERNEL_VERSION(6, 2, 0) <= MODS_KERNEL_VERSION) #if (KERNEL_VERSION(6, 2, 0) <= MODS_KERNEL_VERSION) || defined(__IOSYS_MAP_H__)
do { do {
err = tegra_ivc_read_get_next_frame(ivc, &ib); err = tegra_ivc_read_get_next_frame(ivc, &ib);
if (!err) if (!err)
@@ -270,7 +266,7 @@ static int bpmp_ipc_channel_init(struct mods_client *client,
int err; int err;
ktime_t end; ktime_t end;
#if (KERNEL_VERSION(6, 2, 0) <= MODS_KERNEL_VERSION) #if (KERNEL_VERSION(6, 2, 0) <= MODS_KERNEL_VERSION) || defined(__IOSYS_MAP_H__)
struct iosys_map rx, tx; struct iosys_map rx, tx;
iosys_map_set_vaddr_iomem(&rx, bpmp_ipc_ch->resp_base); iosys_map_set_vaddr_iomem(&rx, bpmp_ipc_ch->resp_base);

11
drivers/misc/mods/mods_config.h
View File

@@ -7,8 +7,8 @@
#define MODS_KERNEL_VERSION LINUX_VERSION_CODE #define MODS_KERNEL_VERSION LINUX_VERSION_CODE
#if KERNEL_VERSION(2, 6, 30) <= MODS_KERNEL_VERSION && \ #if KERNEL_VERSION(2, 6, 30) <= MODS_KERNEL_VERSION && \
KERNEL_VERSION(4, 16, 0) > MODS_KERNEL_VERSION && \ KERNEL_VERSION(4, 16, 0) > MODS_KERNEL_VERSION && \
defined(CONFIG_X86) defined(CONFIG_X86)
# define MODS_HAS_DMA_OPS 1 # define MODS_HAS_DMA_OPS 1
#endif #endif
@@ -108,10 +108,9 @@
# define IS_MODULE(c) 0 # define IS_MODULE(c) 0
#endif #endif
#if ((defined(CONFIG_ARM_FFA_TRANSPORT) || \ #if ((defined(CONFIG_ARM_FFA_TRANSPORT) || IS_MODULE(CONFIG_ARM_FFA_TRANSPORT)) && \
IS_MODULE(CONFIG_ARM_FFA_TRANSPORT)) && \ defined(ALLOW_ARM_FFA_TRANSPORT_AS_MODULE)) || \
defined(ALLOW_ARM_FFA_TRANSPORT_AS_MODULE)) || \ IS_BUILTIN(CONFIG_ARM_FFA_TRANSPORT)
IS_BUILTIN(CONFIG_ARM_FFA_TRANSPORT)
# define MODS_HAS_ARM_FFA # define MODS_HAS_ARM_FFA
#endif #endif