diff options
| author | Simon Glass <sjg@chromium.org> | 2020-02-20 14:45:54 -0700 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2020-02-24 13:38:44 +1100 |
| commit | fc03c4a2e04ef76f54582bfcd3ad17d0b0507e9a (patch) | |
| tree | f4776c09c2a6764be45cd3038b3e0e8199905916 /libfdt | |
| parent | 77563ae72b7c3349008e712669253f6c54b752a7 (diff) | |
| download | dtc-fc03c4a2e04ef76f54582bfcd3ad17d0b0507e9a.zip dtc-fc03c4a2e04ef76f54582bfcd3ad17d0b0507e9a.tar.gz dtc-fc03c4a2e04ef76f54582bfcd3ad17d0b0507e9a.tar.bz2 | |
libfdt: Add support for disabling rollback handling
Allow enabling FDT_ASSUME_NO_ROLLBACK to disable rolling back after a
failed operation.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Message-Id: <20200220214557.176528-6-sjg@chromium.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'libfdt')
| -rw-r--r-- | libfdt/fdt_rw.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/libfdt/fdt_rw.c b/libfdt/fdt_rw.c index 707c00a..4a95ce2 100644 --- a/libfdt/fdt_rw.c +++ b/libfdt/fdt_rw.c @@ -114,6 +114,15 @@ static int fdt_splice_string_(void *fdt, int newlen) return 0; } +/** + * fdt_find_add_string_() - Find or allocate a string + * + * @fdt: pointer to the device tree to check/adjust + * @s: string to find/add + * @allocated: Set to 0 if the string was found, 1 if not found and so + * allocated. Ignored if can_assume(NO_ROLLBACK) + * @return offset of string in the string table (whether found or added) + */ static int fdt_find_add_string_(void *fdt, const char *s, int *allocated) { char *strtab = (char *)fdt + fdt_off_dt_strings(fdt); @@ -122,7 +131,8 @@ static int fdt_find_add_string_(void *fdt, const char *s, int *allocated) int len = strlen(s) + 1; int err; - *allocated = 0; + if (!can_assume(NO_ROLLBACK)) + *allocated = 0; p = fdt_find_string_(strtab, fdt_size_dt_strings(fdt), s); if (p) @@ -134,7 +144,8 @@ static int fdt_find_add_string_(void *fdt, const char *s, int *allocated) if (err) return err; - *allocated = 1; + if (!can_assume(NO_ROLLBACK)) + *allocated = 1; memcpy(new, s, len); return (new - strtab); @@ -208,7 +219,8 @@ static int fdt_add_property_(void *fdt, int nodeoffset, const char *name, err = fdt_splice_struct_(fdt, *prop, 0, proplen); if (err) { - if (allocated) + /* Delete the string if we failed to add it */ + if (!can_assume(NO_ROLLBACK) && allocated) fdt_del_last_string_(fdt, name); return err; } |