From patchwork Thu Apr 29 12:11:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Costin Lupu X-Patchwork-Id: 12231115 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=-16.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 0BD4FC433ED for ; Thu, 29 Apr 2021 12:11:39 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B5A2F61449 for ; Thu, 29 Apr 2021 12:11:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B5A2F61449 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=cs.pub.ro Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.119951.226787 (Exim 4.92) (envelope-from ) id 1lc5Vw-0003po-OM; Thu, 29 Apr 2021 12:11:28 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 119951.226787; Thu, 29 Apr 2021 12:11:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lc5Vw-0003ph-LS; Thu, 29 Apr 2021 12:11:28 +0000 Received: by outflank-mailman (input) for mailman id 119951; Thu, 29 Apr 2021 12:11:26 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lc5Vu-0003pc-RV for xen-devel@lists.xenproject.org; Thu, 29 Apr 2021 12:11:26 +0000 Received: from mx.upb.ro (unknown [141.85.13.200]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id ec14441a-45b1-4ed4-98a3-d91da804a1ee; Thu, 29 Apr 2021 12:11:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mx.upb.ro (Postfix) with ESMTP id BCA1AB560111; Thu, 29 Apr 2021 15:11:23 +0300 (EEST) Received: from mx.upb.ro ([127.0.0.1]) by localhost (mx.upb.ro [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id dWKHISy5oTLp; Thu, 29 Apr 2021 15:11:21 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by mx.upb.ro (Postfix) with ESMTP id DB37CB560113; Thu, 29 Apr 2021 15:11:21 +0300 (EEST) Received: from mx.upb.ro ([127.0.0.1]) by localhost (mx.upb.ro [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id UyrHAYFsH8iD; Thu, 29 Apr 2021 15:11:21 +0300 (EEST) Received: from localhost.localdomain (unknown [188.25.174.245]) by mx.upb.ro (Postfix) with ESMTPSA id 1BC53B560111; Thu, 29 Apr 2021 15:11:21 +0300 (EEST) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: ec14441a-45b1-4ed4-98a3-d91da804a1ee X-Virus-Scanned: amavisd-new at upb.ro From: Costin Lupu To: xen-devel@lists.xenproject.org Cc: Jan Beulich , Andrew Cooper , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Wei Liu Subject: [PATCH] x86/ACPI: Fix build error when tboot is disabled Date: Thu, 29 Apr 2021 15:11:16 +0300 Message-Id: <79df12ade0840338590f440cd064052a961fe23b.1619698239.git.costin.lupu@cs.pub.ro> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 When tboot is disabled via menuconfig we get undefined reference error for g_tboot_shared. This patch fixes that by disabling the causing source code when tboot is disabled. Signed-off-by: Costin Lupu --- xen/arch/x86/acpi/power.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xen/arch/x86/acpi/power.c b/xen/arch/x86/acpi/power.c index 91a8c4d0bd..29d9775aed 100644 --- a/xen/arch/x86/acpi/power.c +++ b/xen/arch/x86/acpi/power.c @@ -407,6 +407,7 @@ static int acpi_get_wake_status(void) return val; } +#ifdef CONFIG_TBOOT static void tboot_sleep(u8 sleep_state) { uint32_t shutdown_type; @@ -451,18 +452,21 @@ static void tboot_sleep(u8 sleep_state) tboot_shutdown(shutdown_type); } +#endif /* System is really put into sleep state by this stub */ acpi_status acpi_enter_sleep_state(u8 sleep_state) { acpi_status status; +#ifdef CONFIG_TBOOT if ( tboot_in_measured_env() ) { tboot_sleep(sleep_state); printk(XENLOG_ERR "TBOOT failed entering s3 state\n"); return_ACPI_STATUS(AE_ERROR); } +#endif ACPI_FLUSH_CPU_CACHE();