From 5cfb7fef0ab9764b3ac930a3a72b55805baa6db9 Mon Sep 17 00:00:00 2001 From: Chris Dragan Date: Thu, 26 Oct 2023 06:20:31 -0700 Subject: [PATCH] misc: mods: update from Perforce Change-Id: Ie6a243dffa4b57eb42e514f77a58c811ba5f0a0a Signed-off-by: Chris Dragan Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3004417 GVS: Gerrit_Virtual_Submit Reviewed-by: svcacv Reviewed-by: Bharat Nihalani --- drivers/misc/mods/mods_bpmpipc.c | 12 ++++-------- drivers/misc/mods/mods_config.h | 11 +++++------ 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/drivers/misc/mods/mods_bpmpipc.c b/drivers/misc/mods/mods_bpmpipc.c index be06c311..c1e77bc5 100644 --- a/drivers/misc/mods/mods_bpmpipc.c +++ b/drivers/misc/mods/mods_bpmpipc.c @@ -10,10 +10,6 @@ #include #include -#if (KERNEL_VERSION(6, 2, 0) <= MODS_KERNEL_VERSION) -#include -#endif - #define IVC_CHANNEL_SIZE 256 #define MRQ_MSG_SIZE 128 #define BPMP_MAIL_DO_ACK (1U << 0U) @@ -68,7 +64,7 @@ static int bpmp_ipc_send(struct mods_client *client, const void *data, 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; struct iosys_map ob; @@ -101,7 +97,7 @@ static int bpmp_ipc_recv(struct mods_client *client, u32 timeout_ms) { 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; #else const void *frame; @@ -110,7 +106,7 @@ static int bpmp_ipc_recv(struct mods_client *client, 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 { err = tegra_ivc_read_get_next_frame(ivc, &ib); if (!err) @@ -270,7 +266,7 @@ static int bpmp_ipc_channel_init(struct mods_client *client, int err; 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; iosys_map_set_vaddr_iomem(&rx, bpmp_ipc_ch->resp_base); diff --git a/drivers/misc/mods/mods_config.h b/drivers/misc/mods/mods_config.h index 42f65a22..c43562b7 100644 --- a/drivers/misc/mods/mods_config.h +++ b/drivers/misc/mods/mods_config.h @@ -7,8 +7,8 @@ #define MODS_KERNEL_VERSION LINUX_VERSION_CODE #if KERNEL_VERSION(2, 6, 30) <= MODS_KERNEL_VERSION && \ - KERNEL_VERSION(4, 16, 0) > MODS_KERNEL_VERSION && \ - defined(CONFIG_X86) + KERNEL_VERSION(4, 16, 0) > MODS_KERNEL_VERSION && \ + defined(CONFIG_X86) # define MODS_HAS_DMA_OPS 1 #endif @@ -108,10 +108,9 @@ # define IS_MODULE(c) 0 #endif -#if ((defined(CONFIG_ARM_FFA_TRANSPORT) || \ - IS_MODULE(CONFIG_ARM_FFA_TRANSPORT)) && \ - defined(ALLOW_ARM_FFA_TRANSPORT_AS_MODULE)) || \ - IS_BUILTIN(CONFIG_ARM_FFA_TRANSPORT) +#if ((defined(CONFIG_ARM_FFA_TRANSPORT) || IS_MODULE(CONFIG_ARM_FFA_TRANSPORT)) && \ + defined(ALLOW_ARM_FFA_TRANSPORT_AS_MODULE)) || \ + IS_BUILTIN(CONFIG_ARM_FFA_TRANSPORT) # define MODS_HAS_ARM_FFA #endif