6.1-stable patches

added patches:
	mips-kvm-fix-build-error-with-kvm_mips_debug_cop0_counters-enabled.patch
	revert-drm-amd-disable-psr-su-on-parade-0803-tcon.patch
	scsi-qla2xxx-fix-end-of-loop-test.patch

diff --git a/queue-6.1/mips-kvm-fix-build-error-with-kvm_mips_debug_cop0_counters-enabled.patch b/queue-6.1/mips-kvm-fix-build-error-with-kvm_mips_debug_cop0_counters-enabled.patch
new file mode 100644 (file)
index 0000000..50a751a
--- /dev/null
+++ b/queue-6.1/mips-kvm-fix-build-error-with-kvm_mips_debug_cop0_counters-enabled.patch
@@ -0,0 +1,38 @@
+From 3a6dbb691782e88e07e5c70b327495dbd58a2e7f Mon Sep 17 00:00:00 2001
+From: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
+Date: Thu, 6 Jul 2023 18:36:10 +0200
+Subject: MIPS: kvm: Fix build error with KVM_MIPS_DEBUG_COP0_COUNTERS enabled
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
+
+commit 3a6dbb691782e88e07e5c70b327495dbd58a2e7f upstream.
+
+Commit e4de20576986 ("MIPS: KVM: Fix NULL pointer dereference") missed
+converting one place accessing cop0 registers, which results in a build
+error, if KVM_MIPS_DEBUG_COP0_COUNTERS is enabled.
+
+Fixes: e4de20576986 ("MIPS: KVM: Fix NULL pointer dereference")
+Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
+Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/mips/kvm/stats.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/arch/mips/kvm/stats.c
++++ b/arch/mips/kvm/stats.c
+@@ -54,9 +54,9 @@ void kvm_mips_dump_stats(struct kvm_vcpu
+       kvm_info("\nKVM VCPU[%d] COP0 Access Profile:\n", vcpu->vcpu_id);
+       for (i = 0; i < N_MIPS_COPROC_REGS; i++) {
+               for (j = 0; j < N_MIPS_COPROC_SEL; j++) {
+-                      if (vcpu->arch.cop0->stat[i][j])
++                      if (vcpu->arch.cop0.stat[i][j])
+                               kvm_info("%s[%d]: %lu\n", kvm_cop0_str[i], j,
+-                                       vcpu->arch.cop0->stat[i][j]);
++                                       vcpu->arch.cop0.stat[i][j]);
+               }
+       }
+ #endif

diff --git a/queue-6.1/revert-drm-amd-disable-psr-su-on-parade-0803-tcon.patch b/queue-6.1/revert-drm-amd-disable-psr-su-on-parade-0803-tcon.patch
new file mode 100644 (file)
index 0000000..f1515ef
--- /dev/null
+++ b/queue-6.1/revert-drm-amd-disable-psr-su-on-parade-0803-tcon.patch
@@ -0,0 +1,36 @@
+From 1e66a17ce546eabad753178bbd4175cb52bafca8 Mon Sep 17 00:00:00 2001
+From: Mario Limonciello <mario.limonciello@amd.com>
+Date: Fri, 23 Jun 2023 10:05:22 -0500
+Subject: Revert "drm/amd: Disable PSR-SU on Parade 0803 TCON"
+
+From: Mario Limonciello <mario.limonciello@amd.com>
+
+commit 1e66a17ce546eabad753178bbd4175cb52bafca8 upstream.
+
+This reverts commit 072030b1783056b5de8b0fac5303a5e9dbc6cfde.
+This is no longer necessary when using newer DMUB F/W.
+
+Cc: stable@vger.kernel.org
+Cc: Sean Wang <sean.ns.wang@amd.com>
+Cc: Marc Rossi <Marc.Rossi@amd.com>
+Cc: Hamza Mahfooz <Hamza.Mahfooz@amd.com>
+Cc: Tsung-hua (Ryan) Lin <Tsung-hua.Lin@amd.com>
+Reviewed-by: Leo Li <sunpeng.li@amd.com>
+Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/amd/display/modules/power/power_helpers.c |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/drivers/gpu/drm/amd/display/modules/power/power_helpers.c
++++ b/drivers/gpu/drm/amd/display/modules/power/power_helpers.c
+@@ -816,8 +816,6 @@ bool is_psr_su_specific_panel(struct dc_
+                               ((dpcd_caps->sink_dev_id_str[1] == 0x08 && dpcd_caps->sink_dev_id_str[0] == 0x08) ||
+                               (dpcd_caps->sink_dev_id_str[1] == 0x08 && dpcd_caps->sink_dev_id_str[0] == 0x07)))
+                               isPSRSUSupported = false;
+-                      else if (dpcd_caps->sink_dev_id_str[1] == 0x08 && dpcd_caps->sink_dev_id_str[0] == 0x03)
+-                              isPSRSUSupported = false;
+                       else if (dpcd_caps->psr_info.force_psrsu_cap == 0x1)
+                               isPSRSUSupported = true;
+               }

diff --git a/queue-6.1/scsi-qla2xxx-fix-end-of-loop-test.patch b/queue-6.1/scsi-qla2xxx-fix-end-of-loop-test.patch
new file mode 100644 (file)
index 0000000..a3ddc26
--- /dev/null
+++ b/queue-6.1/scsi-qla2xxx-fix-end-of-loop-test.patch
@@ -0,0 +1,33 @@
+From 339020091e246e708c1381acf74c5f8e3fe4d2b5 Mon Sep 17 00:00:00 2001
+From: Dan Carpenter <dan.carpenter@linaro.org>
+Date: Mon, 22 May 2023 14:09:17 +0300
+Subject: scsi: qla2xxx: Fix end of loop test
+
+From: Dan Carpenter <dan.carpenter@linaro.org>
+
+commit 339020091e246e708c1381acf74c5f8e3fe4d2b5 upstream.
+
+This loop will exit successfully when "found" is false or in the failure
+case it times out with "wait_iter" set to -1.  The test for timeouts is
+impossible as is.
+
+Fixes: b843adde8d49 ("scsi: qla2xxx: Fix mem access after free")
+Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
+Link: https://lore.kernel.org/r/cea5a62f-b873-4347-8f8e-c67527ced8d2@kili.mountain
+Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/scsi/qla2xxx/qla_os.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/scsi/qla2xxx/qla_os.c
++++ b/drivers/scsi/qla2xxx/qla_os.c
+@@ -1399,7 +1399,7 @@ __qla2x00_eh_wait_for_pending_commands(s
+                       break;
+       }
+ 
+-      if (!wait_iter && found)
++      if (wait_iter == -1)
+               status = QLA_FUNCTION_FAILED;
+ 
+       return status;

diff --git a/queue-6.1/series b/queue-6.1/series
index dfad1a9a14b4960538f5d578ebfae5857002406f..c8f63327ae552242db72ff03cc25c13544bfdf0a 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -216,3 +216,6 @@ scsi-qla2xxx-check-valid-rport-returned-by-fc_bsg_to_rport.patch
 scsi-qla2xxx-correct-the-index-of-array.patch
 scsi-qla2xxx-pointer-may-be-dereferenced.patch
 scsi-qla2xxx-remove-unused-nvme_ls_waitq-wait-queue.patch
+scsi-qla2xxx-fix-end-of-loop-test.patch
+mips-kvm-fix-build-error-with-kvm_mips_debug_cop0_counters-enabled.patch
+revert-drm-amd-disable-psr-su-on-parade-0803-tcon.patch