6.1-stable patches

added patches:
	revert-drm-amd-amdgpu-fix-potential-ioremap-memory-leaks-in-amdgpu_device_init.patch

diff --git a/queue-6.1/revert-drm-amd-amdgpu-fix-potential-ioremap-memory-leaks-in-amdgpu_device_init.patch b/queue-6.1/revert-drm-amd-amdgpu-fix-potential-ioremap-memory-leaks-in-amdgpu_device_init.patch
new file mode 100644 (file)
index 0000000..08192e5
--- /dev/null
+++ b/queue-6.1/revert-drm-amd-amdgpu-fix-potential-ioremap-memory-leaks-in-amdgpu_device_init.patch
@@ -0,0 +1,84 @@
+From 03c6284df179de3a4a6e0684764b1c71d2a405e2 Mon Sep 17 00:00:00 2001
+From: Ma Jun <Jun.Ma2@amd.com>
+Date: Tue, 19 Mar 2024 15:24:03 +0800
+Subject: Revert "drm/amd/amdgpu: Fix potential ioremap() memory leaks in amdgpu_device_init()"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Ma Jun <Jun.Ma2@amd.com>
+
+commit 03c6284df179de3a4a6e0684764b1c71d2a405e2 upstream.
+
+This patch causes the following iounmap erorr and calltrace
+iounmap: bad address 00000000d0b3631f
+
+The original patch was unjustified because amdgpu_device_fini_sw() will
+always cleanup the rmmio mapping.
+
+This reverts commit eb4f139888f636614dab3bcce97ff61cefc4b3a7.
+
+Signed-off-by: Ma Jun <Jun.Ma2@amd.com>
+Suggested-by: Christian König <christian.koenig@amd.com>
+Reviewed-by: Christian König <christian.koenig@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c |   16 ++++++----------
+ 1 file changed, 6 insertions(+), 10 deletions(-)
+
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+@@ -3713,10 +3713,8 @@ int amdgpu_device_init(struct amdgpu_dev
+        * early on during init and before calling to RREG32.
+        */
+       adev->reset_domain = amdgpu_reset_create_reset_domain(SINGLE_DEVICE, "amdgpu-reset-dev");
+-      if (!adev->reset_domain) {
+-              r = -ENOMEM;
+-              goto unmap_memory;
+-      }
++      if (!adev->reset_domain)
++              return -ENOMEM;
+ 
+       /* detect hw virtualization here */
+       amdgpu_detect_virtualization(adev);
+@@ -3724,18 +3722,18 @@ int amdgpu_device_init(struct amdgpu_dev
+       r = amdgpu_device_get_job_timeout_settings(adev);
+       if (r) {
+               dev_err(adev->dev, "invalid lockup_timeout parameter syntax\n");
+-              goto unmap_memory;
++              return r;
+       }
+ 
+       /* early init functions */
+       r = amdgpu_device_ip_early_init(adev);
+       if (r)
+-              goto unmap_memory;
++              return r;
+ 
+       /* Get rid of things like offb */
+       r = drm_aperture_remove_conflicting_pci_framebuffers(adev->pdev, &amdgpu_kms_driver);
+       if (r)
+-              goto unmap_memory;
++              return r;
+ 
+       /* Enable TMZ based on IP_VERSION */
+       amdgpu_gmc_tmz_set(adev);
+@@ -3745,7 +3743,7 @@ int amdgpu_device_init(struct amdgpu_dev
+       if (adev->gmc.xgmi.supported) {
+               r = adev->gfxhub.funcs->get_xgmi_info(adev);
+               if (r)
+-                      goto unmap_memory;
++                      return r;
+       }
+ 
+       /* enable PCIE atomic ops */
+@@ -4001,8 +3999,6 @@ release_ras_con:
+ failed:
+       amdgpu_vf_error_trans_all(adev);
+ 
+-unmap_memory:
+-      iounmap(adev->rmmio);
+       return r;
+ }
+ 

diff --git a/queue-6.1/series b/queue-6.1/series
index b6523813ced141ffc7f219d8ad4903733ce6caee..9bbf726407bb8fae457cb4a5b3b52d25183d4a25 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -80,3 +80,4 @@ platform-x86-intel-vbtn-update-tablet-mode-switch-at.patch
 bluetooth-btintel-fixe-build-regression.patch
 net-mpls-error-out-if-inner-headers-are-not-set.patch
 vmci-fix-possible-memcpy-run-time-warning-in-vmci_datagram_invoke_guest_handler.patch
+revert-drm-amd-amdgpu-fix-potential-ioremap-memory-leaks-in-amdgpu_device_init.patch