595.71.05

Author: aritger

README.md

@@ -1,7 +1,7 @@
 # NVIDIA Linux Open GPU Kernel Module Source
 
 This is the source release of the NVIDIA Linux open GPU kernel modules,
-version 595.58.03.
+version 595.71.05.
 
 
 ## How to Build
@@ -17,7 +17,7 @@ as root:
 
 Note that the kernel modules built here must be used with GSP
 firmware and user-space NVIDIA GPU driver components from a corresponding
-595.58.03 driver release.  This can be achieved by installing
+595.71.05 driver release.  This can be achieved by installing
 the NVIDIA GPU driver from the .run file using the `--no-kernel-modules`
 option.  E.g.,
 
@@ -185,7 +185,7 @@ table below).
 For details on feature support and limitations, see the NVIDIA GPU driver
 end user README here:
 
-https://us.download.nvidia.com/XFree86/Linux-x86_64/595.58.03/README/kernel_open.html
+https://us.download.nvidia.com/XFree86/Linux-x86_64/595.71.05/README/kernel_open.html
 
 For vGPU support, please refer to the README.vgpu packaged in the vGPU Host
 Package for more details.

kernel-open/Kbuild

@@ -79,7 +79,7 @@ ccflags-y += -I$(src)/common/inc
 ccflags-y += -I$(src)
 ccflags-y += -Wall $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-format-extra-args
 ccflags-y += -D__KERNEL__ -DMODULE -DNVRM
-ccflags-y += -DNV_VERSION_STRING=\"595.58.03\"
+ccflags-y += -DNV_VERSION_STRING=\"595.71.05\"
 
 # Include and link Tegra out-of-tree modules.
 ifneq ($(wildcard /usr/src/nvidia/nvidia-public),)

kernel-open/Makefile

@@ -71,31 +71,6 @@ else
   CC ?= cc
   LD ?= ld
   OBJDUMP ?= objdump
