[PATCH] drm/amdgpu: Unmap all MMIO mappings

[Deucher, Alexander]

[Public]

Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
________________________________
From: Grodzovsky, Andrey <Andrey.Grodzovsky at amd.com>
Sent: Tuesday, May 18, 2021 10:01 AM
To: dri-devel at lists.freedesktop.org <dri-devel at lists.freedesktop.org>; amd-gfx at lists.freedesktop.org <amd-gfx at lists.freedesktop.org>; linux-pci at vger.kernel.org <linux-pci at vger.kernel.org>; ckoenig.leichtzumerken at gmail.com <ckoenig.leichtzumerken at gmail.com>; daniel.vetter at ffwll.ch <daniel.vetter at ffwll.ch>; Wentland, Harry <Harry.Wentland at amd.com>
Cc: ppaalanen at gmail.com <ppaalanen at gmail.com>; Deucher, Alexander <Alexander.Deucher at amd.com>; gregkh at linuxfoundation.org <gregkh at linuxfoundation.org>; helgaas at kernel.org <helgaas at kernel.org>; Kuehling, Felix <Felix.Kuehling at amd.com>
Subject: Re: [PATCH] drm/amdgpu: Unmap all MMIO mappings

Ping

Andrey

On 2021-05-17 3:31 p.m., Andrey Grodzovsky wrote:
> Access to those must be prevented post pci_remove
>
> v6: Drop BOs list, unampping VRAM BAR is enough.
> v8:
> Add condition of xgmi.connected_to_cpu to MTTR
> handling and remove MTTR handling from the old place.
>
> Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky at amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 26 +++++++++++++++++++---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_object.c |  4 ----
>   drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c    |  4 ----
>   3 files changed, 23 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index f7cca25c0fa0..8b50315d1fe1 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -3666,6 +3666,27 @@ int amdgpu_device_init(struct amdgpu_device *adev,
>        return r;
>   }
>
> +static void amdgpu_device_unmap_mmio(struct amdgpu_device *adev)
> +{
> +     /* Clear all CPU mappings pointing to this device */
> +     unmap_mapping_range(adev->ddev.anon_inode->i_mapping, 0, 0, 1);
> +
> +     /* Unmap all mapped bars - Doorbell, registers and VRAM */
> +     amdgpu_device_doorbell_fini(adev);
> +
> +     iounmap(adev->rmmio);
> +     adev->rmmio = NULL;
> +     if (adev->mman.aper_base_kaddr)
> +             iounmap(adev->mman.aper_base_kaddr);
> +     adev->mman.aper_base_kaddr = NULL;
> +
> +     /* Memory manager related */
> +     if (!adev->gmc.xgmi.connected_to_cpu) {
> +             arch_phys_wc_del(adev->gmc.vram_mtrr);
> +             arch_io_free_memtype_wc(adev->gmc.aper_base, adev->gmc.aper_size);
> +     }
> +}
> +
>   /**
>    * amdgpu_device_fini - tear down the driver
>    *
> @@ -3712,6 +3733,8 @@ void amdgpu_device_fini_hw(struct amdgpu_device *adev)
>        amdgpu_device_ip_fini_early(adev);
>
>        amdgpu_gart_dummy_page_fini(adev);
> +
> +     amdgpu_device_unmap_mmio(adev);
>   }
>
>   void amdgpu_device_fini_sw(struct amdgpu_device *adev)
> @@ -3739,9 +3762,6 @@ void amdgpu_device_fini_sw(struct amdgpu_device *adev)
>        }
>        if ((adev->pdev->class >> 8) == PCI_CLASS_DISPLAY_VGA)
>                vga_client_register(adev->pdev, NULL, NULL, NULL);
> -     iounmap(adev->rmmio);
> -     adev->rmmio = NULL;
> -     amdgpu_device_doorbell_fini(adev);
>
>        if (IS_ENABLED(CONFIG_PERF_EVENTS))
>                amdgpu_pmu_fini(adev);
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> index 0adffcace326..8eabe3c9ad17 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> @@ -1107,10 +1107,6 @@ int amdgpu_bo_init(struct amdgpu_device *adev)
>   void amdgpu_bo_fini(struct amdgpu_device *adev)
>   {
>        amdgpu_ttm_fini(adev);
> -     if (!adev->gmc.xgmi.connected_to_cpu) {
> -             arch_phys_wc_del(adev->gmc.vram_mtrr);
> -             arch_io_free_memtype_wc(adev->gmc.aper_base, adev->gmc.aper_size);
> -     }
>   }
>
>   /**
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> index 0d54e70278ca..58ad2fecc9e3 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> @@ -1841,10 +1841,6 @@ void amdgpu_ttm_fini(struct amdgpu_device *adev)
>        amdgpu_bo_free_kernel(&adev->mman.discovery_memory, NULL, NULL);
>        amdgpu_ttm_fw_reserve_vram_fini(adev);
>
> -     if (adev->mman.aper_base_kaddr)
> -             iounmap(adev->mman.aper_base_kaddr);
> -     adev->mman.aper_base_kaddr = NULL;
> -
>        amdgpu_vram_mgr_fini(adev);
>        amdgpu_gtt_mgr_fini(adev);
>        ttm_range_man_fini(&adev->mman.bdev, AMDGPU_PL_GDS);
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20210518/04c62b94/attachment.htm>