* [U-Boot] [PATCH v2 1/1] common: fdt_support: Check mtdparts cell size
@ 2019-04-24 5:31 Stefan Mavrodiev
2019-04-24 15:18 ` Simon Glass
0 siblings, 1 reply; 3+ messages in thread
From: Stefan Mavrodiev @ 2019-04-24 5:31 UTC (permalink / raw)
To: u-boot
When using fdt_fixup_mtdparts() offset and length cell sizes
are limited to 4 bytes (1 cell). However if the mtd device is
bigger then 4GiB, then #address-cells and #size-cells are
8 bytes (2 cells) [1].
This patch read #size-cells and uses either fdt32_t or
fdt64_t cell size. The default is fdt32_t.
[1] Documentation/devicetree/bindings/mtd/partition.txt
Signed-off-by: Stefan Mavrodiev <stefan@olimex.com>
---
Changes for v2:
- Use fdt_setprop_u64() and ..._u32() instead of fdt_setprop()
- Add size value using fdt_appendprop_u64() and ..._u32()
common/fdt_support.c | 31 ++++++++++++++++++++++---------
1 file changed, 22 insertions(+), 9 deletions(-)
diff --git a/common/fdt_support.c b/common/fdt_support.c
index 42583e3ed8..1c1a954829 100644
--- a/common/fdt_support.c
+++ b/common/fdt_support.c
@@ -724,11 +724,6 @@ int fdt_increase_size(void *fdt, int add_len)
#include <jffs2/load_kernel.h>
#include <mtd_node.h>
-struct reg_cell {
- unsigned int r0;
- unsigned int r1;
-};
-
static int fdt_del_subnodes(const void *blob, int parent_offset)
{
int off, ndepth;
@@ -787,15 +782,22 @@ int fdt_node_set_part_info(void *blob, int parent_offset,
{
struct list_head *pentry;
struct part_info *part;
- struct reg_cell cell;
int off, ndepth = 0;
int part_num, ret;
+ int sizecell;
char buf[64];
ret = fdt_del_partitions(blob, parent_offset);
if (ret < 0)
return ret;
+ /*
+ * Check if size/address is 1 or 2 cells.
+ * We assume #address-cells and #size-cells have same value.
+ */
+ sizecell = fdt_getprop_u32_default_node(blob, parent_offset,
+ 0, "#size-cells", 1);
+
/*
* Check if it is nand {}; subnode, adjust
* the offset in this case
@@ -844,10 +846,21 @@ add_ro:
goto err_prop;
}
- cell.r0 = cpu_to_fdt32(part->offset);
- cell.r1 = cpu_to_fdt32(part->size);
add_reg:
- ret = fdt_setprop(blob, newoff, "reg", &cell, sizeof(cell));
+ if (sizecell == 2) {
+ ret = fdt_setprop_u64(blob, newoff,
+ "reg", part->offset);
+ if (!ret)
+ ret = fdt_appendprop_u64(blob, newoff,
+ "reg", part->size);
+ } else {
+ ret = fdt_setprop_u32(blob, newoff,
+ "reg", part->offset);
+ if (!ret)
+ ret = fdt_appendprop_u32(blob, newoff,
+ "reg", part->size);
+ }
+
if (ret == -FDT_ERR_NOSPACE) {
ret = fdt_increase_size(blob, 512);
if (!ret)
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH v2 1/1] common: fdt_support: Check mtdparts cell size
2019-04-24 5:31 [U-Boot] [PATCH v2 1/1] common: fdt_support: Check mtdparts cell size Stefan Mavrodiev
@ 2019-04-24 15:18 ` Simon Glass
2019-05-22 13:21 ` Simon Glass
0 siblings, 1 reply; 3+ messages in thread
From: Simon Glass @ 2019-04-24 15:18 UTC (permalink / raw)
To: u-boot
On Tue, 23 Apr 2019 at 23:32, Stefan Mavrodiev <stefan@olimex.com> wrote:
>
> When using fdt_fixup_mtdparts() offset and length cell sizes
> are limited to 4 bytes (1 cell). However if the mtd device is
> bigger then 4GiB, then #address-cells and #size-cells are
> 8 bytes (2 cells) [1].
>
> This patch read #size-cells and uses either fdt32_t or
> fdt64_t cell size. The default is fdt32_t.
>
> [1] Documentation/devicetree/bindings/mtd/partition.txt
>
> Signed-off-by: Stefan Mavrodiev <stefan@olimex.com>
> ---
> Changes for v2:
> - Use fdt_setprop_u64() and ..._u32() instead of fdt_setprop()
> - Add size value using fdt_appendprop_u64() and ..._u32()
>
> common/fdt_support.c | 31 ++++++++++++++++++++++---------
> 1 file changed, 22 insertions(+), 9 deletions(-)
>
Reviewed-by: Simon Glass <sjg@chromium.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH v2 1/1] common: fdt_support: Check mtdparts cell size
2019-04-24 15:18 ` Simon Glass
@ 2019-05-22 13:21 ` Simon Glass
0 siblings, 0 replies; 3+ messages in thread
From: Simon Glass @ 2019-05-22 13:21 UTC (permalink / raw)
To: u-boot
On Wed, 24 Apr 2019 at 09:18, Simon Glass <sjg@chromium.org> wrote:
>
> On Tue, 23 Apr 2019 at 23:32, Stefan Mavrodiev <stefan@olimex.com> wrote:
> >
> > When using fdt_fixup_mtdparts() offset and length cell sizes
> > are limited to 4 bytes (1 cell). However if the mtd device is
> > bigger then 4GiB, then #address-cells and #size-cells are
> > 8 bytes (2 cells) [1].
> >
> > This patch read #size-cells and uses either fdt32_t or
> > fdt64_t cell size. The default is fdt32_t.
> >
> > [1] Documentation/devicetree/bindings/mtd/partition.txt
> >
> > Signed-off-by: Stefan Mavrodiev <stefan@olimex.com>
> > ---
> > Changes for v2:
> > - Use fdt_setprop_u64() and ..._u32() instead of fdt_setprop()
> > - Add size value using fdt_appendprop_u64() and ..._u32()
> >
> > common/fdt_support.c | 31 ++++++++++++++++++++++---------
> > 1 file changed, 22 insertions(+), 9 deletions(-)
> >
>
> Reviewed-by: Simon Glass <sjg@chromium.org>
Applied to u-boot-dm, thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-05-22 13:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-24 5:31 [U-Boot] [PATCH v2 1/1] common: fdt_support: Check mtdparts cell size Stefan Mavrodiev
2019-04-24 15:18 ` Simon Glass
2019-05-22 13:21 ` Simon Glass
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.