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: 7634671 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9FF48BF90C for ; Tue, 17 Nov 2015 09:55:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CE19D20495 for ; Tue, 17 Nov 2015 09:55:26 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EB36220480 for ; Tue, 17 Nov 2015 09:55:25 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Zycwu-0000XV-Mi; Tue, 17 Nov 2015 09:53:16 +0000 Received: from mail-wm0-x22f.google.com ([2a00:1450:400c:c09::22f]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Zycmq-0005bx-Do for linux-arm-kernel@lists.infradead.org; Tue, 17 Nov 2015 09:42:55 +0000 Received: by wmvv187 with SMTP id v187so217726370wmv.1 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=B1avcuyTCO9InB4uDKg3ZQjsbqwhdG07c/x1DuhjtU9dGBt2Jl224ekUupzXK9Vb0/ oFwAL5t8Y4sp82/v5dac1tgGBXaZZHdnAUNhPr0CjuH8kQ66M2qJMzPARDZ+SPaPF+ae n+cCAou4BeaDCDQMLC5RknwPBjw/D1yK75jMyQhaMoMxIyHX02Nlj+rHR4nPvrlNb+eq /i7mVhlIDY9uO6tKjGDO+KlAVz3kCagubQ0Eu03pgLBb00PNg1c3W6vqCymT1HTpaQGj a0Sz2xxT44f2NHTqfPIDPLQCpkvmyddMGVqHYzOnLL5xZyR0jQrYBArM+ggplr75S56M uqag== X-Gm-Message-State: ALoCoQnRk2qEa3fttSBasa1mSv76CS0PSfaiYm7GVNwsumVTM55gzBkrJRwpTnlPfsDouomtyyUX 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 Subject: [PATCH v3 10/62] arm/acpi: Move end_boot_allocator after acpi_boot_table_init 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151117_014252_917191_7A070E88 X-CRM114-Status: GOOD ( 11.04 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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(-) 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();