From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 16 Mar 2026 14:04:22 +0000 (+0100)
Subject: 6.19-stable patches
X-Git-Tag: v6.18.19~84
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b18734eeec1a4adddf78e8cd007c61cd24869465;p=thirdparty%2Fkernel%2Fstable-queue.git

6.19-stable patches

added patches:
	drm-amdgpu-ensure-no_hw_access-is-visible-before-mmio.patch
---

diff --git a/queue-6.19/drm-amdgpu-ensure-no_hw_access-is-visible-before-mmio.patch b/queue-6.19/drm-amdgpu-ensure-no_hw_access-is-visible-before-mmio.patch
new file mode 100644
index 0000000000..646c4dcfb7
--- /dev/null
+++ b/queue-6.19/drm-amdgpu-ensure-no_hw_access-is-visible-before-mmio.patch
@@ -0,0 +1,35 @@
+From 31b153315b8702d0249aa44d83d9fbf42c5c7a79 Mon Sep 17 00:00:00 2001
+From: Perry Yuan <perry.yuan@amd.com>
+Date: Wed, 28 Jan 2026 13:54:31 +0800
+Subject: drm/amdgpu: ensure no_hw_access is visible before MMIO
+
+From: Perry Yuan <perry.yuan@amd.com>
+
+commit 31b153315b8702d0249aa44d83d9fbf42c5c7a79 upstream.
+
+Add a full memory barrier after clearing no_hw_access in
+amdgpu_device_mode1_reset() so subsequent PCI state restore
+access cannot observe stale state on other CPUs.
+
+Fixes: 7edb503fe4b6 ("drm/amd/pm: Disable MMIO access during SMU Mode 1 reset")
+Signed-off-by: Perry Yuan <perry.yuan@amd.com>
+Reviewed-by: Yifan Zhang <yifan1.zhang@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Cc: Simon Liebold <simonlie@amazon.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+@@ -5878,6 +5878,9 @@ int amdgpu_device_mode1_reset(struct amd
+ 	/* enable mmio access after mode 1 reset completed */
+ 	adev->no_hw_access = false;
+ 
++	/* ensure no_hw_access is updated before we access hw */
++	smp_mb();
++
+ 	amdgpu_device_load_pci_state(adev->pdev);
+ 	ret = amdgpu_psp_wait_for_bootloader(adev);
+ 	if (ret)
diff --git a/queue-6.19/series b/queue-6.19/series
index 5f827029de..a95a461c6f 100644
--- a/queue-6.19/series
+++ b/queue-6.19/series
@@ -111,3 +111,4 @@ octeontx2-af-devlink-fix-nix-ras-reporter-to-use-ras.patch
 net-prevent-null-deref-in-ip-6-tunnel_xmit.patch
 iio-imu-inv-mpu9150-fix-irq-ack-preventing-irq-storm.patch
 usb-gadget-f_mass_storage-fix-potential-integer-over.patch
+drm-amdgpu-ensure-no_hw_access-is-visible-before-mmio.patch