mirror of
https://github.com/torvalds/linux.git
synced 2024-11-24 21:21:41 +00:00
6e9c9686d8
This adds the following commits from upstream: cbca977ea121 checks: Allow PCI bridge child nodes without an address 73e0f143b73d libfdt: fdt_strerror(): Fix comparison warning 6c2be7d85315 libfdt: fdt_get_string(): Fix sequential write comparison warnings 82525f41d59e libfdt: libfdt_wip: Fix comparison warning fb1f65f15832 libfdt: fdt_create_with_flags(): Fix comparison warning f28aa271000b libfdt: fdt_move(): Fix comparison warnings 3d7c6f44195a libfdt: fdt_add_string_(): Fix comparison warning 10f682788c30 libfdt: fdt_node_offset_by_phandle(): Fix comparison warning 07158f4cf2a2 libfdt: overlay: Fix comparison warning ce9e1f25a7de libfdt: fdt_resize(): Fix comparison warning faa76fc10bc5 libfdt: fdt_splice_(): Fix comparison warning 54dca0985316 libfdt: fdt_get_string(): Fix comparison warnings f8e11e61624e libfdt: fdt_grab_space_(): Fix comparison warning 0c43d4d7bf5a libfdt: fdt_mem_rsv(): Fix comparison warnings 442ea3dd1579 libfdt: fdt_offset_ptr(): Fix comparison warnings ca19c3db2bf6 Makefile: Specify cflags for libyaml 7bb86f1c0956 libfdt: fix fdt_check_node_offset_ w/ VALID_INPUT 3d522abc7571 dtc: Include stdlib.h in util.h 808cdaaf524f dtc: Avoid UB when shifting 3e3138b4a956 libfdt: fix fdt_check_full buffer overrun Signed-off-by: Rob Herring <robh@kernel.org>
95 lines
1.9 KiB
C
95 lines
1.9 KiB
C
// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause)
|
|
/*
|
|
* libfdt - Flat Device Tree manipulation
|
|
* Copyright (C) 2006 David Gibson, IBM Corporation.
|
|
*/
|
|
#include "libfdt_env.h"
|
|
|
|
#include <fdt.h>
|
|
#include <libfdt.h>
|
|
|
|
#include "libfdt_internal.h"
|
|
|
|
int fdt_setprop_inplace_namelen_partial(void *fdt, int nodeoffset,
|
|
const char *name, int namelen,
|
|
uint32_t idx, const void *val,
|
|
int len)
|
|
{
|
|
void *propval;
|
|
int proplen;
|
|
|
|
propval = fdt_getprop_namelen_w(fdt, nodeoffset, name, namelen,
|
|
&proplen);
|
|
if (!propval)
|
|
return proplen;
|
|
|
|
if ((unsigned)proplen < (len + idx))
|
|
return -FDT_ERR_NOSPACE;
|
|
|
|
memcpy((char *)propval + idx, val, len);
|
|
return 0;
|
|
}
|
|
|
|
int fdt_setprop_inplace(void *fdt, int nodeoffset, const char *name,
|
|
const void *val, int len)
|
|
{
|
|
const void *propval;
|
|
int proplen;
|
|
|
|
propval = fdt_getprop(fdt, nodeoffset, name, &proplen);
|
|
if (!propval)
|
|
return proplen;
|
|
|
|
if (proplen != len)
|
|
return -FDT_ERR_NOSPACE;
|
|
|
|
return fdt_setprop_inplace_namelen_partial(fdt, nodeoffset, name,
|
|
strlen(name), 0,
|
|
val, len);
|
|
}
|
|
|
|
static void fdt_nop_region_(void *start, int len)
|
|
{
|
|
fdt32_t *p;
|
|
|
|
for (p = start; (char *)p < ((char *)start + len); p++)
|
|
*p = cpu_to_fdt32(FDT_NOP);
|
|
}
|
|
|
|
int fdt_nop_property(void *fdt, int nodeoffset, const char *name)
|
|
{
|
|
struct fdt_property *prop;
|
|
int len;
|
|
|
|
prop = fdt_get_property_w(fdt, nodeoffset, name, &len);
|
|
if (!prop)
|
|
return len;
|
|
|
|
fdt_nop_region_(prop, len + sizeof(*prop));
|
|
|
|
return 0;
|
|
}
|
|
|
|
int fdt_node_end_offset_(void *fdt, int offset)
|
|
{
|
|
int depth = 0;
|
|
|
|
while ((offset >= 0) && (depth >= 0))
|
|
offset = fdt_next_node(fdt, offset, &depth);
|
|
|
|
return offset;
|
|
}
|
|
|
|
int fdt_nop_node(void *fdt, int nodeoffset)
|
|
{
|
|
int endoffset;
|
|
|
|
endoffset = fdt_node_end_offset_(fdt, nodeoffset);
|
|
if (endoffset < 0)
|
|
return endoffset;
|
|
|
|
fdt_nop_region_(fdt_offset_ptr_w(fdt, nodeoffset, 0),
|
|
endoffset - nodeoffset);
|
|
return 0;
|
|
}
|