leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fdtdec: Reorder fdtdec_set_carveout() parameters for consistency

Browse Source 
The fdtdec_set_carveout() function's parameters are inconsistent with
the parameters passed to fdtdec_add_reserved_memory(). Fix up the order
to make it more consistent.

Signed-off-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>
This commit is contained in:
Thierry Reding
2021-09-03 15:16:20 +02:00
committed by Tom Warren
parent 46cb067803
commit 9019487608
7 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
board/nvidia/p2371-2180/p2371-2180.c
View File

@@ -138,8 +138,8 @@ static int ft_copy_carveout(void *dst, const void *src, const char *node)
return err; return err;
} }
err = fdtdec_set_carveout(dst, node, "memory-region", 0, "framebuffer", err = fdtdec_set_carveout(dst, node, "memory-region", 0, &fb,
NULL, 0, &fb); "framebuffer", NULL, 0);
if (err < 0) { if (err < 0) {
printf("failed to set carveout for %s: %d\n", node, err); printf("failed to set carveout for %s: %d\n", node, err);
return err; return err;

4
board/nvidia/p2771-0000/p2771-0000.c
View File

@@ -114,8 +114,8 @@ static int ft_copy_carveout(void *dst, const void *src, const char *node)
return err; return err;
} }
err = fdtdec_set_carveout(dst, node, "memory-region", 0, "framebuffer", err = fdtdec_set_carveout(dst, node, "memory-region", 0, &fb,
NULL, 0, &fb); "framebuffer", NULL, 0);
if (err < 0) { if (err < 0) {
printf("failed to set carveout for %s: %d\n", node, err); printf("failed to set carveout for %s: %d\n", node, err);
return err; return err;

4
board/nvidia/p3450-0000/p3450-0000.c
View File

@@ -137,8 +137,8 @@ static int ft_copy_carveout(void *dst, const void *src, const char *node)
return err; return err;
} }
err = fdtdec_set_carveout(dst, node, "memory-region", 0, "framebuffer", err = fdtdec_set_carveout(dst, node, "memory-region", 0, &fb,
NULL, 0, &fb); "framebuffer", NULL, 0);
if (err < 0) { if (err < 0) {
printf("failed to set carveout for %s: %d\n", node, err); printf("failed to set carveout for %s: %d\n", node, err);
return err; return err;

8
include/fdtdec.h
View File

@@ -1110,16 +1110,16 @@ int fdtdec_get_carveout(const void *blob, const char *node,
* @param prop_name name of the property in which to store the phandle of * @param prop_name name of the property in which to store the phandle of
* the carveout * the carveout
* @param index index of the phandle to store * @param index index of the phandle to store
* @param name base name of the reserved-memory node to create
* @param carveout information about the carveout to add * @param carveout information about the carveout to add
* @param name base name of the reserved-memory node to create
* @param compatibles compatible strings to set for the carveout * @param compatibles compatible strings to set for the carveout
* @param count number of compatible strings * @param count number of compatible strings
* @return 0 on success or a negative error code on failure * @return 0 on success or a negative error code on failure
*/ */
int fdtdec_set_carveout(void *blob, const char *node, const char *prop_name, int fdtdec_set_carveout(void *blob, const char *node, const char *prop_name,
unsigned int index, const char *name, unsigned int index, const struct fdt_memory *carveout,
const char **compatibles, unsigned int count, const char *name, const char **compatibles,
const struct fdt_memory *carveout); unsigned int count);
/** /**
* Set up the device tree ready for use * Set up the device tree ready for use

6
lib/fdtdec.c
View File

@@ -1523,9 +1523,9 @@ skip_compat:
} }
int fdtdec_set_carveout(void *blob, const char *node, const char *prop_name, int fdtdec_set_carveout(void *blob, const char *node, const char *prop_name,
unsigned int index, const char *name, unsigned int index, const struct fdt_memory *carveout,
const char **compatibles, unsigned int count, const char *name, const char **compatibles,
const struct fdt_memory *carveout) unsigned int count)
{ {
uint32_t phandle; uint32_t phandle;
int err, offset, len; int err, offset, len;

4
lib/fdtdec_test.c
View File

@@ -189,8 +189,8 @@ static int make_fdt_carveout_device(void *fdt, uint32_t na, uint32_t ns)
offset = CHECK(fdt_add_subnode(fdt, 0, name + 1)); offset = CHECK(fdt_add_subnode(fdt, 0, name + 1));
CHECK(fdt_setprop(fdt, offset, "reg", cells, (na + ns) * sizeof(*cells))); CHECK(fdt_setprop(fdt, offset, "reg", cells, (na + ns) * sizeof(*cells)));
return fdtdec_set_carveout(fdt, name, "memory-region", 0, return fdtdec_set_carveout(fdt, name, "memory-region", 0, &carveout,
"framebuffer", NULL, 0, &carveout); "framebuffer", NULL, 0);
} }
static int check_fdt_carveout(void *fdt, uint32_t address_cells, static int check_fdt_carveout(void *fdt, uint32_t address_cells,

15
test/dm/fdtdec.c
View File

@@ -28,21 +28,18 @@ static int dm_test_fdtdec_set_carveout(struct unit_test_state *uts)
resv.start = 0x1000; resv.start = 0x1000;
resv.end = 0x2000; resv.end = 0x2000;
ut_assertok(fdtdec_set_carveout(blob, "/a-test", ut_assertok(fdtdec_set_carveout(blob, "/a-test", "memory-region", 2,
"memory-region", 2, "test_resv1", &resv, "test_resv1", NULL, 0));
NULL, 0, &resv));
resv.start = 0x10000; resv.start = 0x10000;
resv.end = 0x20000; resv.end = 0x20000;
ut_assertok(fdtdec_set_carveout(blob, "/a-test", ut_assertok(fdtdec_set_carveout(blob, "/a-test", "memory-region", 1,
"memory-region", 1, "test_resv2", &resv, "test_resv2", NULL, 0));
NULL, 0, &resv));
resv.start = 0x100000; resv.start = 0x100000;
resv.end = 0x200000; resv.end = 0x200000;
ut_assertok(fdtdec_set_carveout(blob, "/a-test", ut_assertok(fdtdec_set_carveout(blob, "/a-test", "memory-region", 0,
"memory-region", 0, "test_resv3", &resv, "test_resv3", NULL, 0));
NULL, 0, &resv));
offset = fdt_path_offset(blob, "/a-test"); offset = fdt_path_offset(blob, "/a-test");
ut_assert(offset > 0); ut_assert(offset > 0);