2020-11-17 02:45:19

by Randy Dunlap

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.

../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 <[email protected]>
Cc: Sumeet Pawnikar <[email protected]>
Cc: Daniel Lezcano <[email protected]>
Cc: Zhang Rui <[email protected]>
Cc: Amit Kucheria <[email protected]>
Cc: [email protected]
---
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())

2020-12-08 14:04:36

by Sumeet Pawnikar

Subject: RE: [PATCH -next] thermal: intel_pch_thermal: fix build for ACPI not enabled

> -----Original Message-----
> From: Randy Dunlap <[email protected]>
> Sent: Tuesday, November 17, 2020 8:08 AM
> To: [email protected]
> Cc: Randy Dunlap <[email protected]>; Pawnikar, Sumeet R
> <[email protected]>; Daniel Lezcano <[email protected]>;
> Zhang, Rui <[email protected]>; Amit Kucheria <[email protected]>; linux-
> [email protected]
> 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 <[email protected]>


> ../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 <[email protected]>
> Cc: Sumeet Pawnikar <[email protected]>
> Cc: Daniel Lezcano <[email protected]>
> Cc: Zhang Rui <[email protected]>
> Cc: Amit Kucheria <[email protected]>
> Cc: [email protected]
> ---
> 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())