This is a note to let you know that I've just added the patch titled
accel/ivpu: Put NPU back to D3hot after failed resume
to the 6.8-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
accel-ivpu-put-npu-back-to-d3hot-after-failed-resume.patch
and it can be found in the queue-6.8 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 875bc9cd1b33eb027a5663f5e6878a43d98e9a16 Mon Sep 17 00:00:00 2001
From: Jacek Lawrynowicz <jacek.lawrynowicz@xxxxxxxxxxxxxxx>
Date: Tue, 2 Apr 2024 12:49:25 +0200
Subject: accel/ivpu: Put NPU back to D3hot after failed resume
From: Jacek Lawrynowicz <jacek.lawrynowicz@xxxxxxxxxxxxxxx>
commit 875bc9cd1b33eb027a5663f5e6878a43d98e9a16 upstream.
Put NPU in D3hot after ivpu_resume() fails to power up the device.
This will assure that D3->D0 power cycle will be performed before
the next resume and also will minimize power usage in this corner case.
Fixes: 28083ff18d3f ("accel/ivpu: Fix DevTLB errors on suspend/resume and recovery")
Cc: <stable@xxxxxxxxxxxxxxx> # v6.8+
Signed-off-by: Jacek Lawrynowicz <jacek.lawrynowicz@xxxxxxxxxxxxxxx>
Reviewed-by: Jeffrey Hugo <quic_jhugo@xxxxxxxxxxx>
Link: https://patchwork.freedesktop.org/patch/msgid/20240402104929.941186-5-jacek.lawrynowicz@xxxxxxxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/accel/ivpu/ivpu_pm.c | 1 +
1 file changed, 1 insertion(+)
--- a/drivers/accel/ivpu/ivpu_pm.c
+++ b/drivers/accel/ivpu/ivpu_pm.c
@@ -100,6 +100,7 @@ err_mmu_disable:
ivpu_mmu_disable(vdev);
err_power_down:
ivpu_hw_power_down(vdev);
+ pci_set_power_state(to_pci_dev(vdev->drm.dev), PCI_D3hot);
if (!ivpu_fw_is_cold_boot(vdev)) {
ivpu_pm_prepare_cold_boot(vdev);
Patches currently in stable-queue which might be from jacek.lawrynowicz@xxxxxxxxxxxxxxx are
queue-6.8/accel-ivpu-fix-deadlock-in-context_xa.patch
queue-6.8/accel-ivpu-put-npu-back-to-d3hot-after-failed-resume.patch
queue-6.8/accel-ivpu-check-return-code-of-ipc-lock-init.patch
queue-6.8/accel-ivpu-return-max-freq-for-drm_ivpu_param_core_clock_rate.patch
queue-6.8/accel-ivpu-fix-pci-d0-state-entry-in-resume.patch
