Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757914Ab3ILKDm (ORCPT ); Thu, 12 Sep 2013 06:03:42 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:9708 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1757866Ab3ILKDj (ORCPT ); Thu, 12 Sep 2013 06:03:39 -0400 X-IronPort-AV: E=Sophos;i="4.90,890,1371052800"; d="scan'208";a="8503608" From: Tang Chen To: tj@kernel.org, rjw@sisk.pl, lenb@kernel.org, tglx@linutronix.de, mingo@elte.hu, hpa@zytor.com, akpm@linux-foundation.org, trenn@suse.de, yinghai@kernel.org, jiang.liu@huawei.com, wency@cn.fujitsu.com, laijs@cn.fujitsu.com, isimatu.yasuaki@jp.fujitsu.com, izumi.taku@jp.fujitsu.com, mgorman@suse.de, minchan@kernel.org, mina86@mina86.com, gong.chen@linux.intel.com, vasilis.liaskovitis@profitbricks.com, lwoodman@redhat.com, riel@redhat.com, jweiner@redhat.com, prarit@redhat.com, zhangyanfei@cn.fujitsu.com, toshi.kani@hp.com Cc: x86@kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-acpi@vger.kernel.org Subject: [RESEND PATCH v2 6/9] x86, acpi: Support allocate memory from bottom upwards in acpi_initrd_override(). Date: Thu, 12 Sep 2013 17:52:14 +0800 Message-Id: <1378979537-21196-7-git-send-email-tangchen@cn.fujitsu.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1378979537-21196-1-git-send-email-tangchen@cn.fujitsu.com> References: <1378979537-21196-1-git-send-email-tangchen@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/09/12 17:47:28, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/09/12 18:01:05, Serialize complete at 2013/09/12 18:01:05 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1528 Lines: 50 During early boot, if the bottom up mode is set, just try allocating bottom up from the end of kernel image, and if that fails, do normal top down allocation. So in function acpi_initrd_override(), we add the above logic. Signed-off-by: Tang Chen Reviewed-by: Zhang Yanfei --- drivers/acpi/osl.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index e5f416c..978dcfa 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -632,6 +632,15 @@ void __init acpi_initrd_override(void *data, size_t size) if (table_nr == 0) return; + if (memblock_direction_bottom_up()) { + acpi_tables_addr = memblock_alloc_bottom_up( + MEMBLOCK_ALLOC_ACCESSIBLE, + max_low_pfn_mapped << PAGE_SHIFT, + all_tables_size, PAGE_SIZE); + if (acpi_tables_addr) + goto success; + } + acpi_tables_addr = memblock_find_in_range(0, max_low_pfn_mapped << PAGE_SHIFT, all_tables_size, PAGE_SIZE); @@ -639,6 +648,8 @@ void __init acpi_initrd_override(void *data, size_t size) WARN_ON(1); return; } + +success: /* * Only calling e820_add_reserve does not work and the * tables are invalid (memory got used) later. -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/