| Message ID | 20230712172459.20275-1-mario.limonciello@amd.com |
|---|---|
| State | Accepted |
| Commit | 5f641174a12b8a876a4101201a21ef4675ecc014 |
| Headers | show |
| Series | ACPI: thermal: Drop nocrt parameter | expand |
On Wed, Jul 12, 2023 at 7:25 PM Mario Limonciello <mario.limonciello@amd.com> wrote: > > 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> Stable material I suppose? > --- > Documentation/admin-guide/kernel-parameters.txt | 4 ---- > drivers/acpi/thermal.c | 6 +----- > 2 files changed, 1 insertion(+), 9 deletions(-) > > diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt > index a1457995fd41c..2de235d52faca 100644 > --- a/Documentation/admin-guide/kernel-parameters.txt > +++ b/Documentation/admin-guide/kernel-parameters.txt > @@ -6243,10 +6243,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 > > diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c > index f9f6ebb08fdb7..3163a40f02e30 100644 > --- a/drivers/acpi/thermal.c > +++ b/drivers/acpi/thermal.c > @@ -82,10 +82,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."); > @@ -1094,7 +1090,7 @@ static int thermal_act(const struct dmi_system_id *d) { > 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) { > --
On 7/13/2023 10:31 AM, Rafael J. Wysocki wrote: > On Wed, Jul 12, 2023 at 7:25 PM Mario Limonciello > <mario.limonciello@amd.com> wrote: >> 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> > Stable material I suppose? Yeah I think so. >> --- >> Documentation/admin-guide/kernel-parameters.txt | 4 ---- >> drivers/acpi/thermal.c | 6 +----- >> 2 files changed, 1 insertion(+), 9 deletions(-) >> >> diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt >> index a1457995fd41c..2de235d52faca 100644 >> --- a/Documentation/admin-guide/kernel-parameters.txt >> +++ b/Documentation/admin-guide/kernel-parameters.txt >> @@ -6243,10 +6243,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 >> >> diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c >> index f9f6ebb08fdb7..3163a40f02e30 100644 >> --- a/drivers/acpi/thermal.c >> +++ b/drivers/acpi/thermal.c >> @@ -82,10 +82,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."); >> @@ -1094,7 +1090,7 @@ static int thermal_act(const struct dmi_system_id *d) { >> 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) { >> --
On Thu, Jul 13, 2023 at 5:40 PM Limonciello, Mario <mario.limonciello@amd.com> wrote: > > > On 7/13/2023 10:31 AM, Rafael J. Wysocki wrote: > > On Wed, Jul 12, 2023 at 7:25 PM Mario Limonciello > > <mario.limonciello@amd.com> wrote: > >> 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> > > Stable material I suppose? > Yeah I think so. OK > >> --- > >> Documentation/admin-guide/kernel-parameters.txt | 4 ---- > >> drivers/acpi/thermal.c | 6 +----- > >> 2 files changed, 1 insertion(+), 9 deletions(-) > >> > >> diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt > >> index a1457995fd41c..2de235d52faca 100644 > >> --- a/Documentation/admin-guide/kernel-parameters.txt > >> +++ b/Documentation/admin-guide/kernel-parameters.txt > >> @@ -6243,10 +6243,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 > >> > >> diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c > >> index f9f6ebb08fdb7..3163a40f02e30 100644 > >> --- a/drivers/acpi/thermal.c > >> +++ b/drivers/acpi/thermal.c > >> @@ -82,10 +82,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."); > >> @@ -1094,7 +1090,7 @@ static int thermal_act(const struct dmi_system_id *d) { > >> 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) { > >> -- Applied as 6.6 material, thanks!
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index a1457995fd41c..2de235d52faca 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -6243,10 +6243,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 diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index f9f6ebb08fdb7..3163a40f02e30 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c @@ -82,10 +82,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."); @@ -1094,7 +1090,7 @@ static int thermal_act(const struct dmi_system_id *d) { 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) {
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> --- Documentation/admin-guide/kernel-parameters.txt | 4 ---- drivers/acpi/thermal.c | 6 +----- 2 files changed, 1 insertion(+), 9 deletions(-)