]>
Commit | Line | Data |
---|---|---|
b52b1dff GKH |
1 | From 03c6284df179de3a4a6e0684764b1c71d2a405e2 Mon Sep 17 00:00:00 2001 |
2 | From: Ma Jun <Jun.Ma2@amd.com> | |
3 | Date: Tue, 19 Mar 2024 15:24:03 +0800 | |
4 | Subject: Revert "drm/amd/amdgpu: Fix potential ioremap() memory leaks in amdgpu_device_init()" | |
5 | MIME-Version: 1.0 | |
6 | Content-Type: text/plain; charset=UTF-8 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ||
9 | From: Ma Jun <Jun.Ma2@amd.com> | |
10 | ||
11 | commit 03c6284df179de3a4a6e0684764b1c71d2a405e2 upstream. | |
12 | ||
13 | This patch causes the following iounmap erorr and calltrace | |
14 | iounmap: bad address 00000000d0b3631f | |
15 | ||
16 | The original patch was unjustified because amdgpu_device_fini_sw() will | |
17 | always cleanup the rmmio mapping. | |
18 | ||
19 | This reverts commit eb4f139888f636614dab3bcce97ff61cefc4b3a7. | |
20 | ||
21 | Signed-off-by: Ma Jun <Jun.Ma2@amd.com> | |
22 | Suggested-by: Christian König <christian.koenig@amd.com> | |
23 | Reviewed-by: Christian König <christian.koenig@amd.com> | |
24 | Signed-off-by: Alex Deucher <alexander.deucher@amd.com> | |
25 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
26 | --- | |
c152637d | 27 | drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 16 ++++++---------- |
b52b1dff GKH |
28 | 1 file changed, 6 insertions(+), 10 deletions(-) |
29 | ||
b52b1dff GKH |
30 | --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c |
31 | +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |
c152637d | 32 | @@ -4025,10 +4025,8 @@ int amdgpu_device_init(struct amdgpu_dev |
b52b1dff GKH |
33 | * early on during init and before calling to RREG32. |
34 | */ | |
35 | adev->reset_domain = amdgpu_reset_create_reset_domain(SINGLE_DEVICE, "amdgpu-reset-dev"); | |
36 | - if (!adev->reset_domain) { | |
37 | - r = -ENOMEM; | |
38 | - goto unmap_memory; | |
39 | - } | |
40 | + if (!adev->reset_domain) | |
41 | + return -ENOMEM; | |
42 | ||
43 | /* detect hw virtualization here */ | |
44 | amdgpu_detect_virtualization(adev); | |
c152637d | 45 | @@ -4038,20 +4036,20 @@ int amdgpu_device_init(struct amdgpu_dev |
b52b1dff GKH |
46 | r = amdgpu_device_get_job_timeout_settings(adev); |
47 | if (r) { | |
48 | dev_err(adev->dev, "invalid lockup_timeout parameter syntax\n"); | |
49 | - goto unmap_memory; | |
50 | + return r; | |
51 | } | |
52 | ||
b52b1dff GKH |
53 | /* early init functions */ |
54 | r = amdgpu_device_ip_early_init(adev); | |
55 | if (r) | |
56 | - goto unmap_memory; | |
57 | + return r; | |
58 | ||
c152637d GKH |
59 | amdgpu_device_set_mcbp(adev); |
60 | ||
b52b1dff GKH |
61 | /* Get rid of things like offb */ |
62 | r = drm_aperture_remove_conflicting_pci_framebuffers(adev->pdev, &amdgpu_kms_driver); | |
63 | if (r) | |
64 | - goto unmap_memory; | |
65 | + return r; | |
66 | ||
67 | /* Enable TMZ based on IP_VERSION */ | |
68 | amdgpu_gmc_tmz_set(adev); | |
c152637d | 69 | @@ -4061,7 +4059,7 @@ int amdgpu_device_init(struct amdgpu_dev |
b52b1dff GKH |
70 | if (adev->gmc.xgmi.supported) { |
71 | r = adev->gfxhub.funcs->get_xgmi_info(adev); | |
72 | if (r) | |
73 | - goto unmap_memory; | |
74 | + return r; | |
75 | } | |
76 | ||
77 | /* enable PCIE atomic ops */ | |
c152637d | 78 | @@ -4330,8 +4328,6 @@ release_ras_con: |
b52b1dff GKH |
79 | failed: |
80 | amdgpu_vf_error_trans_all(adev); | |
81 | ||
82 | -unmap_memory: | |
83 | - iounmap(adev->rmmio); | |
84 | return r; | |
85 | } | |
86 |