> Doesn't this work out much more naturally if we just do something like:
>
> diff --git a/drivers/vfio/pci/nvgrace-gpu/main.c
> b/drivers/vfio/pci/nvgrace-gpu/main.c index 85eacafaffdf..43a9457442ff
> 100644 --- a/drivers/vfio/pci/nvgrace-gpu/main.c
> +++ b/drivers/vfio/pci/nvgrace-gpu/main.c
> @@ -17,9 +17,6 @@
> #define RESMEM_REGION_INDEX VFIO_PCI_BAR2_REGION_INDEX
> #define USEMEM_REGION_INDEX VFIO_PCI_BAR4_REGION_INDEX
>
> -/* Memory size expected as non cached and reserved by the VM driver */
> -#define RESMEM_SIZE SZ_1G
> -
> /* A hardwired and constant ABI value between the GPU FW and VFIO
> driver. */ #define MEMBLK_SIZE SZ_512M
>
> @@ -72,7 +69,7 @@ nvgrace_gpu_memregion(int index,
> if (index == USEMEM_REGION_INDEX)
> return &nvdev->usemem;
>
> - if (index == RESMEM_REGION_INDEX)
> + if (nvdev->resmem.memlength && index == RESMEM_REGION_INDEX)
> return &nvdev->resmem;
>
> return NULL;
> @@ -757,6 +754,13 @@ nvgrace_gpu_init_nvdev_struct(struct pci_dev *pdev,
> u64 memphys, u64 memlength)
> {
> int ret = 0;
> + u64 resmem_size = 0;
> +
> + /*
> + * Comment about the GH bug that requires this and fix in GB
> + */
> + if (!nvdev->has_mig_hw_bug_fix)
> + resmem_size = SZ_1G;
>
> /*
> * The VM GPU device driver needs a non-cacheable region to
> support @@ -780,7 +784,7 @@ nvgrace_gpu_init_nvdev_struct(struct
> pci_dev *pdev,
> * memory (usemem) is added to the kernel for usage by the VM
> * workloads. Make the usable memory size memblock aligned.
> */
> - if (check_sub_overflow(memlength, RESMEM_SIZE,
> + if (check_sub_overflow(memlength, resmem_size,
> &nvdev->usemem.memlength)) {
> ret = -EOVERFLOW;
> goto done;
> @@ -813,7 +817,9 @@ nvgrace_gpu_init_nvdev_struct(struct pci_dev *pdev,
> * the BAR size for them.
> */
> nvdev->usemem.bar_size =
> roundup_pow_of_two(nvdev->usemem.memlength);
> - nvdev->resmem.bar_size =
> roundup_pow_of_two(nvdev->resmem.memlength);
> + if (nvdev->resmem.memlength)
> + nvdev->resmem.bar_size =
> + roundup_pow_of_two(nvdev->resmem.memlength);
> done:
> return ret;
> }
>
Thanks Alex, you suggestion does looks simpler and better.
I'll test that out and send out an updated version of the patch.
