* [PATCH -next] thermal: intel_pch_thermal: fix build for ACPI not enabled
@ 2020-11-17 2:38 Randy Dunlap
2020-12-07 13:47 ` [thermal: thermal/next] " thermal-bot for Randy Dunlap
2020-12-08 14:01 ` [PATCH -next] " Pawnikar, Sumeet R
0 siblings, 2 replies; 3+ messages in thread
From: Randy Dunlap @ 2020-11-17 2:38 UTC (permalink / raw)
To: linux-kernel
Cc: Randy Dunlap, Sumeet Pawnikar, Daniel Lezcano, Zhang Rui,
Amit Kucheria, linux-pm
The reference to acpi_gbl_FADT causes a build error when ACPI is not
enabled. Fix by making that conditional on CONFIG_ACPI.
../drivers/thermal/intel/intel_pch_thermal.c: In function 'pch_wpt_suspend':
../drivers/thermal/intel/intel_pch_thermal.c:217:8: error: 'acpi_gbl_FADT' undeclared (first use in this function); did you mean 'acpi_get_type'?
if (!(acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0))
^~~~~~~~~~~~~
Fixes: ef63b043ac86 ("thermal: intel: pch: fix S0ix failure due to PCH temperature above threshold")
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Sumeet Pawnikar <sumeet.r.pawnikar@intel.com>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Amit Kucheria <amitk@kernel.org>
Cc: linux-pm@vger.kernel.org
---
drivers/thermal/intel/intel_pch_thermal.c | 4 ++++
1 file changed, 4 insertions(+)
--- linux-next-20201116.orig/drivers/thermal/intel/intel_pch_thermal.c
+++ linux-next-20201116/drivers/thermal/intel/intel_pch_thermal.c
@@ -214,8 +214,12 @@ static int pch_wpt_suspend(struct pch_th
}
/* Do not check temperature if it is not a S0ix capable platform */
+#ifdef CONFIG_ACPI
if (!(acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0))
return 0;
+#else
+ return 0;
+#endif
/* Do not check temperature if it is not s2idle */
if (pm_suspend_via_firmware())
^ permalink raw reply [flat|nested] 3+ messages in thread
* [thermal: thermal/next] thermal: intel_pch_thermal: fix build for ACPI not enabled
2020-11-17 2:38 [PATCH -next] thermal: intel_pch_thermal: fix build for ACPI not enabled Randy Dunlap
@ 2020-12-07 13:47 ` thermal-bot for Randy Dunlap
2020-12-08 14:01 ` [PATCH -next] " Pawnikar, Sumeet R
1 sibling, 0 replies; 3+ messages in thread
From: thermal-bot for Randy Dunlap @ 2020-12-07 13:47 UTC (permalink / raw)
To: linux-pm
Cc: Randy Dunlap, Sumeet Pawnikar, Daniel Lezcano, Zhang Rui,
Amit Kucheria, linux-pm
The following commit has been merged into the thermal/next branch of thermal:
Commit-ID: be133722df5168d2f304cc59b80d3d21d6ea9433
Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//be133722df5168d2f304cc59b80d3d21d6ea9433
Author: Randy Dunlap <rdunlap@infradead.org>
AuthorDate: Mon, 16 Nov 2020 18:38:07 -08:00
Committer: Daniel Lezcano <daniel.lezcano@linaro.org>
CommitterDate: Tue, 17 Nov 2020 10:05:43 +01:00
thermal: intel_pch_thermal: fix build for ACPI not enabled
The reference to acpi_gbl_FADT causes a build error when ACPI is not
enabled. Fix by making that conditional on CONFIG_ACPI.
../drivers/thermal/intel/intel_pch_thermal.c: In function 'pch_wpt_suspend':
../drivers/thermal/intel/intel_pch_thermal.c:217:8: error: 'acpi_gbl_FADT' undeclared (first use in this function); did you mean 'acpi_get_type'?
if (!(acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0))
^~~~~~~~~~~~~
Fixes: ef63b043ac86 ("thermal: intel: pch: fix S0ix failure due to PCH temperature above threshold")
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Sumeet Pawnikar <sumeet.r.pawnikar@intel.com>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Amit Kucheria <amitk@kernel.org>
Cc: linux-pm@vger.kernel.org
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20201117023807.8266-1-rdunlap@infradead.org
---
drivers/thermal/intel/intel_pch_thermal.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/thermal/intel/intel_pch_thermal.c b/drivers/thermal/intel/intel_pch_thermal.c
index 32e1b28..d7c05c0 100644
--- a/drivers/thermal/intel/intel_pch_thermal.c
+++ b/drivers/thermal/intel/intel_pch_thermal.c
@@ -214,8 +214,12 @@ static int pch_wpt_suspend(struct pch_thermal_device *ptd)
}
/* Do not check temperature if it is not a S0ix capable platform */
+#ifdef CONFIG_ACPI
if (!(acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0))
return 0;
+#else
+ return 0;
+#endif
/* Do not check temperature if it is not s2idle */
if (pm_suspend_via_firmware())
^ permalink raw reply related [flat|nested] 3+ messages in thread
* RE: [PATCH -next] thermal: intel_pch_thermal: fix build for ACPI not enabled
2020-11-17 2:38 [PATCH -next] thermal: intel_pch_thermal: fix build for ACPI not enabled Randy Dunlap
2020-12-07 13:47 ` [thermal: thermal/next] " thermal-bot for Randy Dunlap
@ 2020-12-08 14:01 ` Pawnikar, Sumeet R
1 sibling, 0 replies; 3+ messages in thread
From: Pawnikar, Sumeet R @ 2020-12-08 14:01 UTC (permalink / raw)
To: Randy Dunlap, linux-kernel
Cc: Daniel Lezcano, Zhang, Rui, Amit Kucheria, linux-pm
> -----Original Message-----
> From: Randy Dunlap <rdunlap@infradead.org>
> Sent: Tuesday, November 17, 2020 8:08 AM
> To: linux-kernel@vger.kernel.org
> Cc: Randy Dunlap <rdunlap@infradead.org>; Pawnikar, Sumeet R
> <sumeet.r.pawnikar@intel.com>; Daniel Lezcano <daniel.lezcano@linaro.org>;
> Zhang, Rui <rui.zhang@intel.com>; Amit Kucheria <amitk@kernel.org>; linux-
> pm@vger.kernel.org
> Subject: [PATCH -next] thermal: intel_pch_thermal: fix build for ACPI not
> enabled
>
> The reference to acpi_gbl_FADT causes a build error when ACPI is not enabled.
> Fix by making that conditional on CONFIG_ACPI.
>
Thanks for finding this issue and fixing it.
Acked-by: Sumeet Pawnikar <sumeet.r.pawnikar@intel.com>
> ../drivers/thermal/intel/intel_pch_thermal.c: In function 'pch_wpt_suspend':
> ../drivers/thermal/intel/intel_pch_thermal.c:217:8: error: 'acpi_gbl_FADT'
> undeclared (first use in this function); did you mean 'acpi_get_type'?
> if (!(acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0))
> ^~~~~~~~~~~~~
>
> Fixes: ef63b043ac86 ("thermal: intel: pch: fix S0ix failure due to PCH
> temperature above threshold")
> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
> Cc: Sumeet Pawnikar <sumeet.r.pawnikar@intel.com>
> Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
> Cc: Zhang Rui <rui.zhang@intel.com>
> Cc: Amit Kucheria <amitk@kernel.org>
> Cc: linux-pm@vger.kernel.org
> ---
> drivers/thermal/intel/intel_pch_thermal.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> --- linux-next-20201116.orig/drivers/thermal/intel/intel_pch_thermal.c
> +++ linux-next-20201116/drivers/thermal/intel/intel_pch_thermal.c
> @@ -214,8 +214,12 @@ static int pch_wpt_suspend(struct pch_th
> }
>
> /* Do not check temperature if it is not a S0ix capable platform */
> +#ifdef CONFIG_ACPI
> if (!(acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0))
> return 0;
> +#else
> + return 0;
> +#endif
>
> /* Do not check temperature if it is not s2idle */
> if (pm_suspend_via_firmware())
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-12-08 14:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-17 2:38 [PATCH -next] thermal: intel_pch_thermal: fix build for ACPI not enabled Randy Dunlap
2020-12-07 13:47 ` [thermal: thermal/next] " thermal-bot for Randy Dunlap
2020-12-08 14:01 ` [PATCH -next] " Pawnikar, Sumeet R
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.