550.120

kernel-open/nvidia/linux_nvswitch.c

@@ -31,6 +31,7 @@
 #include "nvCpuUuid.h"
 #include "nv-time.h"
 #include "nvlink_caps.h"
+#include "nvlink_proto.h"
 
 #include <linux/module.h>
 #include <linux/interrupt.h>
@@ -49,7 +50,7 @@
 
 #include "ioctl_nvswitch.h"
 
-const static struct
+static const struct
 {
     NvlStatus status;
     int err;

kernel-open/nvidia/nv-caps-imex.c

@@ -22,6 +22,7 @@
  */
 
 #include "nv-linux.h"
+#include "nv-caps-imex.h"
 
 extern int NVreg_ImexChannelCount;
 

kernel-open/nvidia/nv-caps.c

@@ -267,7 +267,7 @@ static void nv_cap_procfs_exit(void)
     nv_cap_procfs_dir = NULL;
 }
 
-int nv_cap_procfs_init(void)
+static int nv_cap_procfs_init(void)
 {
     static struct proc_dir_entry *file_entry;
 

kernel-open/nvidia/nv-dma.c

@@ -290,7 +290,7 @@ void nv_destroy_dma_map_scatterlist(nv_dma_map_t *dma_map)
     os_free_mem(dma_map->mapping.discontig.submaps);
 }
 
