From patchwork Mon Jun 6 16:59:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell King X-Patchwork-Id: 9158917 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1DA7760572 for ; Mon, 6 Jun 2016 17:16:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0D62E28335 for ; Mon, 6 Jun 2016 17:16:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 01E002834F; Mon, 6 Jun 2016 17:16:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id 8970528335 for ; Mon, 6 Jun 2016 17:16:38 +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 1b9y70-0004xc-DA; Mon, 06 Jun 2016 17:14:50 +0000 Received: from pandora.armlinux.org.uk ([2001:4d48:ad52:3201:214:fdff:fe10:1be6]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1b9y3m-0007qr-Ov for linux-arm-kernel@lists.infradead.org; Mon, 06 Jun 2016 17:11:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2014; h=Date:Sender:Message-Id:Content-Type:Content-Transfer-Encoding:MIME-Version:Subject:Cc:To:From:References:In-Reply-To; bh=x7aE1tKyymM6z56P5jgZWVpVx3kQHTBT7YXt3wjOGWU=; b=eelqG+ntojd7gboLv77wzVR8qrkKQj+3UsyfBt3I3ObbcdOYizCwvWo7vp6BYOuOHr6pmXUDXFppFT9EZ2OMBHuQCt5JcUgPH1VSrQuExJchnCmDm6rL9kzrqz7A/gJmxDwc+DT/q+GTuEl7gtj24yw9bl+l5NQ5yon95q8rzS4=; Received: from [2002:4e20:1eda:1:b4eb:e902:622d:f2f0] (port=45132 helo=e0050434b2927.dyn.armlinux.org.uk) by pandora.armlinux.org.uk with esmtpsa (TLSv1:DHE-RSA-AES128-SHA:128) (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1b9xsX-0000GV-7N; Mon, 06 Jun 2016 17:59:54 +0100 Received: from rmk by e0050434b2927.dyn.armlinux.org.uk with local (Exim 4.82) (envelope-from ) id 1b9xsE-0003sO-FZ; Mon, 06 Jun 2016 17:59:34 +0100 In-Reply-To: <20160606164129.GM1041@n2100.armlinux.org.uk> References: <20160606164129.GM1041@n2100.armlinux.org.uk> From: Russell King To: kexec@lists.infradead.org,linux-arm-kernel@lists.infradead.org Subject: [PATCH kexec-tools v2 10/32] kexec: add generic helper to add to memory_regions MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Mon, 06 Jun 2016 17:59:34 +0100 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160606_101131_836769_74766934 X-CRM114-Status: GOOD ( 16.54 ) 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: Pratyush Anand , Baoquan He Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Add a helper to add a memory range to a memory_regions array. Reviewed-by: Pratyush Anand Signed-off-by: Russell King --- kexec/Makefile | 4 ++++ kexec/mem_regions.c | 30 ++++++++++++++++++++++++++++++ kexec/mem_regions.h | 9 +++++++++ 3 files changed, 43 insertions(+) create mode 100644 kexec/mem_regions.c create mode 100644 kexec/mem_regions.h diff --git a/kexec/Makefile b/kexec/Makefile index a758b4a..e2aee84 100644 --- a/kexec/Makefile +++ b/kexec/Makefile @@ -69,6 +69,10 @@ dist += kexec/fs2dt.c kexec/fs2dt.h $(ARCH)_FS2DT = KEXEC_SRCS += $($(ARCH)_FS2DT) +dist += kexec/mem_regions.c kexec/mem_regions.h +$(ARCH)_MEM_REGIONS = +KEXEC_SRCS += $($(ARCH)_MEM_REGIONS) + include $(srcdir)/kexec/arch/alpha/Makefile include $(srcdir)/kexec/arch/arm/Makefile include $(srcdir)/kexec/arch/i386/Makefile diff --git a/kexec/mem_regions.c b/kexec/mem_regions.c new file mode 100644 index 0000000..a4952ff --- /dev/null +++ b/kexec/mem_regions.c @@ -0,0 +1,30 @@ +#include "kexec.h" +#include "mem_regions.h" + +/** + * mem_regions_add() - add a memory region to a set of ranges + * @ranges: ranges to add the memory region to + * @max: maximum number of entries in memory region + * @base: base address of memory region + * @length: length of memory region in bytes + * @type: type of memory region + * + * Add the memory region to the set of ranges, and return %0 if successful, + * or %-1 if we ran out of space. + */ +int mem_regions_add(struct memory_ranges *ranges, unsigned long long base, + unsigned long long length, int type) +{ + struct memory_range *range; + + if (ranges->size >= ranges->max_size) + return -1; + + range = ranges->ranges + ranges->size++; + range->start = base; + range->end = base + length - 1; + range->type = type; + + return 0; +} + diff --git a/kexec/mem_regions.h b/kexec/mem_regions.h new file mode 100644 index 0000000..b9cfba1 --- /dev/null +++ b/kexec/mem_regions.h @@ -0,0 +1,9 @@ +#ifndef MEM_REGIONS_H +#define MEM_REGIONS_H + +struct memory_ranges; + +int mem_regions_add(struct memory_ranges *ranges, unsigned long long base, + unsigned long long length, int type); + +#endif