mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
![Rob Herring](/assets/img/avatar_default.png)
This adds the following commits from upstream: c40aeb60b47a travis.yml: Run tests on the non-x86 builders, too 9f86aff444f4 Add .cirrus.yml for FreeBSD build 34c82275bae6 Avoid gnu_printf attribute when using Clang 743000931bc9 tests: default to 'cc' if CC not set adcd676491cc Add test-case for trailing zero d9c55f855b65 Remove trailing zero from the overlay path 7a22132c79ec pylibfdt: Adjust for deprecated test methods dbe80d577ee2 tests: add extension to sed -i for GNU/BSD sed compatibility af57d440d887 libfdt: Correct prototype for fdt_ro_probe_() 6ce585ac153b Use correct inttypes.h format specifier 715028622547 support byacc in addition to bison fdf3f6d897ab pylibfdt: Correct the type for fdt_property_stub() 430419c28100 tests: fix some python warnings 588a29ff2e4e util: use gnu_printf format attribute bc876708ab1d fstree: replace lstat with stat 4c3c4ccb9916 dumptrees: pass outputdir as first argument aa522da9fff6 tests: allow out-of-tree test run 0d0d0fa51b1f fdtoverlay: Return non-zero exit code if overlays can't be applied 4605eb047b38 Add .editorconfig 18d7b2f4ee45 yamltree: Ensure consistent bracketing of properties with phandles 67f790c1adcc libfdt.h: add explicit cast from void* to uint8_t* in fdt(32|64)_st b111122ea5eb pylibfdt: use python3 shebang 60e0db3d65a1 Ignore phandle properties in /aliases 95ce19c14064 README: update for Python 3 5345db19f615 livetree: simplify condition in get_node_by_path b8d6eca78210 libfdt: Allow #size-cells of 0 184f51099471 Makefile: Add EXTRA_CFLAGS variable 812b1956a076 libfdt: Tweak data handling to satisfy Coverity 5c715a44776a fdtoverlay: Ignore symbols in overlays which don't apply to the target tree b99353474850 fdtoverlay: Allow adding labels to __overlay__ nodes in overlays d6de81b81b68 pylibfdt: Add support for fdt_get_alias() 1c17714dbb3a pylibfdt: Correct the FdtSw example ad57e4574a37 tests: Add a failed test case for 'fdtoverlay' with long target path bbe3b36f542b fdtoverlay: Rework output allocation 6c2e61f08396 fdtoverlay: Improve error messages 297f5abb362e fdtoverlay: Check for truncated overlay blobs Cc: Frank Rowand <frowand.list@gmail.com> Cc: clang-built-linux@googlegroups.com Signed-off-by: Rob Herring <robh@kernel.org>
101 lines
2.1 KiB
C
101 lines
2.1 KiB
C
// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause)
|
|
/*
|
|
* libfdt - Flat Device Tree manipulation
|
|
* Copyright (C) 2014 David Gibson <david@gibson.dropbear.id.au>
|
|
* Copyright (C) 2018 embedded brains GmbH
|
|
*/
|
|
#include "libfdt_env.h"
|
|
|
|
#include <fdt.h>
|
|
#include <libfdt.h>
|
|
|
|
#include "libfdt_internal.h"
|
|
|
|
static int fdt_cells(const void *fdt, int nodeoffset, const char *name)
|
|
{
|
|
const fdt32_t *c;
|
|
uint32_t val;
|
|
int len;
|
|
|
|
c = fdt_getprop(fdt, nodeoffset, name, &len);
|
|
if (!c)
|
|
return len;
|
|
|
|
if (len != sizeof(*c))
|
|
return -FDT_ERR_BADNCELLS;
|
|
|
|
val = fdt32_to_cpu(*c);
|
|
if (val > FDT_MAX_NCELLS)
|
|
return -FDT_ERR_BADNCELLS;
|
|
|
|
return (int)val;
|
|
}
|
|
|
|
int fdt_address_cells(const void *fdt, int nodeoffset)
|
|
{
|
|
int val;
|
|
|
|
val = fdt_cells(fdt, nodeoffset, "#address-cells");
|
|
if (val == 0)
|
|
return -FDT_ERR_BADNCELLS;
|
|
if (val == -FDT_ERR_NOTFOUND)
|
|
return 2;
|
|
return val;
|
|
}
|
|
|
|
int fdt_size_cells(const void *fdt, int nodeoffset)
|
|
{
|
|
int val;
|
|
|
|
val = fdt_cells(fdt, nodeoffset, "#size-cells");
|
|
if (val == -FDT_ERR_NOTFOUND)
|
|
return 1;
|
|
return val;
|
|
}
|
|
|
|
/* This function assumes that [address|size]_cells is 1 or 2 */
|
|
int fdt_appendprop_addrrange(void *fdt, int parent, int nodeoffset,
|
|
const char *name, uint64_t addr, uint64_t size)
|
|
{
|
|
int addr_cells, size_cells, ret;
|
|
uint8_t data[sizeof(fdt64_t) * 2], *prop;
|
|
|
|
ret = fdt_address_cells(fdt, parent);
|
|
if (ret < 0)
|
|
return ret;
|
|
addr_cells = ret;
|
|
|
|
ret = fdt_size_cells(fdt, parent);
|
|
if (ret < 0)
|
|
return ret;
|
|
size_cells = ret;
|
|
|
|
/* check validity of address */
|
|
prop = data;
|
|
if (addr_cells == 1) {
|
|
if ((addr > UINT32_MAX) || ((UINT32_MAX + 1 - addr) < size))
|
|
return -FDT_ERR_BADVALUE;
|
|
|
|
fdt32_st(prop, (uint32_t)addr);
|
|
} else if (addr_cells == 2) {
|
|
fdt64_st(prop, addr);
|
|
} else {
|
|
return -FDT_ERR_BADNCELLS;
|
|
}
|
|
|
|
/* check validity of size */
|
|
prop += addr_cells * sizeof(fdt32_t);
|
|
if (size_cells == 1) {
|
|
if (size > UINT32_MAX)
|
|
return -FDT_ERR_BADVALUE;
|
|
|
|
fdt32_st(prop, (uint32_t)size);
|
|
} else if (size_cells == 2) {
|
|
fdt64_st(prop, size);
|
|
} else {
|
|
return -FDT_ERR_BADNCELLS;
|
|
}
|
|
|
|
return fdt_appendprop(fdt, nodeoffset, name, data,
|
|
(addr_cells + size_cells) * sizeof(fdt32_t));
|
|
}
|