Merge branch 'devicetree/next-reserved-mem' into devicetree/next

3 files changed, 68 insertions, 0 deletions

diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index bc2121fa9132..f10f64fcc815 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -167,6 +167,16 @@
 #define CLK_OF_TABLES()
 #endif
 
+#ifdef CONFIG_OF_RESERVED_MEM
+#define RESERVEDMEM_OF_TABLES()                         \
+        . = ALIGN(8);                                   \
+        VMLINUX_SYMBOL(__reservedmem_of_table) = .;     \
+        *(__reservedmem_of_table)                       \
+        *(__reservedmem_of_table_end)
+#else
+#define RESERVEDMEM_OF_TABLES()
+#endif
+
 #define KERNEL_DTB()                                                    \
         STRUCT_ALIGN();                                                 \
         VMLINUX_SYMBOL(__dtb_start) = .;                                \
@@ -490,6 +500,7 @@
         TRACE_SYSCALLS()                                                \
         MEM_DISCARD(init.rodata)                                        \
         CLK_OF_TABLES()                                                 \
+        RESERVEDMEM_OF_TABLES()                                         \
         CLKSRC_OF_TABLES()                                              \
         KERNEL_DTB()                                                    \
         IRQCHIP_OF_MATCH_TABLE()
diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h
index 2b77058a7335..ddd7219af8ac 100644
--- a/include/linux/of_fdt.h
+++ b/include/linux/of_fdt.h
@@ -98,7 +98,10 @@ extern int early_init_dt_scan_chosen(unsigned long node, const char *uname,
                                      int depth, void *data);
 extern int early_init_dt_scan_memory(unsigned long node, const char *uname,
                                      int depth, void *data);
+extern void early_init_fdt_scan_reserved_mem(void);
 extern void early_init_dt_add_memory_arch(u64 base, u64 size);
+extern int early_init_dt_reserve_memory_arch(phys_addr_t base, phys_addr_t size,
+                                             bool no_map);
 extern void * early_init_dt_alloc_memory_arch(u64 size, u64 align);
 extern u64 dt_mem_next_cell(int s, __be32 **cellp);
 
@@ -118,6 +121,7 @@ extern void unflatten_and_copy_device_tree(void);
 extern void early_init_devtree(void *);
 extern void early_get_first_memblock_info(void *, phys_addr_t *);
 #else /* CONFIG_OF_FLATTREE */
+static inline void early_init_fdt_scan_reserved_mem(void) {}
 static inline const char *of_flat_dt_get_machine_name(void) { return NULL; }
 static inline void unflatten_device_tree(void) {}
 static inline void unflatten_and_copy_device_tree(void) {}
diff --git a/include/linux/of_reserved_mem.h b/include/linux/of_reserved_mem.h
new file mode 100644
index 000000000000..9b1fbb7f29fc
--- /dev/null
+++ b/include/linux/of_reserved_mem.h
@@ -0,0 +1,53 @@
+#ifndef __OF_RESERVED_MEM_H
+#define __OF_RESERVED_MEM_H
+
+struct device;
+struct of_phandle_args;
+struct reserved_mem_ops;
+
+struct reserved_mem {
+        const char                      *name;
+        unsigned long                   fdt_node;
+        const struct reserved_mem_ops   *ops;
+        phys_addr_t                     base;
+        phys_addr_t                     size;
+        void                            *priv;
+};
+
+struct reserved_mem_ops {
+        void    (*device_init)(struct reserved_mem *rmem,
+                               struct device *dev);
+        void    (*device_release)(struct reserved_mem *rmem,
+                                  struct device *dev);
+};
+
+typedef int (*reservedmem_of_init_fn)(struct reserved_mem *rmem,
+                                      unsigned long node, const char *uname);
+
+#ifdef CONFIG_OF_RESERVED_MEM
+void fdt_init_reserved_mem(void);
+void fdt_reserved_mem_save_node(unsigned long node, const char *uname,
+                               phys_addr_t base, phys_addr_t size);
+
+#define RESERVEDMEM_OF_DECLARE(name, compat, init)                      \
+        static const struct of_device_id __reservedmem_of_table_##name  \
+                __used __section(__reservedmem_of_table)                \
+                 = { .compatible = compat,                              \
+                     .data = (init == (reservedmem_of_init_fn)NULL) ?   \
+                                init : init }
+
+#else
+static inline void fdt_init_reserved_mem(void) { }
+static inline void fdt_reserved_mem_save_node(unsigned long node,
+                const char *uname, phys_addr_t base, phys_addr_t size) { }
+
+#define RESERVEDMEM_OF_DECLARE(name, compat, init)                      \
+        static const struct of_device_id __reservedmem_of_table_##name  \
+                __attribute__((unused))                                 \
+                 = { .compatible = compat,                              \
+                     .data = (init == (reservedmem_of_init_fn)NULL) ?   \
+                                init : init }
+
+#endif
+
+#endif /* __OF_RESERVED_MEM_H */