From patchwork Mon Dec 7 13:47:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: thermal-bot for Julien Panis X-Patchwork-Id: 339401 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-20.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A4158C1B087 for ; Mon, 7 Dec 2020 13:47:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7418B23441 for ; Mon, 7 Dec 2020 13:47:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726177AbgLGNr5 (ORCPT ); Mon, 7 Dec 2020 08:47:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33570 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726080AbgLGNr4 (ORCPT ); Mon, 7 Dec 2020 08:47:56 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 679DFC0613D3 for ; Mon, 7 Dec 2020 05:47:16 -0800 (PST) Date: Mon, 07 Dec 2020 13:47:14 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1607348834; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XjMHStLz3aHxn+cz/AVxTTnAgCR2nVUA8LcQ7fahf80=; b=sjinzMlKTmhrvHP4NSqSpM+WK7aHsk+VtALaVWnqYWZycYiMAPP+WRt7lxdAsqoN+9WNT0 kF6OoFF21ZrWl2eqFPuDG6Ee8Jvsrpn0LFewHh7GW9x2YvQq1w6Vl0Qxj9jeKT8zmXXwO/ sJd+RIScN8UU+drtBnYexhUSgWEEyZEcivBHUJj4LQJl2y0kzBs9kmVUkLhyB6OVkARqq3 spgkwSFnz7g/576GyG4xfTXZPRmXfzprSkjB2Gb1egXQrAnzj2gOJ3meF0K29PGyS/9+5x sf/SSIaLNZowfqSWIhxhRHX9YEFEQ9HeoPGxy1jlbjWdnjOXUVo2q/ahnp5SGg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1607348834; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XjMHStLz3aHxn+cz/AVxTTnAgCR2nVUA8LcQ7fahf80=; b=CVbsnRZAoddTujP4HLOUO8Ai9W9+jB8HFA/BYxDFHBTcYbStvzwzHY4KhruZA7eETA3mfj XWCR+3XCqIJRzdDQ== From: "thermal-bot for Randy Dunlap" Sender: tip-bot2@linutronix.de Reply-to: linux-pm@vger.kernel.org To: linux-pm@vger.kernel.org Subject: [thermal: thermal/next] thermal: intel_pch_thermal: fix build for ACPI not enabled Cc: Randy Dunlap , Sumeet Pawnikar , Daniel Lezcano , Zhang Rui , Amit Kucheria , linux-pm@vger.kernel.org In-Reply-To: <20201117023807.8266-1-rdunlap@infradead.org> References: <20201117023807.8266-1-rdunlap@infradead.org> MIME-Version: 1.0 Message-ID: <160734883428.3364.5035247709632805604.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org 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 AuthorDate: Mon, 16 Nov 2020 18:38:07 -08:00 Committer: Daniel Lezcano 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 Cc: Sumeet Pawnikar Cc: Daniel Lezcano Cc: Zhang Rui Cc: Amit Kucheria Cc: linux-pm@vger.kernel.org Signed-off-by: Daniel Lezcano 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())