|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen-unstable] arm, device tree: parse the DTB for RAM location and size
# HG changeset patch
# User David Vrabel <david.vrabel@xxxxxxxxxx>
# Date 1329143089 0
# Node ID 40879997c29fa71c2de3ccb67995c01c1a6daf10
# Parent f89c9a13529a0808bab24bb88bea6448eeb09cd9
arm, device tree: parse the DTB for RAM location and size
Prior to setting up the page tables, parse the DTB for the location
and size of RAM.
Use this information to get the physical address to relocate Xen to in
setup_pagetables().
Signed-off-by: David Vrabel <david.vrabel@xxxxxxxxxx>
Acked-by: Tim Deegan <tim@xxxxxxx>
Committed-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
diff -r f89c9a13529a -r 40879997c29f xen/arch/arm/mm.c
--- a/xen/arch/arm/mm.c Mon Feb 13 14:24:49 2012 +0000
+++ b/xen/arch/arm/mm.c Mon Feb 13 14:24:49 2012 +0000
@@ -20,6 +20,7 @@
#include <xen/config.h>
#include <xen/compile.h>
#include <xen/types.h>
+#include <xen/device_tree.h>
#include <xen/init.h>
#include <xen/mm.h>
#include <xen/preempt.h>
@@ -159,7 +160,7 @@
write_pte(xen_second + second_linear_offset(dest_va), pte);
}
- xen_paddr = XEN_PADDR;
+ xen_paddr = device_tree_get_xen_paddr();
/* Map the destination in the boot misc area. */
dest_va = BOOT_MISC_VIRT_START;
diff -r f89c9a13529a -r 40879997c29f xen/arch/arm/setup.c
--- a/xen/arch/arm/setup.c Mon Feb 13 14:24:49 2012 +0000
+++ b/xen/arch/arm/setup.c Mon Feb 13 14:24:49 2012 +0000
@@ -19,6 +19,7 @@
#include <xen/config.h>
#include <xen/compile.h>
+#include <xen/device_tree.h>
#include <xen/domain_page.h>
#include <xen/types.h>
#include <xen/string.h>
@@ -68,8 +69,13 @@
unsigned long atag_paddr)
{
+ void *fdt;
int i;
+ fdt = (void *)BOOT_MISC_VIRT_START
+ + (atag_paddr & ((1 << SECOND_SHIFT) - 1));
+ device_tree_early_init(fdt);
+
setup_pagetables(boot_phys_offset);
#ifdef EARLY_UART_ADDRESS
diff -r f89c9a13529a -r 40879997c29f xen/common/Makefile
--- a/xen/common/Makefile Mon Feb 13 14:24:49 2012 +0000
+++ b/xen/common/Makefile Mon Feb 13 14:24:49 2012 +0000
@@ -1,6 +1,7 @@
obj-y += bitmap.o
obj-y += cpu.o
obj-y += cpupool.o
+obj-$(HAS_DEVICE_TREE) += device_tree.o
obj-y += domctl.o
obj-y += domain.o
obj-y += event_channel.o
@@ -60,3 +61,5 @@
subdir-y += libelf
subdir-$(HAS_DEVICE_TREE) += libfdt
+
+CFLAGS += -Ilibfdt
diff -r f89c9a13529a -r 40879997c29f xen/common/device_tree.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/xen/common/device_tree.c Mon Feb 13 14:24:49 2012 +0000
@@ -0,0 +1,179 @@
+/*
+ * Device Tree
+ *
+ * Copyright (C) 2012 Citrix Systems, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <xen/config.h>
+#include <xen/types.h>
+#include <xen/init.h>
+#include <xen/device_tree.h>
+#include <xen/kernel.h>
+#include <xen/lib.h>
+#include <xen/mm.h>
+#include <xen/stdarg.h>
+#include <xen/string.h>
+#include <asm/early_printk.h>
+
+#include <libfdt.h>
+
+struct dt_early_info __initdata early_info;
+
+static void __init get_val(const u32 **cell, u32 cells, u64 *val)
+{
+ *val = 0;
+
+ while (cells--) {
+ *val <<= 32;
+ *val |= fdt32_to_cpu(*(*cell)++);
+ }
+}
+
+static void __init get_register(const u32 **cell, u32 address_cells, u32
size_cells,
+ u64 *start, u64 *size)
+{
+ get_val(cell, address_cells, start);
+ get_val(cell, size_cells, size);
+}
+
+static u32 __init prop_by_name_u32(const void *fdt, int node, const char
*prop_name)
+{
+ const struct fdt_property *prop;
+
+ prop = fdt_get_property(fdt, node, prop_name, NULL);
+ if (!prop || prop->len < sizeof(u32))
+ return 0; /* default to 0 */
+
+ return fdt32_to_cpu(*(uint32_t*)prop->data);
+}
+
+static void __init process_memory_node(const void *fdt, int node,
+ u32 address_cells, u32 size_cells)
+{
+ const struct fdt_property *prop;
+ size_t reg_cells;
+ int i;
+ int banks;
+ const u32 *cell;
+ paddr_t start, size;
+
+ if (address_cells < 1 || size_cells < 1) {
+ early_printk("fdt: node `%s': invalid #address-cells or #size-cells",
+ fdt_get_name(fdt, node, NULL));
+ return;
+ }
+
+ prop = fdt_get_property(fdt, node, "reg", NULL);
+ if (!prop) {
+ early_printk("fdt: node `%s': missing `reg' property\n",
+ fdt_get_name(fdt, node, NULL));
+ return;
+ }
+
+ cell = (const u32 *)prop->data;
+ reg_cells = address_cells + size_cells;
+ banks = fdt32_to_cpu(prop->len) / (reg_cells * sizeof(u32));
+
+ for (i = 0; i < banks && early_info.mem.nr_banks < NR_MEM_BANKS; i++) {
+ get_register(&cell, address_cells, size_cells, &start, &size);
+ early_info.mem.bank[early_info.mem.nr_banks].start = start;
+ early_info.mem.bank[early_info.mem.nr_banks].size = size;
+ early_info.mem.nr_banks++;
+ }
+}
+
+#define MAX_DEPTH 16
+
+static void __init early_scan(const void *fdt)
+{
+ int node;
+ int depth;
+ const char *name;
+ u32 address_cells[MAX_DEPTH];
+ u32 size_cells[MAX_DEPTH];
+
+ for (node = 0; depth >= 0; node = fdt_next_node(fdt, node, &depth)) {
+ name = fdt_get_name(fdt, node, NULL);
+
+ if (depth >= MAX_DEPTH) {
+ early_printk("fdt: node '%s': nested too deep\n",
+ fdt_get_name(fdt, node, NULL));
+ continue;
+ }
+
+ address_cells[depth] = prop_by_name_u32(fdt, node, "#address-cells");
+ size_cells[depth] = prop_by_name_u32(fdt, node, "#size-cells");
+
+ if (strncmp(name, "memory", 6) == 0)
+ process_memory_node(fdt, node, address_cells[depth-1],
size_cells[depth-1]);
+ }
+}
+
+static void __init early_print_info(void)
+{
+ struct dt_mem_info *mi = &early_info.mem;
+ int i;
+
+ for (i = 0; i < mi->nr_banks; i++)
+ early_printk("RAM: %016llx - %016llx\n",
+ mi->bank[i].start, mi->bank[i].start + mi->bank[i].size -
1);
+}
+
+/**
+ * device_tree_early_init - initialize early info from a DTB
+ * @fdt: flattened device tree binary
+ */
+void __init device_tree_early_init(const void *fdt)
+{
+ int ret;
+
+ ret = fdt_check_header(fdt);
+ if (ret < 0)
+ early_panic("No valid device tree\n");
+
+ early_scan(fdt);
+ early_print_info();
+}
+
+/**
+ * device_tree_get_xen_paddr - get physical address to relocate Xen to
+ *
+ * Xen is relocated to the top of RAM and aligned to a XEN_PADDR_ALIGN
+ * boundary.
+ */
+paddr_t __init device_tree_get_xen_paddr(void)
+{
+ struct dt_mem_info *mi = &early_info.mem;
+ paddr_t min_size;
+ paddr_t paddr = 0, t;
+ int i;
+
+ min_size = (_end - _start + (XEN_PADDR_ALIGN-1)) & ~(XEN_PADDR_ALIGN-1);
+
+ /* Find the highest bank with enough space. */
+ for (i = 0; i < mi->nr_banks; i++) {
+ if (mi->bank[i].size >= min_size) {
+ t = mi->bank[i].start + mi->bank[i].size - min_size;
+ if (t > paddr)
+ paddr = t;
+ }
+ }
+
+ if (!paddr)
+ early_panic("Not enough memory to relocate Xen\n");
+
+ return paddr;
+}
+
+/*
+ * Local variables:
+ * mode: C
+ * c-set-style: "BSD"
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
diff -r f89c9a13529a -r 40879997c29f xen/include/asm-arm/mm.h
--- a/xen/include/asm-arm/mm.h Mon Feb 13 14:24:49 2012 +0000
+++ b/xen/include/asm-arm/mm.h Mon Feb 13 14:24:49 2012 +0000
@@ -6,9 +6,8 @@
#include <asm/page.h>
#include <public/xen.h>
-/* Find a suitable place at the top of memory for Xen to live */
-/* XXX For now, use the top of the VE's 4GB RAM, at a 40-bit alias */
-#define XEN_PADDR 0x80ffe00000ull
+/* Align Xen to a 2 MiB boundary. */
+#define XEN_PADDR_ALIGN (1 << 21)
/*
* Per-page-frame information.
diff -r f89c9a13529a -r 40879997c29f xen/include/xen/device_tree.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/xen/include/xen/device_tree.h Mon Feb 13 14:24:49 2012 +0000
@@ -0,0 +1,36 @@
+/*
+ * Device Tree
+ *
+ * Copyright (C) 2012 Citrix Systems, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef __XEN_DEVICE_TREE_H__
+#define __XEN_DEVICE_TREE_H__
+
+#include <xen/types.h>
+
+#define NR_MEM_BANKS 8
+
+struct membank {
+ paddr_t start;
+ paddr_t size;
+};
+
+struct dt_mem_info {
+ int nr_banks;
+ struct membank bank[NR_MEM_BANKS];
+};
+
+struct dt_early_info {
+ struct dt_mem_info mem;
+};
+
+extern struct dt_early_info early_info;
+
+void device_tree_early_init(const void *fdt);
+paddr_t device_tree_get_xen_paddr(void);
+
+#endif
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |