From: AKASHI Takahiro <takahiro.akashi@linaro.org>
To: catalin.marinas@arm.com, will.deacon@arm.com,
dhowells@redhat.com, vgoyal@redhat.com,
herbert@gondor.apana.org.au, davem@davemloft.net,
dyoung@redhat.com, bhe@redhat.com, arnd@arndb.de,
schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com
Cc: ard.biesheuvel@linaro.org, james.morse@arm.com,
bhsharma@redhat.com, kexec@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
AKASHI Takahiro <takahiro.akashi@linaro.org>,
Rob Herring <robh+dt@kernel.org>,
Frank Rowand <frowand.list@gmail.com>
Subject: [PATCH v12 06/16] of/fdt: add helper functions for handling properties
Date: Tue, 24 Jul 2018 15:57:49 +0900 [thread overview]
Message-ID: <20180724065759.19186-7-takahiro.akashi@linaro.org> (raw)
In-Reply-To: <20180724065759.19186-1-takahiro.akashi@linaro.org>
These functions will be used later to handle kexec-specific properties
in arm64's kexec_file implementation.
Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Frank Rowand <frowand.list@gmail.com>
---
drivers/of/fdt.c | 62 ++++++++++++++++++++++++++++++++++++++++--
include/linux/of_fdt.h | 10 +++++--
2 files changed, 68 insertions(+), 4 deletions(-)
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 6da20b9688f7..f7c9d69ce86c 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -25,6 +25,7 @@
#include <linux/debugfs.h>
#include <linux/serial_core.h>
#include <linux/sysfs.h>
+#include <linux/types.h>
#include <asm/setup.h> /* for COMMAND_LINE_SIZE */
#include <asm/page.h>
@@ -537,8 +538,8 @@ void *of_fdt_unflatten_tree(const unsigned long *blob,
EXPORT_SYMBOL_GPL(of_fdt_unflatten_tree);
/* Everything below here references initial_boot_params directly. */
-int __initdata dt_root_addr_cells;
-int __initdata dt_root_size_cells;
+int dt_root_addr_cells;
+int dt_root_size_cells;
void *initial_boot_params;
@@ -1330,3 +1331,60 @@ late_initcall(of_fdt_raw_init);
#endif
#endif /* CONFIG_OF_EARLY_FLATTREE */
+
+bool of_fdt_cells_size_fitted(u64 base, u64 size)
+{
+ /* if *_cells >= 2, cells can hold 64-bit values anyway */
+ if ((dt_root_addr_cells == 1) && (base > U32_MAX))
+ return false;
+
+ if ((dt_root_size_cells == 1) && (size > U32_MAX))
+ return false;
+
+ return true;
+}
+
+size_t of_fdt_reg_cells_size(void)
+{
+ return (dt_root_addr_cells + dt_root_size_cells) * sizeof(u32);
+}
+
+#define FDT_ALIGN(x, a) (((x) + (a) - 1) & ~((a) - 1))
+#define FDT_TAGALIGN(x) (FDT_ALIGN((x), FDT_TAGSIZE))
+
+int fdt_prop_len(const char *prop_name, int len)
+{
+ return (strlen(prop_name) + 1) +
+ sizeof(struct fdt_property) +
+ FDT_TAGALIGN(len);
+}
+
+static void fill_property(void *buf, u64 val64, int cells)
+{
+ __be32 val32;
+
+ while (cells) {
+ val32 = cpu_to_fdt32((val64 >> (32 * (--cells))) & U32_MAX);
+ memcpy(buf, &val32, sizeof(val32));
+ buf += sizeof(val32);
+ }
+}
+
+int fdt_setprop_reg(void *fdt, int nodeoffset, const char *name,
+ u64 addr, u64 size)
+{
+ char buf[sizeof(__be32) * 2 * 2];
+ /* assume dt_root_[addr|size]_cells <= 2 */
+ void *prop;
+ size_t buf_size;
+
+ buf_size = of_fdt_reg_cells_size();
+ prop = buf;
+
+ fill_property(prop, addr, dt_root_addr_cells);
+ prop += dt_root_addr_cells * sizeof(u32);
+
+ fill_property(prop, size, dt_root_size_cells);
+
+ return fdt_setprop(fdt, nodeoffset, name, buf, buf_size);
+}
diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h
index b9cd9ebdf9b9..9615d6142578 100644
--- a/include/linux/of_fdt.h
+++ b/include/linux/of_fdt.h
@@ -37,8 +37,8 @@ extern void *of_fdt_unflatten_tree(const unsigned long *blob,
struct device_node **mynodes);
/* TBD: Temporary export of fdt globals - remove when code fully merged */
-extern int __initdata dt_root_addr_cells;
-extern int __initdata dt_root_size_cells;
+extern int dt_root_addr_cells;
+extern int dt_root_size_cells;
extern void *initial_boot_params;
extern char __dtb_start[];
@@ -108,5 +108,11 @@ static inline void unflatten_device_tree(void) {}
static inline void unflatten_and_copy_device_tree(void) {}
#endif /* CONFIG_OF_EARLY_FLATTREE */
+bool of_fdt_cells_size_fitted(u64 base, u64 size);
+size_t of_fdt_reg_cells_size(void);
+int fdt_prop_len(const char *prop_name, int len);
+int fdt_setprop_reg(void *fdt, int nodeoffset, const char *name,
+ u64 addr, u64 size);
+
#endif /* __ASSEMBLY__ */
#endif /* _LINUX_OF_FDT_H */
--
2.18.0
next prev parent reply other threads:[~2018-07-24 6:58 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-24 6:57 [PATCH v12 00/16] arm64: kexec: add kexec_file_load() support AKASHI Takahiro
2018-07-24 6:57 ` [PATCH v12 01/16] asm-generic: add kexec_file_load system call to unistd.h AKASHI Takahiro
2018-07-26 13:35 ` James Morse
2018-07-27 5:22 ` AKASHI Takahiro
2018-07-24 6:57 ` [PATCH v12 02/16] kexec_file: make kexec_image_post_load_cleanup_default() global AKASHI Takahiro
2018-07-24 6:57 ` [PATCH v12 03/16] s390, kexec_file: drop arch_kexec_mem_walk() AKASHI Takahiro
2018-07-24 9:23 ` Philipp Rudo
2018-07-24 6:57 ` [PATCH v12 04/16] powerpc, kexec_file: factor out memblock-based arch_kexec_walk_mem() AKASHI Takahiro
2018-07-25 12:31 ` Dave Young
2018-07-27 5:25 ` AKASHI Takahiro
2018-07-24 6:57 ` [PATCH v12 05/16] kexec_file: kexec_walk_memblock() only walks a dedicated region at kdump AKASHI Takahiro
2018-07-24 6:57 ` AKASHI Takahiro [this message]
2018-07-24 6:57 ` [PATCH v12 07/16] arm64: add image head flag definitions AKASHI Takahiro
2018-07-24 6:57 ` [PATCH v12 08/16] arm64: cpufeature: add MMFR0 helper functions AKASHI Takahiro
2018-07-24 6:57 ` [PATCH v12 09/16] arm64: enable KEXEC_FILE config AKASHI Takahiro
2018-07-24 6:57 ` [PATCH v12 10/16] arm64: kexec_file: load initrd and device-tree AKASHI Takahiro
2018-07-26 13:34 ` James Morse
2018-07-27 5:37 ` AKASHI Takahiro
2018-07-24 6:57 ` [PATCH v12 11/16] arm64: kexec_file: allow for loading Image-format kernel AKASHI Takahiro
2018-07-24 6:57 ` [PATCH v12 12/16] arm64: kexec_file: add crash dump support AKASHI Takahiro
2018-07-26 13:36 ` James Morse
2018-07-27 7:00 ` AKASHI Takahiro
2018-07-24 6:57 ` [PATCH v12 13/16] arm64: kexec_file: invoke the kernel without purgatory AKASHI Takahiro
2018-07-26 13:36 ` James Morse
2018-07-27 7:22 ` AKASHI Takahiro
2018-07-24 6:57 ` [PATCH v12 14/16] include: pe.h: remove message[] from mz header definition AKASHI Takahiro
2018-07-24 6:57 ` [PATCH v12 15/16] arm64: kexec_file: add kernel signature verification support AKASHI Takahiro
2018-07-26 13:39 ` James Morse
2018-07-24 6:57 ` [PATCH v12 16/16] arm64: kexec_file: add kaslr support AKASHI Takahiro
2018-07-26 13:40 ` James Morse
2018-07-27 8:31 ` AKASHI Takahiro
[not found] ` <405b6708-4518-d81e-3938-39032c2b487e@arm.com>
2018-07-27 9:28 ` Ard Biesheuvel
2018-08-01 7:57 ` AKASHI Takahiro
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180724065759.19186-7-takahiro.akashi@linaro.org \
--to=takahiro.akashi@linaro.org \
--cc=ard.biesheuvel@linaro.org \
--cc=arnd@arndb.de \
--cc=bhe@redhat.com \
--cc=bhsharma@redhat.com \
--cc=catalin.marinas@arm.com \
--cc=davem@davemloft.net \
--cc=dhowells@redhat.com \
--cc=dyoung@redhat.com \
--cc=frowand.list@gmail.com \
--cc=heiko.carstens@de.ibm.com \
--cc=herbert@gondor.apana.org.au \
--cc=james.morse@arm.com \
--cc=kexec@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robh+dt@kernel.org \
--cc=schwidefsky@de.ibm.com \
--cc=vgoyal@redhat.com \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).