kernel-5.18.patch

   1 --- NVIDIA-Linux-x86_64-390.151-no-compat32/kernel/nvidia/nv.c~ 2022-04-20 19:57:55.000000000 +0200
   2 +++ NVIDIA-Linux-x86_64-390.151-no-compat32/kernel/nvidia/nv.c  2022-05-26 10:54:29.375034057 +0200
   3 @@ -2742,7 +2742,11 @@
   4      if (!nvl->tce_bypass_enabled)
   5      {
   6          NvU64 new_mask = (((NvU64)1) << phys_addr_bits) - 1;
   7 +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 18, 0)
   8          pci_set_dma_mask(nvl->dev, new_mask);
   9 +#else
  10 +        dma_set_mask(&nvl->dev->dev, new_mask);
  11 +#endif
  12      }
  13  }
  14
  15 --- NVIDIA-Linux-x86_64-390.151-no-compat32/kernel/nvidia/nv-dma.c.orig 2022-04-20 19:57:55.000000000 +0200
  16 +++ NVIDIA-Linux-x86_64-390.151-no-compat32/kernel/nvidia/nv-dma.c      2022-05-26 11:03:12.139154417 +0200
  17 @@ -27,8 +27,13 @@
  18      NvU64 *va
  19  )
  20  {
  21 +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 18, 0)
  22      *va = pci_map_page(dma_map->dev, dma_map->pages[0], 0,
  23              dma_map->page_count * PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
  24 +#else
  25 +    *va = dma_map_page(&dma_map->dev->dev, dma_map->pages[0], 0,
  26 +            dma_map->page_count * PAGE_SIZE, DMA_BIDIRECTIONAL);
  27 +#endif
  28      if (NV_PCI_DMA_MAPPING_ERROR(dma_map->dev, *va))
  29      {
  30          return NV_ERR_OPERATING_SYSTEM;
  31 @@ -57,8 +62,13 @@
  32
  33  static void nv_dma_unmap_contig(nv_dma_map_t *dma_map)
  34  {
  35 +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 18, 0)
  36      pci_unmap_page(dma_map->dev, dma_map->mapping.contig.dma_addr,
  37              dma_map->page_count * PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
  38 +#else
  39 +    dma_unmap_page(&dma_map->dev->dev, dma_map->mapping.contig.dma_addr,
  40 +            dma_map->page_count * PAGE_SIZE, DMA_BIDIRECTIONAL);
  41 +#endif
  42  }
  43
  44  static void nv_fill_scatterlist
  45 @@ -166,10 +176,17 @@
  46
  47      NV_FOR_EACH_DMA_SUBMAP(dma_map, submap, i)
  48      {
  49 +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 18, 0)
  50          submap->sg_map_count = pci_map_sg(dma_map->dev,
  51                  NV_DMA_SUBMAP_SCATTERLIST(submap),
  52                  NV_DMA_SUBMAP_SCATTERLIST_LENGTH(submap),
  53                  PCI_DMA_BIDIRECTIONAL);
  54 +#else
  55 +        submap->sg_map_count = dma_map_sg(&dma_map->dev->dev,
  56 +                NV_DMA_SUBMAP_SCATTERLIST(submap),
  57 +                NV_DMA_SUBMAP_SCATTERLIST_LENGTH(submap),
  58 +                DMA_BIDIRECTIONAL);
  59 +#endif
  60          if (submap->sg_map_count == 0)
  61          {
  62              status = NV_ERR_OPERATING_SYSTEM;
  63 @@ -197,9 +214,15 @@
  64              break;
  65          }
  66
  67 +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 18, 0)
  68          pci_unmap_sg(dma_map->dev, NV_DMA_SUBMAP_SCATTERLIST(submap),
  69                  NV_DMA_SUBMAP_SCATTERLIST_LENGTH(submap),
  70                  PCI_DMA_BIDIRECTIONAL);
  71 +#else
  72 +        dma_unmap_sg(&dma_map->dev->dev, NV_DMA_SUBMAP_SCATTERLIST(submap),
  73 +                NV_DMA_SUBMAP_SCATTERLIST_LENGTH(submap),
  74 +                DMA_BIDIRECTIONAL);
  75 +#endif
  76      }
  77  }
  78
  79 --- NVIDIA-Linux-x86_64-390.151-no-compat32/kernel/common/inc/nv-linux.h.orig   2022-04-20 19:57:56.000000000 +0200
  80 +++ NVIDIA-Linux-x86_64-390.151-no-compat32/kernel/common/inc/nv-linux.h        2022-05-26 11:05:45.337533146 +0200
  81 @@ -339,8 +339,13 @@
  82
  83  #if defined(NV_PCI_DMA_MAPPING_ERROR_PRESENT)
  84  #if (NV_PCI_DMA_MAPPING_ERROR_ARGUMENT_COUNT == 2)
  85 +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 18, 0)
  86  #define NV_PCI_DMA_MAPPING_ERROR(dev, addr) \
  87      pci_dma_mapping_error(dev, addr)
  88 +#else
  89 +#define NV_PCI_DMA_MAPPING_ERROR(pdev, addr) \
  90 +    dma_mapping_error(&pdev->dev, addr)
  91 +#endif
  92  #elif (NV_PCI_DMA_MAPPING_ERROR_ARGUMENT_COUNT == 1)
  93  #define NV_PCI_DMA_MAPPING_ERROR(dev, addr) \
  94      pci_dma_mapping_error(addr)