From patchwork Fri Aug 25 02:52:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "lan,Tianyu" X-Patchwork-Id: 9921443 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 9A03E603FA for ; Fri, 25 Aug 2017 09:01:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8B8A227CF9 for ; Fri, 25 Aug 2017 09:01:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8038327D0E; Fri, 25 Aug 2017 09:01:43 +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 387BD27CF9 for ; Fri, 25 Aug 2017 09:01:43 +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 1dlASZ-0000Vh-AL; Fri, 25 Aug 2017 08:59:23 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dlASX-0000TG-3O for xen-devel@lists.xen.org; Fri, 25 Aug 2017 08:59:21 +0000 Received: from [193.109.254.147] by server-9.bemta-6.messagelabs.com id 53/2C-03406-8E6EF995; Fri, 25 Aug 2017 08:59:20 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrPLMWRWlGSWpSXmKPExsVywNwkVvfFs/m RBu/bmSyWfFzM4sDocXT3b6YAxijWzLyk/IoE1owTz/4yFzzjqZh1+iBrA+NHri5GLg4hgWmM Esu6rjJ2MXJySAjwShxZNoMVwg6QuLLrOTtEUQejxNPT99hAEmwC6hInFk8EaxARkJa49vkyI 0gRs8A+RomL7zeygCSEBZwkzk87wg5iswioSsyaOAOsmVfAReLl4kXMEBsUJKY8fA9mcwq4Sj T3nmPqYuQA2uYicW1d0ARG3gWMDKsYNYpTi8pSi3SNjfSSijLTM0pyEzNzdA0NzPRyU4uLE9N TcxKTivWS83M3MQIDggEIdjCeXhd4iFGSg0lJlHd59PxIIb6k/JTKjMTijPii0pzU4kOMMhwc ShK8zU+BcoJFqempFWmZOcDQhElLcPAoifC6gqR5iwsSc4sz0yFSpxgVpcR5WYABLSQAksgoz YNrg8XDJUZZKWFeRqBDhHgKUotyM0tQ5V8xinMwKgnzRoGM58nMK4Gb/gpoMRPQ4kkn5oAsLk lESEk1MMa1e9tqKSzdy1MeGmAXsEj5guHnVDeTDm5x4RyvcOtp7O5PWye6c2or/Lqo0Pn9heG 1NpYM26493osq7BXzhbb9yZcU3mwVs/J2qmdFOB/r5z8mcYfMXzLvy/8rtbho/fdu+6CTp5Z6 VGh88HAvrl5f93Q9W3Co9MWCigfWNal24jlP+i4rsRRnJBpqMRcVJwIA1PYOPIICAAA= X-Env-Sender: tianyu.lan@intel.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1503651556!90210367!2 X-Originating-IP: [192.55.52.93] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTkyLjU1LjUyLjkzID0+IDMyNDY2NQ==\n X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 64853 invoked from network); 25 Aug 2017 08:59:19 -0000 Received: from mga11.intel.com (HELO mga11.intel.com) (192.55.52.93) by server-10.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 25 Aug 2017 08:59:19 -0000 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Aug 2017 01:59:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.41,424,1498546800"; d="scan'208"; a="1166033052" Received: from sky-ws.sh.intel.com (HELO localhost) ([10.239.48.141]) by orsmga001.jf.intel.com with ESMTP; 25 Aug 2017 01:59:17 -0700 From: Lan Tianyu To: xen-devel@lists.xen.org Date: Thu, 24 Aug 2017 22:52:20 -0400 Message-Id: <1503629540-26053-6-git-send-email-tianyu.lan@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1503629540-26053-1-git-send-email-tianyu.lan@intel.com> References: <1503629540-26053-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, Chao Gao Subject: [Xen-devel] [RFC PATCH 5/5] 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 --- 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; }