From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759866Ab0ENTzs (ORCPT ); Fri, 14 May 2010 15:55:48 -0400 Received: from rcsinet10.oracle.com ([148.87.113.121]:59869 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759638Ab0ENTsj (ORCPT ); Fri, 14 May 2010 15:48:39 -0400 From: Yinghai Lu To: Ingo Molnar , Thomas Gleixner , "H. Peter Anvin" , Andrew Morton , David Miller , Benjamin Herrenschmidt Cc: Linus Torvalds , Johannes Weiner , linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Yinghai Lu Subject: [PATCH 07/37] lmb: Add lmb_find_area() Date: Fri, 14 May 2010 12:45:33 -0700 Message-Id: <1273866363-14249-8-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.6.4.2 In-Reply-To: <1273866363-14249-1-git-send-email-yinghai@kernel.org> References: <1273866363-14249-1-git-send-email-yinghai@kernel.org> X-Auth-Type: Internal IP X-Source-IP: acsinet15.oracle.com [141.146.126.227] X-CT-RefId: str=0001.0A090202.4BEDA8DE.00B1,ss=1,fgs=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org it is a wrapper for lmb_find_base make it more easy for x86 to use lmb. ( rebase ) x86 early_res is using find/reserve pattern instead of alloc. keep it in weak version, so later We can use x86 own version if needed. also We need it in lib/lmb.c, so one called mm/page_alloc.c could get compiled -v2: Change name to lmb_find_area() according to Michael Ellerman -v3: Add generic weak version __lmb_find_area() so keep the path for fallback to x86 version that handle from low -v4: use 0 for failing path -v5: use LMB_ERROR again Signed-off-by: Yinghai Lu --- include/linux/lmb.h | 4 ++++ lib/lmb.c | 23 +++++++++++++++++++++++ 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/include/linux/lmb.h b/include/linux/lmb.h index e54c1d0..c05294f 100644 --- a/include/linux/lmb.h +++ b/include/linux/lmb.h @@ -44,6 +44,10 @@ extern struct lmb lmb; extern int lmb_debug; extern struct lmb_region lmb_reserved_init_regions[]; +u64 __lmb_find_area(u64 ei_start, u64 ei_last, u64 start, u64 end, + u64 size, u64 align); +u64 lmb_find_area(u64 start, u64 end, u64 size, u64 align); + extern void __init lmb_init(void); extern void __init lmb_analyze(void); extern long lmb_add(phys_addr_t base, phys_addr_t size); diff --git a/lib/lmb.c b/lib/lmb.c index c92034b..1c46336 100644 --- a/lib/lmb.c +++ b/lib/lmb.c @@ -155,6 +155,29 @@ static phys_addr_t __init lmb_find_base(phys_addr_t size, phys_addr_t align, return LMB_ERROR; } +u64 __init __weak __lmb_find_area(u64 ei_start, u64 ei_last, u64 start, u64 end, + u64 size, u64 align) +{ + u64 final_start, final_end; + u64 mem; + + final_start = max(ei_start, start); + final_end = min(ei_last, end); + + if (final_start >= final_end) + return LMB_ERROR; + + return lmb_find_base(size, align, final_start, final_end); +} + +/* + * Find a free area with specified alignment in a specific range. + */ +u64 __init __weak lmb_find_area(u64 start, u64 end, u64 size, u64 align) +{ + return lmb_find_base(size, align, start, end); +} + static void __init_lmb lmb_remove_region(struct lmb_type *type, unsigned long r) { unsigned long i; -- 1.6.4.2