-  AWK ?= awk
-  # Bake the following awk program in a string. The program is needed to add C++
-  # to the languages excluded from BTF generation.
-  #
-  # Also, unconditionally return success (0) from the awk program, rather than
-  # propagating pahole's return status (with 'exit system(pahole_cmd)'), to
-  # workaround an DW_TAG_rvalue_reference_type error in
-  # kernel/nvidia-modeset.ko.
-  #
-  # BEGIN {
-  #     pahole_cmd = "pahole"
-  #     for (i = 1; i < ARGC; i++) {
-  #         if (ARGV[i] ~ /--lang_exclude=/) {
-  #             pahole_cmd = pahole_cmd sprintf(" %s,c++", ARGV[i])
-  #         } else {
-  #             pahole_cmd = pahole_cmd sprintf(" %s", ARGV[i])
-  #         }
-  #     }
-  #     system(pahole_cmd)
-  # }
-  PAHOLE_AWK_PROGRAM = BEGIN { pahole_cmd = \"pahole\"; for (i = 1; i < ARGC; i++) { if (ARGV[i] ~ /--lang_exclude=/) { pahole_cmd = pahole_cmd sprintf(\" %s,c++\", ARGV[i]); } else { pahole_cmd = pahole_cmd sprintf(\" %s\", ARGV[i]); } } system(pahole_cmd); }
-  # If scripts/pahole-flags.sh is not present in the kernel tree, add PAHOLE and
-  # PAHOLE_AWK_PROGRAM assignments to PAHOLE_VARIABLES; otherwise assign the
-  # empty string to PAHOLE_VARIABLES.
-  PAHOLE_VARIABLES=$(if $(wildcard $(KERNEL_SOURCES)/scripts/pahole-flags.sh),,"PAHOLE=$(AWK) '$(PAHOLE_AWK_PROGRAM)'")
 
   ifndef ARCH
     ARCH := $(shell uname -m | sed -e 's/i.86/i386/' \
@@ -133,10 +108,12 @@ else
   KBUILD_PARAMS += INSTALL_MOD_DIR="$(INSTALL_MOD_DIR)"
   KBUILD_PARAMS += NV_SPECTRE_V2=$(SPECTRE_V2_RETPOLINE)
 
+  export ORIG_PAHOLE := $(PAHOLE)
+
   .PHONY: modules module clean clean_conftest modules_install
   modules clean modules_install:
 	@$(MAKE) "LD=$(LD)" "CC=$(CC)" "OBJDUMP=$(OBJDUMP)" \
-	  $(PAHOLE_VARIABLES) $(KBUILD_PARAMS) $@
+	  PAHOLE=$(CURDIR)/pahole.sh $(KBUILD_PARAMS) $@
 	@if [ "$@" = "modules" ]; then \
 	  for module in $(NV_KERNEL_MODULES); do \
 	    if [ -x split-object-file.sh ]; then \

kernel-open/common/inc/nv-linux.h

@@ -1726,7 +1726,69 @@ typedef enum
 #include <linux/reset.h>
 #include <linux/dma-buf.h>
 #include <linux/gpio.h>
+#if defined(NV_LINUX_OF_GPIO_H_PRESENT)
 #include <linux/of_gpio.h>
+#else
+#include <linux/gpio/driver.h>
+
+/*
+ * of_get_named_gpio() was removed along with linux/of_gpio.h by commit
+ * 51aaf65bbd21 ("gpio: of: Remove <linux/of_gpio.h>"). Provide a compat
+ * implementation using the remaining public GPIO APIs.
+ */
+static inline int of_get_named_gpio(const struct device_node *np,
+                                    const char *propname, int index)
+{
+    struct of_phandle_args gpiospec;
+    struct gpio_device *gdev;
+    struct gpio_desc *desc;
+    int ret;
+
+    if (!np)
+        return -ENOENT;
+
+    ret =
+        of_parse_phandle_with_args_map(np, propname, "gpio", index, &gpiospec);
+    if (ret)
+        return ret;
+
+    gdev = gpio_device_find_by_fwnode(of_fwnode_handle(gpiospec.np));
+    of_node_put(gpiospec.np);
+    if (!gdev)
+        return -EPROBE_DEFER;
+
+    /*
+     * Use the chip's of_xlate callback to translate the DT GPIO
+     * specifier into a linear offset.  Tegra GPIO controllers encode
+     * port and pin in args[0] and of_xlate sums per-port pin counts
+     * to produce the real offset.
+     */
+    {
+        struct gpio_chip *chip = gpio_device_get_chip(gdev);
+        int hwgpio;
+
+#if defined(CONFIG_OF_GPIO)
+        if (chip->of_xlate)
+            hwgpio = chip->of_xlate(chip, &gpiospec, NULL);
+        else
+#endif
+            hwgpio = gpiospec.args[0];
+
+        if (hwgpio < 0) {
+            gpio_device_put(gdev);
+            return hwgpio;
+        }
+
+        desc = gpio_device_get_desc(gdev, hwgpio);
+    }
+    gpio_device_put(gdev);
+
+    if (IS_ERR(desc))
+        return PTR_ERR(desc);
+
+    return desc_to_gpio(desc);
+}
+#endif
 #include <linux/of_device.h>
 #include <linux/of_platform.h>
 

kernel-open/conftest.sh

@@ -363,7 +363,8 @@ check_symbol_exists() {
         for KMOD in linuxkpi.ko linuxkpi_gplv2.ko drm.ko dmabuf.ko ; do
             for KMODPATH in $KMODPATHS; do
                 if [ -e "$KMODPATH/$KMOD" ] ; then
-                    if nm "$KMODPATH/$KMOD" | grep "$SYMBOL" >/dev/null 2>&1 ; then
+                    # Search if this symbol is a global text symbol in nm output
+                    if nm "$KMODPATH/$KMOD" | grep "T.*$SYMBOL" >/dev/null 2>&1 ; then
                         return 0
                     fi
                 fi

kernel-open/header-presence-tests.mk

@@ -41,6 +41,7 @@ NV_HEADER_PRESENCE_TESTS = \
   linux/vfio_pci_core.h \
   linux/cc_platform.h \
   linux/slub_def.h \
+  linux/of_gpio.h \
   asm/cpufeature.h \
   asm/mshyperv.h \
   crypto/sig.h

kernel-open/nvidia-drm/nvidia-drm-linux.c

@@ -64,3 +64,4 @@ module_exit(nv_linux_drm_exit);
 
 MODULE_INFO(supported, "external");
 MODULE_VERSION(NV_VERSION_STRING);
+MODULE_DESCRIPTION("NVIDIA DRM kernel module");

kernel-open/nvidia-modeset/nvidia-modeset-linux.c

@@ -2229,3 +2229,4 @@ module_exit(nvkms_exit);
 
 MODULE_INFO(supported, "external");
 MODULE_VERSION(NV_VERSION_STRING);
+MODULE_DESCRIPTION("NVIDIA modeset kernel module");

kernel-open/nvidia-uvm/uvm.c

@@ -1230,3 +1230,4 @@ module_exit(uvm_exit_entry);
 MODULE_LICENSE("Dual MIT/GPL");
 MODULE_INFO(supported, "external");
 MODULE_VERSION(NV_VERSION_STRING);
+MODULE_DESCRIPTION("NVIDIA Unified Virtual Memory kernel module");

kernel-open/nvidia-uvm/uvm_gpu_replayable_faults.c

@@ -1800,6 +1800,7 @@ static NV_STATUS service_fault_batch_ats_sub(uvm_gpu_va_space_t *gpu_va_space,
         // ATS faults can't be unserviceable, since unserviceable faults require
         // GMMU PTEs.
         UVM_ASSERT(!current_entry->is_fatal);
+        UVM_ASSERT(current_entry->gpu == gpu);
 
         i++;
 
@@ -1849,6 +1850,7 @@ static NV_STATUS service_fault_batch_ats_sub(uvm_gpu_va_space_t *gpu_va_space,
 
     } while (current_entry &&
              (current_entry->fault_address < outer) &&
+             (previous_entry->gpu == current_entry->gpu) &&
              (previous_entry->va_space == current_entry->va_space));
 
     // Service the last sub-batch.