-void nv_load_dma_map_scatterlist(
+static void nv_load_dma_map_scatterlist(
     nv_dma_map_t *dma_map,
     NvU64 *va_array
 )
@@ -486,7 +486,7 @@ NV_STATUS NV_API_CALL nv_dma_map_sgt(
     return status;
 }
 
-NV_STATUS NV_API_CALL nv_dma_unmap_sgt(
+static NV_STATUS NV_API_CALL nv_dma_unmap_sgt(
     nv_dma_device_t *dma_dev,
     void           **priv
 )

kernel-open/nvidia/nv-ibmnpu.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2017-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright (c) 2017-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -25,9 +25,9 @@
  * nv-ibmnpu.c - interface with the ibmnpu (IBM NVLink Processing Unit) "module"
  */
 #include "nv-linux.h"
+#include "nv-ibmnpu.h"
 
 #if defined(NVCPU_PPC64LE)
-#include "nv-ibmnpu.h"
 #include "nv-rsync.h"
 
 /*

kernel-open/nvidia/nv-kthread-q.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2016 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright (c) 2016-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -176,7 +176,7 @@ static struct task_struct *thread_create_on_node(int (*threadfn)(void *data),
 {
 
     unsigned i, j;
-    const static unsigned attempts = 3;
+    static const unsigned attempts = 3;
     struct task_struct *thread[3];
 
     for (i = 0;; i++) {

kernel-open/nvidia/nv-mmap.c

@@ -368,7 +368,7 @@ int nv_encode_caching(
     return 0;
 }
 
-int static nvidia_mmap_peer_io(
+static int nvidia_mmap_peer_io(
     struct vm_area_struct *vma,
     nv_alloc_t *at,
     NvU64 page_index,
@@ -389,7 +389,7 @@ int static nvidia_mmap_peer_io(
     return ret;
 }
 
-int static nvidia_mmap_sysmem(
+static int nvidia_mmap_sysmem(
     struct vm_area_struct *vma,
     nv_alloc_t *at,
     NvU64 page_index,

kernel-open/nvidia/nv-procfs.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: Copyright (c) 1999-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright (c) 1999-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -694,7 +694,7 @@ static nv_proc_ops_t nv_procfs_suspend_fops = {
 /*
  * Forwards error to nv_log_error which exposes data to vendor callback
  */
-void
+static void
 exercise_error_forwarding_va(
     nv_state_t *nv,
     NvU32 err,

kernel-open/nvidia/nv-report-err.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2017 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright (c) 2017-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -29,7 +29,7 @@
 
 nv_report_error_cb_t nv_error_cb_handle = NULL;
 
-int nv_register_error_cb(nv_report_error_cb_t report_error_cb)
+int nvidia_register_error_cb(nv_report_error_cb_t report_error_cb)
 {
     if (report_error_cb == NULL)
         return -EINVAL;
@@ -41,9 +41,9 @@ int nv_register_error_cb(nv_report_error_cb_t report_error_cb)
     return 0;
 }
 
-EXPORT_SYMBOL(nv_register_error_cb);
+EXPORT_SYMBOL(nvidia_register_error_cb);
 
-int nv_unregister_error_cb(void)
+int nvidia_unregister_error_cb(void)
 {
     if (nv_error_cb_handle == NULL)
         return -EPERM;
@@ -52,9 +52,7 @@ int nv_unregister_error_cb(void)
     return 0;
 }
 
-EXPORT_SYMBOL(nv_unregister_error_cb);
-
-struct pci_dev;
+EXPORT_SYMBOL(nvidia_unregister_error_cb);
 
 void nv_report_error(
     struct pci_dev *dev,
@@ -63,27 +61,17 @@ void nv_report_error(
     va_list         ap
 )
 {
-    va_list ap_copy;
     char *buffer;
-    int length = 0;
-    int status = NV_OK;
+    gfp_t gfp = NV_MAY_SLEEP() ? NV_GFP_NO_OOM : NV_GFP_ATOMIC;
 
-    if (nv_error_cb_handle != NULL)
-    {
-        va_copy(ap_copy, ap);
-        length = vsnprintf(NULL, 0, format, ap);
-        va_end(ap_copy);
+    if (nv_error_cb_handle == NULL)
+        return;
 
-        if (length > 0)
-        {
-            status = os_alloc_mem((void *)&buffer, (length + 1)*sizeof(char));
+    buffer = kvasprintf(gfp, format, ap);
 
-            if (status == NV_OK)
-            {
-                vsnprintf(buffer, length, format, ap);
-                nv_error_cb_handle(dev, error_number, buffer, length + 1);
-                os_free_mem(buffer);
-            }
-        }
-    }
+    if (buffer == NULL)
+        return;
+
+    nv_error_cb_handle(dev, error_number, buffer, strlen(buffer) + 1);
+    kfree(buffer);
 }

kernel-open/nvidia/nv-report-err.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2017 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright (c) 2017-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -37,7 +37,7 @@
  * @param[in]    int
  *   Length of error string.
  */
-typedef void (*nv_report_error_cb_t)(struct pci_dev *, uint32_t, char *, int);
+typedef void (*nv_report_error_cb_t)(struct pci_dev *, uint32_t, char *, size_t);
 
 /*
  * @brief
@@ -51,7 +51,7 @@ typedef void (*nv_report_error_cb_t)(struct pci_dev *, uint32_t, char *, int);
  *   -EINVAL     callback handle is NULL.
  *   -EBUSY      callback handle is already registered.
  */
-int nv_register_error_cb(nv_report_error_cb_t report_error_cb);
+int nvidia_register_error_cb(nv_report_error_cb_t report_error_cb);
 
 /*
  * @brief
@@ -61,6 +61,6 @@ int nv_register_error_cb(nv_report_error_cb_t report_error_cb);
  *   0           upon successful completion.
  *   -EPERM      unregister not permitted on NULL callback handle.
  */
-int nv_unregister_error_cb(void);
+int nvidia_unregister_error_cb(void);
 
 #endif /* _NV_REPORT_ERR_H_ */

kernel-open/nvidia/nv.c

@@ -1268,12 +1268,6 @@ static int validate_numa_start_state(nv_linux_state_t *nvl)
     return rc;
 }
 
-NV_STATUS NV_API_CALL nv_get_num_dpaux_instances(nv_state_t *nv, NvU32 *num_instances)
-{
-    *num_instances = nv->num_dpaux_instance;
-    return NV_OK;
-}
-
 void NV_API_CALL
 nv_schedule_uvm_isr(nv_state_t *nv)
 {

kernel-open/nvidia/nvlink_linux.c

@@ -27,6 +27,7 @@
 #include "nvlink_linux.h"
 #include "nvlink_errors.h"
 #include "nvlink_export.h"
+#include "nvlink_proto.h"
 #include "nv-linux.h"
 #include "nv-procfs.h"
 #include "nv-time.h"

kernel-open/nvidia/os-interface.c

@@ -402,7 +402,7 @@ NvS32 NV_API_CALL os_string_compare(const char *str1, const char *str2)
     return strcmp(str1, str2);
 }
 
-void *os_mem_copy_custom(
+static void *os_mem_copy_custom(
     void       *dstPtr,
     const void *srcPtr,
     NvU32       length