GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-18 13:11:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib: fdt: Convert fdtdes_setup_mem..() to livetree API

Browse source 
Convert fdtdec_setup_mem_size_base(), get_next_memory_node(),
fdtdec_setup_memory_banksize() and fdtdec_setup_mem_size_base_lowest() to
livetree API.

Tested on ZynqMP zcu104 board.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Michal Simek 2020-07-10 13:34:44 +02:00
parent 7fce739665
commit c2f0950c33
1 changed files with 35 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
lib/fdtdec.c
View file

@ -24,6 +24,7 @@
#include <asm/sections.h> #include <asm/sections.h>
#include <linux/ctype.h> #include <linux/ctype.h>
#include <linux/lzo.h> #include <linux/lzo.h>
#include <linux/ioport.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -1032,16 +1033,17 @@ int fdtdec_decode_display_timing(const void *blob, int parent, int index,
int fdtdec_setup_mem_size_base(void) int fdtdec_setup_mem_size_base(void)
{ {
int ret, mem; int ret;
struct fdt_resource res; ofnode mem;
struct resource res;
mem = fdt_path_offset(gd->fdt_blob, "/memory"); mem = ofnode_path("/memory");
if (mem < 0) { if (!ofnode_valid(mem)) {
debug("%s: Missing /memory node\n", __func__); debug("%s: Missing /memory node\n", __func__);
return -EINVAL; return -EINVAL;
} }
ret = fdt_get_resource(gd->fdt_blob, mem, "reg", 0, &res); ret = ofnode_read_resource(mem, 0, &res);
if (ret != 0) { if (ret != 0) {
debug("%s: Unable to decode first memory bank\n", __func__); debug("%s: Unable to decode first memory bank\n", __func__);
return -EINVAL; return -EINVAL;
@ -1057,42 +1059,42 @@ int fdtdec_setup_mem_size_base(void)
#if defined(CONFIG_NR_DRAM_BANKS) #if defined(CONFIG_NR_DRAM_BANKS)
static int get_next_memory_node(const void *blob, int mem) ofnode get_next_memory_node(ofnode mem)
{ {
do { do {
mem = fdt_node_offset_by_prop_value(gd->fdt_blob, mem, mem = ofnode_by_prop_value(mem, "device_type", "memory", 7);
"device_type", "memory", 7); } while (!ofnode_is_available(mem));
} while (!fdtdec_get_is_enabled(blob, mem));
return mem; return mem;
} }
int fdtdec_setup_memory_banksize(void) int fdtdec_setup_memory_banksize(void)
{ {
int bank, ret, mem, reg = 0; int bank, ret, reg = 0;
struct fdt_resource res; struct resource res;
ofnode mem = ofnode_null();
mem = get_next_memory_node(gd->fdt_blob, -1); mem = get_next_memory_node(mem);
if (mem < 0) { if (!ofnode_valid(mem)) {
debug("%s: Missing /memory node\n", __func__); debug("%s: Missing /memory node\n", __func__);
return -EINVAL; return -EINVAL;
} }
for (bank = 0; bank < CONFIG_NR_DRAM_BANKS; bank++) { for (bank = 0; bank < CONFIG_NR_DRAM_BANKS; bank++) {
ret = fdt_get_resource(gd->fdt_blob, mem, "reg", reg++, &res); ret = ofnode_read_resource(mem, reg++, &res);
if (ret == -FDT_ERR_NOTFOUND) { if (ret < 0) {
reg = 0; reg = 0;
mem = get_next_memory_node(gd->fdt_blob, mem); mem = get_next_memory_node(mem);
if (mem == -FDT_ERR_NOTFOUND) if (ofnode_valid(mem))
break; break;
ret = fdt_get_resource(gd->fdt_blob, mem, "reg", reg++, &res); ret = ofnode_read_resource(mem, reg++, &res);
if (ret == -FDT_ERR_NOTFOUND) if (ret < 0)
break; break;
} }
if (ret != 0) {
if (ret != 0)
return -EINVAL; return -EINVAL;
}
gd->bd->bi_dram[bank].start = (phys_addr_t)res.start; gd->bd->bi_dram[bank].start = (phys_addr_t)res.start;
gd->bd->bi_dram[bank].size = gd->bd->bi_dram[bank].size =
@ -1109,32 +1111,33 @@ int fdtdec_setup_memory_banksize(void)
int fdtdec_setup_mem_size_base_lowest(void) int fdtdec_setup_mem_size_base_lowest(void)
{ {
int bank, ret, mem, reg = 0; int bank, ret, reg = 0;
struct fdt_resource res; struct resource res;
unsigned long base; unsigned long base;
phys_size_t size; phys_size_t size;
const void *blob = gd->fdt_blob; ofnode mem = ofnode_null();
gd->ram_base = (unsigned long)~0; gd->ram_base = (unsigned long)~0;
mem = get_next_memory_node(blob, -1); mem = get_next_memory_node(mem);
if (mem < 0) { if (!ofnode_valid(mem)) {
debug("%s: Missing /memory node\n", __func__); debug("%s: Missing /memory node\n", __func__);
return -EINVAL; return -EINVAL;
} }
for (bank = 0; bank < CONFIG_NR_DRAM_BANKS; bank++) { for (bank = 0; bank < CONFIG_NR_DRAM_BANKS; bank++) {
ret = fdt_get_resource(blob, mem, "reg", reg++, &res); ret = ofnode_read_resource(mem, reg++, &res);
if (ret == -FDT_ERR_NOTFOUND) { if (ret < 0) {
reg = 0; reg = 0;
mem = get_next_memory_node(blob, mem); mem = get_next_memory_node(mem);
if (mem == -FDT_ERR_NOTFOUND) if (ofnode_valid(mem))
break; break;
ret = fdt_get_resource(blob, mem, "reg", reg++, &res); ret = ofnode_read_resource(mem, reg++, &res);
if (ret == -FDT_ERR_NOTFOUND) if (ret < 0)
break; break;
} }
if (ret != 0) if (ret != 0)
return -EINVAL; return -EINVAL;