From patchwork Thu Aug 31 05:01:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "lan,Tianyu" X-Patchwork-Id: 9931911 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 D2B6A6016C for ; Thu, 31 Aug 2017 11:12:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CBD5420243 for ; Thu, 31 Aug 2017 11:12:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C0B9523E64; Thu, 31 Aug 2017 11:12:13 +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 128C920243 for ; Thu, 31 Aug 2017 11:12:13 +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 1dnNMS-0000wj-HK; Thu, 31 Aug 2017 11:10:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dnNMQ-0000vk-Lh for xen-devel@lists.xen.org; Thu, 31 Aug 2017 11:10:10 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 07/DC-02045-19EE7A95; Thu, 31 Aug 2017 11:10:09 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrHLMWRWlGSWpSXmKPExsXS1taRojvx3fJ Ig6ZpshZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8aJZ3+ZC57xVMw6fZC1gfEjVxcjJ4eQQKXE 1VkTGEFsCQFeiSPLZrB2MXIA2f4S/9ZzdjFyAZW0M0qsODOTHaSGTUBd4sTiiWD1IgLSEtc+X 2YEKWIWuMoo8XTWZbAiYQFXiYm9y8FsFgFViRc/zrCC2LwCLhIT5nxlg1imIDHl4XtmEJsTqL 5h0jdmiINcJFou7WSawMi7gJFhFaNGcWpRWWqRrqGFXlJRZnpGSW5iZo6uoYGpXm5qcXFiemp OYlKxXnJ+7iZGYDgwAMEOxqbtnocYJTmYlER5H95eHinEl5SfUpmRWJwRX1Sak1p8iFGGg0NJ grfgLVBOsCg1PbUiLTMHGJgwaQkOHiUR3sVvgNK8xQWJucWZ6RCpU4yKUuK8UiB9AiCJjNI8u DZYNFxilJUS5mUEOkSIpyC1KDezBFX+FaM4B6OSMG8UyBSezLwSuOmvgBYzAS2O9VoKsrgkES El1cDIwfnIsyH6xAJTl+mN206yak+/4bZNRXSamgDn+j3TGeqyI/9fOZut1v8qOylD/ObV2X3 /zv9bFuOof0W3IeznwcYm1wh3069ZDgXiwhuWmqnNzFoUMbPjl/q3/yllC7Ic1MQNo0+eqS05 8EgwNzlHZMf5p7c8f7ws2Hul5X6Bo5pZ7cmctwxKLMUZiYZazEXFiQDEJS59gQIAAA== X-Env-Sender: tianyu.lan@intel.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1504177806!89121055!1 X-Originating-IP: [134.134.136.100] X-SpamReason: No, hits=0.8 required=7.0 tests=DATE_IN_PAST_06_12 X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29990 invoked from network); 31 Aug 2017 11:10:09 -0000 Received: from mga07.intel.com (HELO mga07.intel.com) (134.134.136.100) by server-2.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 31 Aug 2017 11:10:09 -0000 Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP; 31 Aug 2017 04:09:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,451,1498546800"; d="scan'208";a="146024702" Received: from sky-ws.sh.intel.com (HELO localhost) ([10.239.48.74]) by fmsmga005.fm.intel.com with ESMTP; 31 Aug 2017 04:09:50 -0700 From: Lan Tianyu To: xen-devel@lists.xen.org Date: Thu, 31 Aug 2017 01:01:49 -0400 Message-Id: <1504155709-24276-5-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 Subject: [Xen-devel] [RFC PATCH V2 4/4] xl/libacpi: extend lapic_id() to uint32_t 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 From: Chao Gao This patch is to extend lapic_id() to support more vcpus. Signed-off-by: Chao Gao Signed-off-by: Lan Tianyu Reviewed-by: Andrew Cooper Acked-by: Wei Liu --- tools/firmware/hvmloader/util.c | 2 +- tools/libacpi/libacpi.h | 2 +- tools/libxl/libxl_x86_acpi.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/util.c index db5f240..814ac2e 100644 --- a/tools/firmware/hvmloader/util.c +++ b/tools/firmware/hvmloader/util.c @@ -883,7 +883,7 @@ static void acpi_mem_free(struct acpi_ctxt *ctxt, /* ACPI builder currently doesn't free memory so this is just a stub */ } -static uint8_t acpi_lapic_id(unsigned cpu) +static uint32_t acpi_lapic_id(unsigned cpu) { return LAPIC_ID(cpu); } diff --git a/tools/libacpi/libacpi.h b/tools/libacpi/libacpi.h index 74778a5..0b04cbc 100644 --- a/tools/libacpi/libacpi.h +++ b/tools/libacpi/libacpi.h @@ -93,7 +93,7 @@ struct acpi_config { unsigned long rsdp; /* x86-specific parameters */ - uint8_t (*lapic_id)(unsigned cpu); + uint32_t (*lapic_id)(unsigned cpu); uint32_t lapic_base_address; uint32_t ioapic_base_address; uint16_t pci_isa_irq_mask; diff --git a/tools/libxl/libxl_x86_acpi.c b/tools/libxl/libxl_x86_acpi.c index 1fa97ff..8fe084d 100644 --- a/tools/libxl/libxl_x86_acpi.c +++ b/tools/libxl/libxl_x86_acpi.c @@ -85,7 +85,7 @@ static void acpi_mem_free(struct acpi_ctxt *ctxt, { } -static uint8_t acpi_lapic_id(unsigned cpu) +static uint32_t acpi_lapic_id(unsigned cpu) { return cpu * 2; }