From patchwork Fri Dec 2 13:48:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Roger Pau Monne X-Patchwork-Id: 9458423 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 04F1B60236 for ; Fri, 2 Dec 2016 13:51:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EBE33284A2 for ; Fri, 2 Dec 2016 13:51:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E0C0828562; Fri, 2 Dec 2016 13:51:56 +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 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 8EBDB284A2 for ; Fri, 2 Dec 2016 13:51:56 +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 1cCoDu-0004yB-NY; Fri, 02 Dec 2016 13:49:58 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cCoDt-0004xp-TH for xen-devel@lists.xenproject.org; Fri, 02 Dec 2016 13:49:57 +0000 Received: from [85.158.143.35] by server-6.bemta-6.messagelabs.com id 31/76-28843-50C71485; Fri, 02 Dec 2016 13:49:57 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprHIsWRWlGSWpSXmKPExsXitHRDpC5LjWO EwfE1qhbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8aS7w9ZC36IVLzdN529gXGKYBcjJ4eEgL/E wQ//mEBsNgEdiYtzd7KB2CICsRLrGq8Cxbk4mAUOMEqcbG1iAUkICyRIHOueB2azCKhINO1ZC dbMK2Ap8ezeATaIoboSt5ftYgexOQWsJHpmvwWrEQKquXj9JyNEvaDEyZlPwOYwC2hKtG7/zQ 5hy0s0b53NDFGvKNE/7wHbBEa+WUhaZiFpmYWkZQEj8ypGjeLUorLUIl0jC72kosz0jJLcxMw cXUMDM73c1OLixPTUnMSkYr3k/NxNjMBwYwCCHYzn1wYeYpTkYFIS5TXNcYwQ4kvKT6nMSCzO iC8qzUktPsQow8GhJMG7vgooJ1iUmp5akZaZAwx8mLQEB4+SCK8iSJq3uCAxtzgzHSJ1ilFRS px3BUhCACSRUZoH1waLtkuMslLCvIxAhwjxFKQW5WaWoMq/YhTnYFQS5tWqBprCk5lXAjf9Fd BiJqDFHdftQRaXJCKkpBoYpynd0fnjv13z2r9/f/bsYcttmqPM+o7PKPPwqVPKz1z6K6+HeBd 3duwpZ949p2W24Yn+msB1Pn+/KV98dN7GMl5YUktGM9fr4tl59YHFUT/kne0X/Por/Fmy1th3 3ialhzvDPoVOuj1HYVne9y1zN8/1dp3ZPvGq6nXx9w+Wz+ir225790viXiWW4oxEQy3mouJEA Mj7SRaxAgAA X-Env-Sender: prvs=137ee02cb=roger.pau@citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1480686589!46240175!2 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.0.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 35179 invoked from network); 2 Dec 2016 13:49:56 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-8.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 2 Dec 2016 13:49:56 -0000 X-IronPort-AV: E=Sophos;i="5.33,729,1477958400"; d="scan'208";a="392697637" From: Roger Pau Monne To: , , Date: Fri, 2 Dec 2016 13:48:49 +0000 Message-ID: <20161202134851.57483-3-roger.pau@citrix.com> X-Mailer: git-send-email 2.9.3 (Apple Git-75) In-Reply-To: <20161202134851.57483-1-roger.pau@citrix.com> References: <20161202134851.57483-1-roger.pau@citrix.com> MIME-Version: 1.0 Cc: Andrew Cooper , Ian Jackson , Wei Liu , Jan Beulich , Roger Pau Monne Subject: [Xen-devel] [PATCH v2 2/4] tools/libacpi: set FADT boot flag to notify lack of VGA for PVHv2 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: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP PVHv2 guests don't have any VGA card, and as so it must be notified in the FADT. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich Reviewed-by: Andrew Cooper --- Cc: Jan Beulich Cc: Andrew Cooper Cc: Ian Jackson Cc: Wei Liu Cc: boris.ostrovsky@oracle.com Cc: konrad.wilk@oracle.com --- tools/firmware/hvmloader/util.c | 3 ++- tools/libacpi/acpi2_0.h | 2 ++ tools/libacpi/build.c | 2 ++ tools/libacpi/libacpi.h | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/util.c index 6e0cfe7..3e192bf 100644 --- a/tools/firmware/hvmloader/util.c +++ b/tools/firmware/hvmloader/util.c @@ -948,7 +948,8 @@ void hvmloader_acpi_build_tables(struct acpi_config *config, if ( !strncmp(xenstore_read("platform/acpi_s4", "1"), "1", 1) ) config->table_flags |= ACPI_HAS_SSDT_S4; - config->table_flags |= (ACPI_HAS_TCPA | ACPI_HAS_IOAPIC | ACPI_HAS_WAET); + config->table_flags |= (ACPI_HAS_TCPA | ACPI_HAS_IOAPIC | ACPI_HAS_WAET | + ACPI_HAS_VGA); config->tis_hdr = (uint16_t *)ACPI_TIS_HDR_ADDRESS; diff --git a/tools/libacpi/acpi2_0.h b/tools/libacpi/acpi2_0.h index 5ddef8a..500f95e 100644 --- a/tools/libacpi/acpi2_0.h +++ b/tools/libacpi/acpi2_0.h @@ -229,6 +229,8 @@ struct acpi_20_fadt { */ #define ACPI_FADT_LEGACY_DEVICES (1 << 0) #define ACPI_FADT_8042 (1 << 1) +#define ACPI_FADT_NO_VGA (1 << 2) + /* * FADT Fixed Feature Flags. */ diff --git a/tools/libacpi/build.c b/tools/libacpi/build.c index 47dae01..8799e2c 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->x_dsdt = ctxt->mem_ops.v2p(ctxt, dsdt); fadt->firmware_ctrl = ctxt->mem_ops.v2p(ctxt, facs); fadt->x_firmware_ctrl = ctxt->mem_ops.v2p(ctxt, facs); + if ( !(config->table_flags & ACPI_HAS_VGA) ) + fadt->iapc_boot_arch |= ACPI_FADT_NO_VGA; set_checksum(fadt, offsetof(struct acpi_header, checksum), sizeof(struct acpi_20_fadt)); diff --git a/tools/libacpi/libacpi.h b/tools/libacpi/libacpi.h index 1d388f9..d7ea6e1 100644 --- a/tools/libacpi/libacpi.h +++ b/tools/libacpi/libacpi.h @@ -30,6 +30,7 @@ #define ACPI_HAS_TCPA (1<<7) #define ACPI_HAS_IOAPIC (1<<8) #define ACPI_HAS_WAET (1<<9) +#define ACPI_HAS_VGA (1<<10) struct xen_vmemrange; struct acpi_numa {