From patchwork Tue Nov 17 09:40:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 56723 Delivered-To: patch@linaro.org Received: by 10.112.155.196 with SMTP id vy4csp1825239lbb; Tue, 17 Nov 2015 01:43:51 -0800 (PST) X-Received: by 10.31.131.147 with SMTP id f141mr2636879vkd.85.1447753427593; Tue, 17 Nov 2015 01:43:47 -0800 (PST) Return-Path: Received: from lists.xen.org (lists.xenproject.org. [50.57.142.19]) by mx.google.com with ESMTPS id h88si2015415vkc.188.2015.11.17.01.43.47 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 17 Nov 2015 01:43:47 -0800 (PST) Received-SPF: neutral (google.com: 50.57.142.19 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) client-ip=50.57.142.19; Authentication-Results: mx.google.com; spf=neutral (google.com: 50.57.142.19 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) smtp.mailfrom=xen-devel-bounces@lists.xen.org; dkim=neutral (body hash did not verify) header.i=@linaro_org.20150623.gappssmtp.com Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zycma-0002aR-Ss; Tue, 17 Nov 2015 09:42:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZycmZ-0002ZM-6U for xen-devel@lists.xen.org; Tue, 17 Nov 2015 09:42:35 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 3A/E5-23747-A86FA465; Tue, 17 Nov 2015 09:42:34 +0000 X-Env-Sender: shannon.zhao@linaro.org X-Msg-Ref: server-4.tower-31.messagelabs.com!1447753353!4268821!1 X-Originating-IP: [74.125.82.53] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.19.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 42375 invoked from network); 17 Nov 2015 09:42:33 -0000 Received: from mail-wm0-f53.google.com (HELO mail-wm0-f53.google.com) (74.125.82.53) by server-4.tower-31.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 17 Nov 2015 09:42:33 -0000 Received: by wmec201 with SMTP id c201so217881949wme.0 for ; Tue, 17 Nov 2015 01:42:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro_org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZEgbJI2ZzuTSMUdDClg3pINrRQH3+1Ddhc97G4bCN/w=; b=c+a1VqZK8nOfh3po0spJdnhnDhcLuezEhq4CJdOC8MGvjrKeKVbxRXs2WSTucEiAGE yMuZHpWt0rQBOzkEYQ99Cghyx8bQJ3UMqaXh0bvCUHRIFh9OGkE5gl0f6UZzxmhnpy70 D4rDtSm7cQOQCO02f7GubEXXVPg4PPnV8ngTzCvRj3MPc0Qhr6A0v4GjcprG6LXQ0gDt IQ3nxUNl29Bbwck+TFI8FB37XSYiJRkibC9LIz67lcr4uGmGsBW3sr2srXnEp0rjz2nO WrytDujpsz+4AtlD+LXBj32qO4neCHteL31aymTbLBCpC9ue0ubjM7JSFxgoxL0EKJ5w KEkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZEgbJI2ZzuTSMUdDClg3pINrRQH3+1Ddhc97G4bCN/w=; b=MJ/InzTFNLLC3XTwTdABLFx6AOvhZY+DRNUJ4Or/lzxmihf3A2lJgHN7KUifGbIIKF f7QyrgH6yPf7CR6bE22uMnHNDS5ZgeK5cJtQKu8v88iXhMh+f6lbXdrVGSH7ACJrA016 s4U12NSZsKHSjcUr+jBOa/XUIXghfC94rQklieS3DoZ+x1TTFGDm8EgB87TKWfnhyzJ3 zwiDc/LJsa/Y+iai8brYjruBlpqSfkHmzsQk/1RkOO8N9ejLG0CBwRLZLXBtcPi9EcVI gKB5SLIapEX5UBtq/lG6HcglpxICZh3wWiJgTU/TlrvQ18iRk3U13GffroW9qByrfMwn m0Gg== X-Gm-Message-State: ALoCoQn3LKZHCpbBSytG4Mak8cHIf8Ry2zU0GU4//6g+UdP7qTxJ3ooJfBdDhHYqg7lh3bBpe31K X-Received: by 10.28.111.151 with SMTP id c23mr1539718wmi.28.1447753352929; Tue, 17 Nov 2015 01:42:32 -0800 (PST) Received: from localhost ([78.129.251.54]) by smtp.gmail.com with ESMTPSA id z17sm20837580wjq.1.2015.11.17.01.42.30 (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 17 Nov 2015 01:42:32 -0800 (PST) From: shannon.zhao@linaro.org To: ian.campbell@citrix.com, stefano.stabellini@citrix.com, keir@xen.org, jbeulich@suse.com, andrew.cooper3@citrix.com, julien.grall@citrix.com, xen-devel@lists.xen.org Date: Tue, 17 Nov 2015 17:40:09 +0800 Message-Id: <1447753261-7552-11-git-send-email-shannon.zhao@linaro.org> X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: <1447753261-7552-1-git-send-email-shannon.zhao@linaro.org> References: <1447753261-7552-1-git-send-email-shannon.zhao@linaro.org> Cc: mark.rutland@arm.com, hangaohuai@huawei.com, ard.biesheuvel@linaro.org, shannon.zhao@linaro.org, christoffer.dall@linaro.org, peter.huangpeng@huawei.com, david.vrabel@citrix.com, zhaoshenglong@huawei.com, linux-arm-kernel@lists.infradead.org, roger.pau@citrix.com Subject: [Xen-devel] [PATCH v3 10/62] arm/acpi: Move end_boot_allocator after acpi_boot_table_init X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org From: Shannon Zhao If ACPI is initialized after the boot allocator has ended(the system state is not early boot), assert happens in acpi_os_zalloc_memory and acpi_boot_table_init will fail. So it needs to move end_boot_allocator after acpi_boot_table_init. Signed-off-by: Parth Dixit Signed-off-by: Shannon Zhao --- xen/arch/arm/setup.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -- 2.1.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 768312f..c15a09d 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -613,8 +613,6 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) allocator. */ init_xenheap_pages(pfn_to_paddr(xenheap_mfn_start), pfn_to_paddr(boot_mfn_start)); - - end_boot_allocator(); } #else /* CONFIG_ARM_64 */ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) @@ -682,8 +680,6 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) setup_frametable_mappings(ram_start, ram_end); max_page = PFN_DOWN(ram_end); - - end_boot_allocator(); } #endif @@ -757,6 +753,8 @@ void __init start_xen(unsigned long boot_phys_offset, /* Parse the ACPI tables for possible boot-time configuration */ acpi_boot_table_init(); + end_boot_allocator(); + vm_init(); dt_unflatten_host_device_tree();