From patchwork Tue Nov 29 15:33:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Ostrovsky X-Patchwork-Id: 9452389 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 1CB3960235 for ; Tue, 29 Nov 2016 15:36:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0FEE128399 for ; Tue, 29 Nov 2016 15:36:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 04938283E7; Tue, 29 Nov 2016 15:36:00 +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 8BB7B283E6 for ; Tue, 29 Nov 2016 15:35:59 +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 1cBkPq-0001dN-E7; Tue, 29 Nov 2016 15:33:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cBkPp-0001bd-1Z for xen-devel@lists.xen.org; Tue, 29 Nov 2016 15:33:53 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 9F/01-22514-0EF9D385; Tue, 29 Nov 2016 15:33:52 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrHLMWRWlGSWpSXmKPExsXSO6nOVffBfNs Ig20rmCyWfFzM4sDocXT3b6YAxijWzLyk/IoE1oxJvyYzF8yQrJjdeYW5gfGISBcjF4eQwEQm id6muYwQzm9GifOPm9khnA2MEo0vvkI5Exgl+g5eZOti5ORgEzCSOHt0OiOILSIgLXHt82Wwd maBLYwSd6dsYgFJCAt4S7zY0s8KYrMIqEp8PHSAGcTmFfCS6P28mB3ElhCQk7h5rhMszglU/+ f3a7B6IaCahgv7GSFqDCU+b1zKPIGRbwEjwypGjeLUorLUIl0jS72kosz0jJLcxMwcXUMDU73 c1OLixPTUnMSkYr3k/NxNjMBwqWdgYNzBeHmL3yFGSQ4mJVHe6W42EUJ8SfkplRmJxRnxRaU5 qcWHGGU4OJQkeHPn2UYICRalpqdWpGXmAAMXJi3BwaMkwjt1LlCat7ggMbc4Mx0idYpRUUqcd wJInwBIIqM0D64NFi2XGGWlhHkZGRgYhHgKUotyM0tQ5V8xinMwKgnzxoBM4cnMK4Gb/gpoMR PQ4revrUEWlyQipKQaGCexHOnecWnRDC/267MvbWBUaJd11iyf/XX3PiP2t67rLipobU4qP6F kZi/zv3Hv6oOWMd/7G9qLeA5IPfR/nPTCeJvIRF0GM61NVzSzUrSMJhb/O7F+RsKGyydVFZ8z V+QeWGkeGPNDv186Q8+i0zS4zrLlxA2/6WXXGzcdc49Pij14c3fhNSWW4oxEQy3mouJEAMWe1 CeRAgAA X-Env-Sender: boris.ostrovsky@oracle.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1480433630!71202362!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMjc3MjE4\n X-StarScan-Received: X-StarScan-Version: 9.0.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7306 invoked from network); 29 Nov 2016 15:33:52 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-5.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 29 Nov 2016 15:33:52 -0000 Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id uATFXhue020252 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 29 Nov 2016 15:33:44 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id uATFXh3C010440 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 29 Nov 2016 15:33:43 GMT Received: from abhmp0002.oracle.com (abhmp0002.oracle.com [141.146.116.8]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id uATFXhb9013299; Tue, 29 Nov 2016 15:33:43 GMT Received: from ostr-laptop.us.oracle.com (/10.152.23.90) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 29 Nov 2016 07:33:42 -0800 From: Boris Ostrovsky To: xen-devel@lists.xen.org Date: Tue, 29 Nov 2016 10:33:12 -0500 Message-Id: <1480433602-13290-6-git-send-email-boris.ostrovsky@oracle.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1480433602-13290-1-git-send-email-boris.ostrovsky@oracle.com> References: <1480433602-13290-1-git-send-email-boris.ostrovsky@oracle.com> X-Source-IP: userv0022.oracle.com [156.151.31.74] 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 v4 05/15] acpi/x86: Define ACPI IO registers 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 Define VCPU available map address (used by AML's PRSC method) and GPE0 CPU hotplug event number. Use these definitions in mk_dsdt instead hardcoded values. These definitions will later be used by both the hypervisor and the toolstack (initially for PVH guests only), thus they are placed in public headers. Signed-off-by: Boris Ostrovsky Reviewed-by: Jan Beulich --- Changes in v4: * Macros for registers length and offset stay in static_tables.c, a comment statig that they should not change without corresponding change to struct hvm_hw_acpi is added * Definitions of EN_ACPI_CPU_MAP* and XEN_GPE0_CPUHP_BIT are moved to include/public/arch-x86/xen.h tools/libacpi/mk_dsdt.c | 7 +++++-- tools/libacpi/static_tables.c | 4 ++++ xen/include/public/arch-x86/xen.h | 7 +++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/tools/libacpi/mk_dsdt.c b/tools/libacpi/mk_dsdt.c index 5765822..606e7a0 100644 --- a/tools/libacpi/mk_dsdt.c +++ b/tools/libacpi/mk_dsdt.c @@ -18,6 +18,7 @@ #include #include #if defined(__i386__) || defined(__x86_64__) +#include #include #elif defined(__aarch64__) #include @@ -244,7 +245,8 @@ int main(int argc, char **argv) #endif /* Operation Region 'PRST': bitmask of online CPUs. */ - stmt("OperationRegion", "PRST, SystemIO, 0xaf00, 32"); + stmt("OperationRegion", "PRST, SystemIO, %#x, %d", + XEN_ACPI_CPU_MAP, XEN_ACPI_CPU_MAP_LEN); push_block("Field", "PRST, ByteAcc, NoLock, Preserve"); indent(); printf("PRS, %u\n", max_cpus); pop_block(); @@ -283,7 +285,8 @@ int main(int argc, char **argv) /* Define GPE control method. */ push_block("Scope", "\\_GPE"); push_block("Method", - dm_version == QEMU_XEN_TRADITIONAL ? "_L02" : "_E02"); + dm_version == QEMU_XEN_TRADITIONAL ? "_L%02d" : "_E%02d", + XEN_GPE0_CPUHP_BIT); stmt("\\_SB.PRSC ()", NULL); pop_block(); pop_block(); diff --git a/tools/libacpi/static_tables.c b/tools/libacpi/static_tables.c index 617bf68..f48b954 100644 --- a/tools/libacpi/static_tables.c +++ b/tools/libacpi/static_tables.c @@ -31,6 +31,10 @@ struct acpi_20_facs Facs = { * Fixed ACPI Description Table (FADT). */ +/* + * These values must match register definitions in struct hvm_hw_acpi + * (in xen/include/public/arch-x86/hvm/save.h). + */ #define ACPI_PM1A_EVT_BLK_BIT_WIDTH 0x20 #define ACPI_PM1A_EVT_BLK_BIT_OFFSET 0x00 #define ACPI_PM1A_CNT_BLK_BIT_WIDTH 0x10 diff --git a/xen/include/public/arch-x86/xen.h b/xen/include/public/arch-x86/xen.h index cdd93c1..0e3a3df 100644 --- a/xen/include/public/arch-x86/xen.h +++ b/xen/include/public/arch-x86/xen.h @@ -291,6 +291,13 @@ struct xen_arch_domainconfig { XEN_X86_EMU_PIT) uint32_t emulation_flags; }; + +/* Location of online VCPU bitmap. */ +#define XEN_ACPI_CPU_MAP 0xaf00 +#define XEN_ACPI_CPU_MAP_LEN ((HVM_MAX_VCPUS + 7) / 8) + +/* GPE0 bit set during CPU hotplug */ +#define XEN_GPE0_CPUHP_BIT 2 #endif #endif /* !__ASSEMBLY__ */