Re: [PATCH] drm/amdgpu: Fix the iounmap error of rmmio

[SRINIVASAN SHANMUGAM]

On 3/15/2024 10:47 AM, Ma Jun wrote:

Setting the rmmio pointer to NULL to fix the following
iounmap error and calltrace.
iounmap: bad address 00000000d0b3631f

Fixes: 923f7a82d2e1 ("drm/amd/amdgpu: Fix potential ioremap() memory leaks in 
amdgpu_device_init()")
Signed-off-by: Ma Jun <jun....@amd.com>

Acked-by: Srinivasan Shanmugam <srinivasan.shanmu...@amd.com>

---
  drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 39dd76e57154..d65a6aabefbb 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -4383,6 +4383,7 @@ int amdgpu_device_init(struct amdgpu_device *adev,

unmap_memory:

        iounmap(adev->rmmio);
+       adev->rmmio = NULL;
        return r;
  }

@@ -4514,9 +4515,11 @@ void amdgpu_device_fini_sw(struct amdgpu_device *adev)

  #endif

if (drm_dev_enter(adev_to_drm(adev), &idx)) {

+               if (adev->rmmio) {
+                       iounmap(adev->rmmio);
+                       adev->rmmio = NULL;
+               }

- iounmap(adev->rmmio);

-               adev->rmmio = NULL;
                amdgpu_doorbell_fini(adev);
                drm_dev_exit(idx);
        }