From patchwork Thu Aug 31 05:01:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "lan,Tianyu" X-Patchwork-Id: 9931907 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 72F52603B4 for ; Thu, 31 Aug 2017 11:12:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6B6C12236A for ; Thu, 31 Aug 2017 11:12:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 60456274A3; Thu, 31 Aug 2017 11:12:03 +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=-2.7 required=2.0 tests=BAYES_00, DATE_IN_PAST_06_12, 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 D1A1B28927 for ; Thu, 31 Aug 2017 11:12:02 +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 1dnNMB-0000PW-9f; Thu, 31 Aug 2017 11:09:55 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dnNMA-0000Ot-7d for xen-devel@lists.xen.org; Thu, 31 Aug 2017 11:09:54 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 29/15-01778-18EE7A95; Thu, 31 Aug 2017 11:09:53 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrHLMWRWlGSWpSXmKPExsXS1tYhotv4bnm kwdf9TBZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8auM/uZCw5qVTx+3cvewLhNvouRi0NIYBqj xObNi9i7GDk5JAR4JY4sm8HaxcgBZPtLzF7FDVHTzihx4MELJpAaNgF1iROLJzKC2CIC0hLXP l9mBCliFjjFKHHp739mkIQwUPP2fyfAhrIIqEocf7YWrIFXwEVi1azbLBDLFCSmPHwPVs8p4C rRMOkbmC0EVNNyaSfTBEbeBYwMqxjVi1OLylKLdA31kooy0zNKchMzc3QNDYz1clOLixPTU3M Sk4r1kvNzNzECw4EBCHYwLv/odIhRkoNJSZT34e3lkUJ8SfkplRmJxRnxRaU5qcWHGGU4OJQk eAveAuUEi1LTUyvSMnOAgQmTluDgURLhXfwGKM1bXJCYW5yZDpE6xagoJc4rBdInAJLIKM2Da 4NFwyVGWSlhXkagQ4R4ClKLcjNLUOVfMYpzMCoJ80aBTOHJzCuBm/4KaDET0OJYr6Ugi0sSEV JSDYwiK+RmPPzAEFG7RMA6v3Gt2fk7puU/VhU9KbhT2Tn7p0Rv7/zgGTpv38mcFbv4R6mu+bj uIRb7upee02w6q0yuVnndW8K+ONvHasXu11U+G+XlX13/nV+8oCttN5fg4XeHvVcpzTFot4+0 29C8cL+vW4VF9W8z9v3nZGMmOCw/dOiDY/jyA5eVWIozEg21mIuKEwFogltXgQIAAA== X-Env-Sender: tianyu.lan@intel.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1504177790!107913325!1 X-Originating-IP: [134.134.136.20] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjAgPT4gMzU1MzU4\n X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22421 invoked from network); 31 Aug 2017 11:09:52 -0000 Received: from mga02.intel.com (HELO mga02.intel.com) (134.134.136.20) by server-13.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 31 Aug 2017 11:09:52 -0000 Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 Aug 2017 04:09:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,451,1498546800"; d="scan'208";a="124337175" Received: from sky-ws.sh.intel.com (HELO localhost) ([10.239.48.74]) by orsmga004.jf.intel.com with ESMTP; 31 Aug 2017 04:09:48 -0700 From: Lan Tianyu To: xen-devel@lists.xen.org Date: Thu, 31 Aug 2017 01:01:48 -0400 Message-Id: <1504155709-24276-4-git-send-email-tianyu.lan@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1504155709-24276-1-git-send-email-tianyu.lan@intel.com> References: <1504155709-24276-1-git-send-email-tianyu.lan@intel.com> Cc: Lan Tianyu , kevin.tian@intel.com, wei.liu2@citrix.com, andrew.cooper3@citrix.com, ian.jackson@eu.citrix.com, jbeulich@suse.com, roger.pau@citrix.com, chao.gao@intel.com Subject: [Xen-devel] [RFC PATCH V2 3/4] hvmload: Add x2apic entry support in the MADT build 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 This patch is to add x2apic entry support for ACPI MADT table according to ACPI spec 5.2.12.12 Processor Local x2APIC Structure Signed-off-by: Chao Gao Signed-off-by: Lan Tianyu --- tools/libacpi/acpi2_0.h | 10 +++++++++ tools/libacpi/build.c | 59 +++++++++++++++++++++++++++++++++++-------------- 2 files changed, 52 insertions(+), 17 deletions(-) diff --git a/tools/libacpi/acpi2_0.h b/tools/libacpi/acpi2_0.h index 758a823..caa3682 100644 --- a/tools/libacpi/acpi2_0.h +++ b/tools/libacpi/acpi2_0.h @@ -322,6 +322,7 @@ struct acpi_20_waet { #define ACPI_IO_SAPIC 0x06 #define ACPI_PROCESSOR_LOCAL_SAPIC 0x07 #define ACPI_PLATFORM_INTERRUPT_SOURCES 0x08 +#define ACPI_PROCESSOR_LOCAL_X2APIC 0x09 /* * APIC Structure Definitions. @@ -338,6 +339,15 @@ struct acpi_20_madt_lapic { uint32_t flags; }; +struct acpi_20_madt_x2apic { + uint8_t type; + uint8_t length; + uint16_t reserved; /* reserved - must be zero */ + uint32_t apic_id; /* Processor x2APIC ID */ + uint32_t flags; + uint32_t acpi_processor_id; /* ACPI processor UID */ +}; + /* * Local APIC Flags. All other bits are reserved and must be 0. */ diff --git a/tools/libacpi/build.c b/tools/libacpi/build.c index c7cc784..0c95850 100644 --- a/tools/libacpi/build.c +++ b/tools/libacpi/build.c @@ -82,9 +82,9 @@ static struct acpi_20_madt *construct_madt(struct acpi_ctxt *ctxt, struct acpi_20_madt *madt; struct acpi_20_madt_intsrcovr *intsrcovr; struct acpi_20_madt_ioapic *io_apic; - struct acpi_20_madt_lapic *lapic; const struct hvm_info_table *hvminfo = config->hvminfo; int i, sz; + void *end; if ( config->lapic_id == NULL ) return NULL; @@ -92,7 +92,12 @@ static struct acpi_20_madt *construct_madt(struct acpi_ctxt *ctxt, sz = sizeof(struct acpi_20_madt); sz += sizeof(struct acpi_20_madt_intsrcovr) * 16; sz += sizeof(struct acpi_20_madt_ioapic); - sz += sizeof(struct acpi_20_madt_lapic) * hvminfo->nr_vcpus; + + if (hvminfo->nr_vcpus < 128) + sz += sizeof(struct acpi_20_madt_lapic) * hvminfo->nr_vcpus; + else + sz += sizeof(struct acpi_20_madt_lapic) * 128 + + sizeof(struct acpi_20_madt_x2apic) * (hvminfo->nr_vcpus - 128); madt = ctxt->mem_ops.alloc(ctxt, sz, 16); if (!madt) return NULL; @@ -109,7 +114,7 @@ static struct acpi_20_madt *construct_madt(struct acpi_ctxt *ctxt, madt->flags = ACPI_PCAT_COMPAT; if ( config->table_flags & ACPI_HAS_IOAPIC ) - { + { intsrcovr = (struct acpi_20_madt_intsrcovr *)(madt + 1); for ( i = 0; i < 16; i++ ) { @@ -146,27 +151,47 @@ static struct acpi_20_madt *construct_madt(struct acpi_ctxt *ctxt, io_apic->ioapic_id = config->ioapic_id; io_apic->ioapic_addr = config->ioapic_base_address; - lapic = (struct acpi_20_madt_lapic *)(io_apic + 1); + end = (struct acpi_20_madt_lapic *)(io_apic + 1); } else - lapic = (struct acpi_20_madt_lapic *)(madt + 1); + end = (struct acpi_20_madt_lapic *)(madt + 1); + + info->madt_lapic0_addr = ctxt->mem_ops.v2p(ctxt, end); - info->nr_cpus = hvminfo->nr_vcpus; - info->madt_lapic0_addr = ctxt->mem_ops.v2p(ctxt, lapic); for ( i = 0; i < hvminfo->nr_vcpus; i++ ) { - memset(lapic, 0, sizeof(*lapic)); - lapic->type = ACPI_PROCESSOR_LOCAL_APIC; - lapic->length = sizeof(*lapic); - /* Processor ID must match processor-object IDs in the DSDT. */ - lapic->acpi_processor_id = i; - lapic->apic_id = config->lapic_id(i); - lapic->flags = (test_bit(i, hvminfo->vcpu_online) - ? ACPI_LOCAL_APIC_ENABLED : 0); - lapic++; + unsigned int apic_id = config->lapic_id(i); + + if ( apic_id < 255 ) { + struct acpi_20_madt_lapic *lapic = end; + + memset(lapic, 0, sizeof(*lapic)); + lapic->type = ACPI_PROCESSOR_LOCAL_APIC; + lapic->length = sizeof(*lapic); + /* Processor ID must match processor-object IDs in the DSDT. */ + lapic->acpi_processor_id = i; + lapic->apic_id = config->lapic_id(i); + lapic->flags = ((i < hvminfo->nr_vcpus) && + test_bit(i, hvminfo->vcpu_online) + ? ACPI_LOCAL_APIC_ENABLED : 0); + end = ++lapic; + } else { + struct acpi_20_madt_x2apic *lapic = end; + + memset(lapic, 0, sizeof(*lapic)); + lapic->type = ACPI_PROCESSOR_LOCAL_X2APIC; + lapic->length = sizeof(*lapic); + /* Processor ID must match processor-object IDs in the DSDT. */ + lapic->acpi_processor_id = i; + lapic->apic_id = config->lapic_id(i); + lapic->flags = test_bit(i, hvminfo->vcpu_online) + ? ACPI_LOCAL_APIC_ENABLED : 0; + end = ++lapic; + } } - madt->header.length = (unsigned char *)lapic - (unsigned char *)madt; + info->nr_cpus = hvminfo->nr_vcpus; + madt->header.length = (unsigned char *)end - (unsigned char *)madt; set_checksum(madt, offsetof(struct acpi_header, checksum), madt->header.length); info->madt_csum_addr =