From patchwork Thu Jan 16 21:51:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 11337865 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7AB4B921 for ; Thu, 16 Jan 2020 21:53:15 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5FDF520728 for ; Thu, 16 Jan 2020 21:53:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5FDF520728 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=xen.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1isD3H-0006uo-PV; Thu, 16 Jan 2020 21:51:43 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1isD3H-0006uj-40 for xen-devel@lists.xenproject.org; Thu, 16 Jan 2020 21:51:43 +0000 X-Inumbo-ID: 5fdd09e1-38aa-11ea-87dc-12813bfff9fa Received: from mail-wr1-f67.google.com (unknown [209.85.221.67]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 5fdd09e1-38aa-11ea-87dc-12813bfff9fa; Thu, 16 Jan 2020 21:51:40 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id y17so20711542wrh.5 for ; Thu, 16 Jan 2020 13:51:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=yZ5aYwEKZdlNu/XL6WLDVP5cNYU8OjscVZWeHpW7igU=; b=SvTdp0Aeuj9UD6GPto1r+ZVpKqkaVCmx2lVxx3jamsDsKxoB5hclwd83y+VlKVbG2L 6VdlWG+t8SPVpxK8XVmhcgNhyPgRE+Anga3coXkUaWNAIQRFJRnhOY6guuS8AJiN/8tY JyMMEa5qVN1fAZFaTCDgzkQAJXIdIAMdz/ECjjYQG4kugVenz5YdYllcuQsead/AdyhB A4mAnC4OVwsZLh2Az85Ci3WDJbp97+mCwtilII7bTLjc/4qeB9Mvspv8oqnLQYjS6Jm/ 8WrgQWN+qXq0cyXQT1mfbctSZpiAENFVaJTblGoOvQWyapUHeuJ/G3KB9wu1GqfPpFDe WMtw== X-Gm-Message-State: APjAAAU05JuPyfZgfzQaGlagtuVI/YWi4NvewUCApkfLPlHv6+6P2vWL I+sqGHMq3rYZnlgRkkF4L6W6oBnzUBc= X-Google-Smtp-Source: APXvYqxFqyRnAvKMoKuOFt5FK4I8lDFbuTdANMUwW1kVFqjAW/OQDRahMtPLdOzwkMQTtBsGoUBW2g== X-Received: by 2002:a5d:4687:: with SMTP id u7mr5367096wrq.176.1579211498824; Thu, 16 Jan 2020 13:51:38 -0800 (PST) Received: from ufe34d9ed68d054.ant.amazon.com (54-240-197-235.amazon.com. [54.240.197.235]) by smtp.gmail.com with ESMTPSA id q3sm5893371wmj.38.2020.01.16.13.51.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jan 2020 13:51:37 -0800 (PST) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Thu, 16 Jan 2020 21:51:36 +0000 Message-Id: <20200116215136.17597-1-julien@xen.org> X-Mailer: git-send-email 2.17.1 Subject: [Xen-devel] [PATCH] Revert "xen/arm32: setup: Give a xenheap page to the boot allocator" X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Volodymyr Babchuk , Stefano Stabellini , Julien Grall MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Since commit c61c1b4943 "xen/page_alloc: statically allocate bootmem_region_list", the boot allocator does not use the first page of the first region passed for its own purpose. This reverts commit ae84f55353475f569daddb9a81ac0a6bc7772c90. Signed-off-by: Julien Grall Acked-by: Stefano Stabellini --- xen/arch/arm/setup.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 9dd3738d44..494f70546b 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -594,7 +594,6 @@ static void __init setup_mm(void) unsigned long heap_pages, xenheap_pages, domheap_pages; int i; const uint32_t ctr = READ_CP32(CTR); - mfn_t boot_mfn_start, boot_mfn_end; if ( !bootinfo.mem.nr_banks ) panic("No memory bank\n"); @@ -667,11 +666,6 @@ static void __init setup_mm(void) setup_xenheap_mappings((e >> PAGE_SHIFT) - xenheap_pages, xenheap_pages); - /* We need a single mapped page for populating bootmem_region_list. */ - boot_mfn_start = mfn_add(xenheap_mfn_end, -1); - boot_mfn_end = xenheap_mfn_end; - init_boot_pages(mfn_to_maddr(boot_mfn_start), mfn_to_maddr(boot_mfn_end)); - /* Add non-xenheap memory */ for ( i = 0; i < bootinfo.mem.nr_banks; i++ ) { @@ -717,7 +711,7 @@ static void __init setup_mm(void) /* Add xenheap memory that was not already added to the boot allocator. */ init_xenheap_pages(mfn_to_maddr(xenheap_mfn_start), - mfn_to_maddr(boot_mfn_start)); + mfn_to_maddr(xenheap_mfn_end)); } #else /* CONFIG_ARM_64 */ static void __init setup_mm(void)