From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmk@arm.linux.org.uk (Russell King) Date: Mon, 06 Jun 2016 17:59:34 +0100 Subject: [PATCH kexec-tools v2 10/32] kexec: add generic helper to add to memory_regions In-Reply-To: <20160606164129.GM1041@n2100.armlinux.org.uk> References: <20160606164129.GM1041@n2100.armlinux.org.uk> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 -- 1.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: 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 1b9y32-0005p1-Sm for kexec@lists.infradead.org; Mon, 06 Jun 2016 17:10:50 +0000 In-Reply-To: <20160606164129.GM1041@n2100.armlinux.org.uk> References: <20160606164129.GM1041@n2100.armlinux.org.uk> From: Russell King 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 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "kexec" Errors-To: kexec-bounces+dwmw2=infradead.org@lists.infradead.org To: kexec@lists.infradead.org, linux-arm-kernel@lists.infradead.org Cc: Pratyush Anand , Baoquan He 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 -- 1.9.1 _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec