dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-03 17:52:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

fdt: parse "reserved-memory" for memory reservation

Browse Source 
boot_fdt_add_mem_rsv_regions() adds reserved memory sections to an lmb
struct. Currently, it only parses regions described by /memreserve/
entries.

Extend this to the more commonly used scheme of the "reserved-memory"
node.

Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Goldschmidt
2019-01-14 22:38:17 +01:00
committed by Tom Rini
parent 0f7c51a676
commit e2237a2c26
2 changed files with 46 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
common/image-fdt.c
View File

@@ -10,6 +10,7 @@
#include <common.h> #include <common.h>
#include <fdt_support.h> #include <fdt_support.h>
#include <fdtdec.h>
#include <errno.h> #include <errno.h>
#include <image.h> #include <image.h>
#include <linux/libfdt.h> #include <linux/libfdt.h>
@@ -67,30 +68,66 @@ static const image_header_t *image_get_fdt(ulong fdt_addr)
} }
#endif #endif
static void boot_fdt_reserve_region(struct lmb *lmb, uint64_t addr,
uint64_t size)
{
int ret;
ret = lmb_reserve(lmb, addr, size);
if (!ret) {
debug(" reserving fdt memory region: addr=%llx size=%llx\n",
(unsigned long long)addr, (unsigned long long)size);
} else {
puts("ERROR: reserving fdt memory region failed ");
printf("(addr=%llx size=%llx)\n",
(unsigned long long)addr, (unsigned long long)size);
}
}
/** /**
* boot_fdt_add_mem_rsv_regions - Mark the memreserve sections as unusable * boot_fdt_add_mem_rsv_regions - Mark the memreserve and reserved-memory
* sections as unusable
* @lmb: pointer to lmb handle, will be used for memory mgmt * @lmb: pointer to lmb handle, will be used for memory mgmt
* @fdt_blob: pointer to fdt blob base address * @fdt_blob: pointer to fdt blob base address
* *
* Adds the memreserve regions in the dtb to the lmb block. Adding the * Adds the and reserved-memorymemreserve regions in the dtb to the lmb block.
* memreserve regions prevents u-boot from using them to store the initrd * Adding the memreserve regions prevents u-boot from using them to store the
* or the fdt blob. * initrd or the fdt blob.
*/ */
void boot_fdt_add_mem_rsv_regions(struct lmb *lmb, void *fdt_blob) void boot_fdt_add_mem_rsv_regions(struct lmb *lmb, void *fdt_blob)
{ {
uint64_t addr, size; uint64_t addr, size;
int i, total; int i, total, ret;
int nodeoffset, subnode;
struct fdt_resource res;
if (fdt_check_header(fdt_blob) != 0) if (fdt_check_header(fdt_blob) != 0)
return; return;
/* process memreserve sections */
total = fdt_num_mem_rsv(fdt_blob); total = fdt_num_mem_rsv(fdt_blob);
for (i = 0; i < total; i++) { for (i = 0; i < total; i++) {
if (fdt_get_mem_rsv(fdt_blob, i, &addr, &size) != 0) if (fdt_get_mem_rsv(fdt_blob, i, &addr, &size) != 0)
continue; continue;
printf(" reserving fdt memory region: addr=%llx size=%llx\n", boot_fdt_reserve_region(lmb, addr, size);
(unsigned long long)addr, (unsigned long long)size); }
lmb_reserve(lmb, addr, size);
/* process reserved-memory */
nodeoffset = fdt_subnode_offset(fdt_blob, 0, "reserved-memory");
if (nodeoffset >= 0) {
subnode = fdt_first_subnode(fdt_blob, nodeoffset);
while (subnode >= 0) {
/* check if this subnode has a reg property */
ret = fdt_get_resource(fdt_blob, subnode, "reg", 0,
&res);
if (!ret) {
addr = res.start;
size = res.end - res.start + 1;
boot_fdt_reserve_region(lmb, addr, size);
}
subnode = fdt_next_subnode(fdt_blob, subnode);
}
} }
} }

1
lib/Makefile
View File

@@ -30,6 +30,7 @@ obj-y += crc7.o
obj-y += crc8.o obj-y += crc8.o
obj-y += crc16.o obj-y += crc16.o
obj-$(CONFIG_ERRNO_STR) += errno_str.o obj-$(CONFIG_ERRNO_STR) += errno_str.o
obj-$(CONFIG_OF_LIBFDT) += fdtdec.o
obj-$(CONFIG_FIT) += fdtdec_common.o obj-$(CONFIG_FIT) += fdtdec_common.o
obj-$(CONFIG_TEST_FDTDEC) += fdtdec_test.o obj-$(CONFIG_TEST_FDTDEC) += fdtdec_test.o
obj-$(CONFIG_GZIP_COMPRESSED) += gzip.o obj-$(CONFIG_GZIP_COMPRESSED) += gzip.o