From patchwork Mon Nov 21 21:00:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Ostrovsky X-Patchwork-Id: 9440035 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 54285606DB for ; Mon, 21 Nov 2016 21:03:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 48B7528897 for ; Mon, 21 Nov 2016 21:03:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3D739288E2; Mon, 21 Nov 2016 21:03:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EA0E12889C for ; Mon, 21 Nov 2016 21:03:31 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1c8vi9-0003Vq-0h; Mon, 21 Nov 2016 21:01:09 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1c8vi8-0003UC-2L for xen-devel@lists.xen.org; Mon, 21 Nov 2016 21:01:08 +0000 Received: from [193.109.254.147] by server-11.bemta-6.messagelabs.com id 23/95-28490-39063385; Mon, 21 Nov 2016 21:01:07 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrLLMWRWlGSWpSXmKPExsUyZ7p8oO6kBOM Ig6YfShZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8bCbT3sBav5K3ZsZm9g3MrTxcjFISQwmUmi dcN5NgjnN6PElP+tzBDORkaJy8emQzkTGCUal69j7GLk5GATMJI4e3Q6mC0iIC1x7fNlRpAiZ oEtjBI7Lq4CSwgLxEhM2nmLFcRmEVCVWH9yKjuIzSvgJXH55Ek2EFtCQE7i5rlOZhCbU8BbYs r5N2A1QkA1F56fZ4KoMZZof3uRbQIj3wJGhlWMGsWpRWWpRbpG5npJRZnpGSW5iZk5uoYGZnq 5qcXFiempOYlJxXrJ+bmbGIHBwgAEOxgXrw08xCjJwaQkynt4qVGEEF9SfkplRmJxRnxRaU5q 8SFGGQ4OJQneafHGEUKCRanpqRVpmTnAsIVJS3DwKInwngZJ8xYXJOYWZ6ZDpE4xKkqJ8yaCJ ARAEhmleXBtsFi5xCgrJczLCHSIEE9BalFuZgmq/CtGcQ5GJWHeSyBTeDLzSuCmvwJazAS0WI nVAGRxSSJCSqqBUUZO6caNKb/6z1j/YpdUjJFJWxfxMf9rzk7D9Xse/uHclXajw6nqoY20gX7 L9i+9TBsEP3NrGrBsluByyOGq3qi01EjNw781vmd2zVLPJ+pbH19+LnDgVjNnr4LViSvxZ9/s fMDbOjny57HePu5679ZvjfLvBTkuv2kt27BAx+Pp0el9s9JnKrEUZyQaajEXFScCAOp1lr+QA gAA X-Env-Sender: boris.ostrovsky@oracle.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1479762064!20260641!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiAyODgzMzk=\n X-StarScan-Received: X-StarScan-Version: 9.0.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 54633 invoked from network); 21 Nov 2016 21:01:06 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-15.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 21 Nov 2016 21:01:06 -0000 Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id uALL0xqL005507 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 21 Nov 2016 21:00:59 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id uALL0w9S029037 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 21 Nov 2016 21:00:59 GMT Received: from abhmp0013.oracle.com (abhmp0013.oracle.com [141.146.116.19]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id uALL0wNM017126; Mon, 21 Nov 2016 21:00:58 GMT Received: from ostr-laptop.us.oracle.com (/10.152.23.90) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 21 Nov 2016 13:00:58 -0800 From: Boris Ostrovsky To: xen-devel@lists.xen.org Date: Mon, 21 Nov 2016 16:00:41 -0500 Message-Id: <1479762047-29431-6-git-send-email-boris.ostrovsky@oracle.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1479762047-29431-1-git-send-email-boris.ostrovsky@oracle.com> References: <1479762047-29431-1-git-send-email-boris.ostrovsky@oracle.com> X-Source-IP: aserv0022.oracle.com [141.146.126.234] Cc: wei.liu2@citrix.com, andrew.cooper3@citrix.com, ian.jackson@eu.citrix.com, jbeulich@suse.com, Boris Ostrovsky , roger.pau@citrix.com Subject: [Xen-devel] [PATCH v3 05/11] acpi: Power and Sleep ACPI buttons are not emulated for PVH guests X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Boris Ostrovsky Reviewed-by: Konrad Rzeszutek Wilk Acked-by: Jan Beulich --- tools/firmware/hvmloader/util.c | 3 ++- tools/libacpi/build.c | 2 ++ tools/libacpi/libacpi.h | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/util.c index 1d78973..a3f12fe 100644 --- a/tools/firmware/hvmloader/util.c +++ b/tools/firmware/hvmloader/util.c @@ -949,7 +949,8 @@ void hvmloader_acpi_build_tables(struct acpi_config *config, config->table_flags |= ACPI_HAS_SSDT_S4; config->table_flags |= (ACPI_HAS_TCPA | ACPI_HAS_IOAPIC | - ACPI_HAS_WAET | ACPI_HAS_PMTIMER); + ACPI_HAS_WAET | ACPI_HAS_PMTIMER | + ACPI_HAS_BUTTONS); config->tis_hdr = (uint16_t *)ACPI_TIS_HDR_ADDRESS; diff --git a/tools/libacpi/build.c b/tools/libacpi/build.c index e1fd381..4a2e2a9 100644 --- a/tools/libacpi/build.c +++ b/tools/libacpi/build.c @@ -579,6 +579,8 @@ int acpi_build_tables(struct acpi_ctxt *ctxt, struct acpi_config *config) Fadt.pm_tmr_blk = Fadt.pm_tmr_len = 0; memset(&Fadt.x_pm_tmr_blk, 0, sizeof(Fadt.x_pm_tmr_blk)); } + if ( !(config->table_flags & ACPI_HAS_BUTTONS) ) + Fadt.flags |= (ACPI_PWR_BUTTON | ACPI_SLP_BUTTON); memcpy(fadt, &Fadt, sizeof(struct acpi_20_fadt)); fadt->dsdt = ctxt->mem_ops.v2p(ctxt, dsdt); fadt->x_dsdt = ctxt->mem_ops.v2p(ctxt, dsdt); diff --git a/tools/libacpi/libacpi.h b/tools/libacpi/libacpi.h index bda692e..dd6ef8b 100644 --- a/tools/libacpi/libacpi.h +++ b/tools/libacpi/libacpi.h @@ -31,6 +31,7 @@ #define ACPI_HAS_IOAPIC (1<<8) #define ACPI_HAS_WAET (1<<9) #define ACPI_HAS_PMTIMER (1<<10) +#define ACPI_HAS_BUTTONS (1<<11) struct xen_vmemrange; struct acpi_numa {