From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 30 Aug 2023 15:04:34 +0000 (+0200)
Subject: 6.1-stable patches
X-Git-Tag: v6.5.1~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=afe2cd465b624969c987854c9b5eede9762afb1f;p=thirdparty%2Fkernel%2Fstable-queue.git

6.1-stable patches

added patches:
	acpi-thermal-drop-nocrt-parameter.patch
	series
---

diff --git a/queue-6.1/acpi-thermal-drop-nocrt-parameter.patch b/queue-6.1/acpi-thermal-drop-nocrt-parameter.patch
new file mode 100644
index 00000000000..fe0857bb271
--- /dev/null
+++ b/queue-6.1/acpi-thermal-drop-nocrt-parameter.patch
@@ -0,0 +1,61 @@
+From 5f641174a12b8a876a4101201a21ef4675ecc014 Mon Sep 17 00:00:00 2001
+From: Mario Limonciello <mario.limonciello@amd.com>
+Date: Wed, 12 Jul 2023 12:24:59 -0500
+Subject: ACPI: thermal: Drop nocrt parameter
+
+From: Mario Limonciello <mario.limonciello@amd.com>
+
+commit 5f641174a12b8a876a4101201a21ef4675ecc014 upstream.
+
+The `nocrt` module parameter has no code associated with it and does
+nothing.  As `crt=-1` has same functionality as what nocrt should be
+doing drop `nocrt` and associated documentation.
+
+This should fix a quirk for Gigabyte GA-7ZX that used `nocrt` and
+thus didn't function properly.
+
+Fixes: 8c99fdce3078 ("ACPI: thermal: set "thermal.nocrt" via DMI on Gigabyte GA-7ZX")
+Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
+Cc: All applicable <stable@vger.kernel.org>
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ Documentation/admin-guide/kernel-parameters.txt |    4 ----
+ drivers/acpi/thermal.c                          |    6 +-----
+ 2 files changed, 1 insertion(+), 9 deletions(-)
+
+--- a/Documentation/admin-guide/kernel-parameters.txt
++++ b/Documentation/admin-guide/kernel-parameters.txt
+@@ -6164,10 +6164,6 @@
+ 			-1: disable all critical trip points in all thermal zones
+ 			<degrees C>: override all critical trip points
+ 
+-	thermal.nocrt=	[HW,ACPI]
+-			Set to disable actions on ACPI thermal zone
+-			critical and hot trip points.
+-
+ 	thermal.off=	[HW,ACPI]
+ 			1: disable ACPI thermal control
+ 
+--- a/drivers/acpi/thermal.c
++++ b/drivers/acpi/thermal.c
+@@ -59,10 +59,6 @@ static int tzp;
+ module_param(tzp, int, 0444);
+ MODULE_PARM_DESC(tzp, "Thermal zone polling frequency, in 1/10 seconds.");
+ 
+-static int nocrt;
+-module_param(nocrt, int, 0);
+-MODULE_PARM_DESC(nocrt, "Set to take no action upon ACPI thermal zone critical trips points.");
+-
+ static int off;
+ module_param(off, int, 0);
+ MODULE_PARM_DESC(off, "Set to disable ACPI thermal support.");
+@@ -1128,7 +1124,7 @@ static int thermal_act(const struct dmi_
+ static int thermal_nocrt(const struct dmi_system_id *d) {
+ 	pr_notice("%s detected: disabling all critical thermal trip point actions.\n",
+ 		  d->ident);
+-	nocrt = 1;
++	crt = -1;
+ 	return 0;
+ }
+ static int thermal_tzp(const struct dmi_system_id *d) {
diff --git a/queue-6.1/series b/queue-6.1/series
new file mode 100644
index 00000000000..1f56db43702
--- /dev/null
+++ b/queue-6.1/series
@@ -0,0 +1 @@
+acpi-thermal-drop-nocrt-parameter.patch