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 to 4.22

Browse Source 
Bug 4119327

Change-Id: I7704293f7fce103e9fba6b088da8081987da36c5
Signed-off-by: Chris Dragan <kdragan@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2993627
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
This commit is contained in:
Chris Dragan
2023-10-09 03:44:24 -07:00
committed by mobile promotions
parent dc189dfb94
commit 51d4ae99d9
6 changed files with 27 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/misc/mods/mods_acpi.c
View File

@@ -76,17 +76,19 @@ struct acpi_dev_check_context {
void *out_data; void *out_data;
}; };
static int acpi_dev_check_one(struct acpi_device *adev, void *data) static int acpi_dev_check_one(struct device *dev, void *data)
{ {
int err = OK; struct acpi_dev_check_context *adwc = data;
unsigned long long device_id = 0; struct acpi_device *adev = to_acpi_device(dev);
acpi_status status; int err = OK;
struct acpi_dev_check_context *adwc = data; unsigned long long device_id = 0;
acpi_status status;
status = acpi_evaluate_integer(adev->handle, if (!adev)
"_ADR", /* No ACPI device corresponding to this device */
NULL, return OK;
&device_id);
status = acpi_evaluate_integer(adev->handle, "_ADR", NULL, &device_id);
if (ACPI_FAILURE(status)) if (ACPI_FAILURE(status))
/* Couldnt query device_id for this device */ /* Couldnt query device_id for this device */
return OK; return OK;
@@ -95,26 +97,6 @@ static int acpi_dev_check_one(struct acpi_device *adev, void *data)
return ((err == -EALREADY) ? OK : err); return ((err == -EALREADY) ? OK : err);
} }
#if KERNEL_VERSION(6, 0, 0) > MODS_KERNEL_VERSION
static int acpi_dev_each_child_node(struct acpi_device *adev,
int (*fptr)(struct acpi_device *, void *),
void *data)
{
struct list_head *node = NULL;
struct list_head *next = NULL;
list_for_each_safe(node, next, &adev->children) {
struct acpi_device *dev =
list_entry(node, struct acpi_device, node);
fptr(dev, data);
}
return OK;
}
#else
#define acpi_dev_each_child_node acpi_dev_for_each_child
#endif
static int acpi_get_dev_children(struct mods_client *client, static int acpi_get_dev_children(struct mods_client *client,
dev_children_fptr fptr, dev_children_fptr fptr,
acpi_handle dev_handle, acpi_handle dev_handle,
@@ -139,7 +121,7 @@ static int acpi_get_dev_children(struct mods_client *client,
if (unlikely(err)) if (unlikely(err))
cl_error("ACPI: device for fetching device children not found\n"); cl_error("ACPI: device for fetching device children not found\n");
else else
err = acpi_dev_each_child_node(device, acpi_dev_check_one, &adcc); err = device_for_each_child(&device->dev, &adcc, acpi_dev_check_one);
LOG_EXT(); LOG_EXT();
return err; return err;

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

@@ -104,8 +104,14 @@
# define IS_BUILTIN(c) 0 # define IS_BUILTIN(c) 0
#endif #endif
#if (defined(CONFIG_ARM_FFA_TRANSPORT) && defined(ALLOW_ARM_FFA_TRANSPORT_AS_MODULE)) || \ #ifndef IS_MODULE
IS_BUILTIN(CONFIG_ARM_FFA_TRANSPORT) # 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)
# define MODS_HAS_ARM_FFA # define MODS_HAS_ARM_FFA
#endif #endif

2
drivers/misc/mods/mods_internal.h
View File

@@ -355,8 +355,10 @@ struct mods_priv {
#if KERNEL_VERSION(5, 11, 0) <= MODS_KERNEL_VERSION #if KERNEL_VERSION(5, 11, 0) <= MODS_KERNEL_VERSION
# define MODS_KMAP kmap_local_page # define MODS_KMAP kmap_local_page
# define MODS_KUNMAP kunmap_local
#else #else
# define MODS_KMAP kmap # define MODS_KMAP kmap
# define MODS_KUNMAP kunmap
#endif #endif
/* ************************************************************************* */ /* ************************************************************************* */

2
drivers/misc/mods/mods_krnl.c
View File

@@ -1012,7 +1012,7 @@ static int mods_krnl_vma_access(struct vm_area_struct *vma,
else else
memcpy(buf, bptr, len); memcpy(buf, bptr, len);
kunmap(ptr); MODS_KUNMAP(ptr);
err = len; err = len;
} else } else

6
drivers/misc/mods/mods_mem.c
View File

@@ -428,7 +428,7 @@ static int setup_cache_attr(struct mods_client *client,
else else
err = MODS_SET_MEMORY_UC((unsigned long)ptr, 1); err = MODS_SET_MEMORY_UC((unsigned long)ptr, 1);
#endif #endif
kunmap(ptr); MODS_KUNMAP(ptr);
if (unlikely(err)) { if (unlikely(err)) {
cl_error("set cache type failed\n"); cl_error("set cache type failed\n");
return err; return err;
@@ -547,7 +547,7 @@ static int restore_cache_one_chunk(struct page *p_page, u8 order)
if (likely(ptr)) if (likely(ptr))
err = MODS_SET_MEMORY_WB((unsigned long)ptr, 1); err = MODS_SET_MEMORY_WB((unsigned long)ptr, 1);
kunmap(ptr); MODS_KUNMAP(ptr);
if (likely(!final_err)) if (likely(!final_err))
final_err = err; final_err = err;
@@ -2461,7 +2461,7 @@ static void clear_contiguous_cache(struct mods_client *client,
static u32 d_line_shift; static u32 d_line_shift;
if (!d_line_shift) { if (!d_line_shift) {
#if KERNEL_VERSION(6, 0, 0) <= MODS_KERNEL_VERSION #ifdef CTR_EL0_DminLine_SHIFT
const u64 ctr_el0 = read_sanitised_ftr_reg(SYS_CTR_EL0); const u64 ctr_el0 = read_sanitised_ftr_reg(SYS_CTR_EL0);
d_line_shift = d_line_shift =

2
include/uapi/misc/mods.h
View File

@@ -8,7 +8,7 @@
/* Driver version */ /* Driver version */
#define MODS_DRIVER_VERSION_MAJOR 4 #define MODS_DRIVER_VERSION_MAJOR 4
#define MODS_DRIVER_VERSION_MINOR 21 #define MODS_DRIVER_VERSION_MINOR 22
#define MODS_DRIVER_VERSION ((MODS_DRIVER_VERSION_MAJOR << 8) | \ #define MODS_DRIVER_VERSION ((MODS_DRIVER_VERSION_MAJOR << 8) | \
((MODS_DRIVER_VERSION_MINOR / 10) << 4) | \ ((MODS_DRIVER_VERSION_MINOR / 10) << 4) | \
(MODS_DRIVER_VERSION_MINOR % 10)) (MODS_DRIVER_VERSION_MINOR % 10))