From: Julien Grall <julien.grall@linaro.org>
To: xen-devel@lists.xen.org
Cc: patches@linaro.org, Julien Grall <julien.grall@linaro.org>,
ian.campbell@citrix.com, andre.przywara@linaro.org,
stefano.stabellini@eu.citrix.com
Subject: [PATCH v4 01/27] xen/dts: Constify device_tree_flattened
Date: Fri, 13 Sep 2013 13:49:08 +0100 [thread overview]
Message-ID: <1379076574-28316-2-git-send-email-julien.grall@linaro.org> (raw)
In-Reply-To: <1379076574-28316-1-git-send-email-julien.grall@linaro.org>
The Flat Device Tree is given by the bootloader. Xen doesn't need to modify it.
Signed-off-by: Julien Grall <julien.grall@linaro.org>
---
Changes in v3:
- Fix compilation on arm64
---
xen/arch/arm/domain_build.c | 2 +-
xen/arch/arm/setup.c | 12 ++++++++----
xen/common/device_tree.c | 2 +-
xen/include/xen/device_tree.h | 2 +-
4 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index 77e2a61..bde041e 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -475,7 +475,7 @@ static int map_devices_from_device_tree(struct domain *d)
static int prepare_dtb(struct domain *d, struct kernel_info *kinfo)
{
- void *fdt;
+ const void *fdt;
int new_size;
int ret;
paddr_t end;
diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c
index 4b31623..aa87fb1 100644
--- a/xen/arch/arm/setup.c
+++ b/xen/arch/arm/setup.c
@@ -289,6 +289,7 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size)
unsigned long dtb_pages;
unsigned long boot_mfn_start, boot_mfn_end;
int i = 0;
+ void *fdt;
/* TODO: Handle non-contiguous memory bank */
if ( !early_info.mem.nr_banks )
@@ -363,8 +364,9 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size)
*
* TODO: handle other payloads too.
*/
- device_tree_flattened = mfn_to_virt(alloc_boot_pages(dtb_pages, 1));
- copy_from_paddr(device_tree_flattened, dtb_paddr, dtb_size, BUFFERABLE);
+ fdt = mfn_to_virt(alloc_boot_pages(dtb_pages, 1));
+ copy_from_paddr(fdt, dtb_paddr, dtb_size, BUFFERABLE);
+ device_tree_flattened = fdt;
/* Add non-xenheap memory */
s = ram_start;
@@ -410,6 +412,7 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size)
int bank;
unsigned long xenheap_pages = 0;
unsigned long dtb_pages;
+ void *fdt;
total_pages = 0;
for ( bank = 0 ; bank < early_info.mem.nr_banks; bank++ )
@@ -469,8 +472,9 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size)
*
* TODO: handle other payloads too.
*/
- device_tree_flattened = mfn_to_virt(alloc_boot_pages(dtb_pages, 1));
- copy_from_paddr(device_tree_flattened, dtb_paddr, dtb_size, BUFFERABLE);
+ fdt = mfn_to_virt(alloc_boot_pages(dtb_pages, 1));
+ copy_from_paddr(fdt, dtb_paddr, dtb_size, BUFFERABLE);
+ device_tree_flattened = fdt;
setup_frametable_mappings(ram_start, ram_end);
max_page = PFN_DOWN(ram_end);
diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c
index c4f0f2c..a5abdaa 100644
--- a/xen/common/device_tree.c
+++ b/xen/common/device_tree.c
@@ -26,7 +26,7 @@
#include <asm/early_printk.h>
struct dt_early_info __initdata early_info;
-void *device_tree_flattened;
+const void *device_tree_flattened;
dt_irq_xlate_func dt_irq_xlate;
/* Host device tree */
struct dt_device_node *dt_host;
diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h
index 5cc1905..2e5564e 100644
--- a/xen/include/xen/device_tree.h
+++ b/xen/include/xen/device_tree.h
@@ -164,7 +164,7 @@ typedef int (*device_tree_node_func)(const void *fdt,
void *data);
extern struct dt_early_info early_info;
-extern void *device_tree_flattened;
+extern const void *device_tree_flattened;
size_t __init device_tree_early_init(const void *fdt);
--
1.7.10.4
next prev parent reply other threads:[~2013-09-13 12:49 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-13 12:49 [PATCH v4 00/27] Allow Xen to boot with a raw device tree Julien Grall
2013-09-13 12:49 ` Julien Grall [this message]
2013-09-13 12:49 ` [PATCH v4 02/27] xen/dts: Prefix device tree macro by dt_ Julien Grall
2013-09-13 12:49 ` [PATCH v4 03/27] xen/dts: Don't add a fake property "name" in the device tree Julien Grall
2013-09-13 12:49 ` [PATCH v4 04/27] xen/dts: Add new helpers to use " Julien Grall
2013-09-13 12:49 ` [PATCH v4 05/27] xen: Use the right string comparison function in " Julien Grall
2013-09-13 12:49 ` [PATCH v4 06/27] xen/dts: Remove device_get_reg call in process_cpu_node Julien Grall
2013-09-13 12:49 ` [PATCH v4 07/27] xen/dts: Check "reg" property length in process_multiboot_node Julien Grall
2013-09-13 12:49 ` [PATCH v4 08/27] xen/dts: Check the CPU ID is not greater than NR_CPUS Julien Grall
2013-09-13 12:49 ` [PATCH v4 09/27] xen/video: hdlcd: Convert the driver to the new device tree API Julien Grall
2013-09-13 12:49 ` [PATCH v4 10/27] xen/video: hdlcd: Use early_printk instead of printk Julien Grall
2013-09-13 12:49 ` [PATCH v4 11/27] xen/arm: Use dt_device_match to avoid multiple if conditions Julien Grall
2013-09-13 12:49 ` [PATCH v4 12/27] xen/dts: dt_find_interrupt_controller: accept multiple compatible strings Julien Grall
2013-09-13 12:49 ` [PATCH v4 13/27] xen/arm: Build DOM0 FDT by browsing the device tree structure Julien Grall
2013-09-13 12:49 ` [PATCH v4 14/27] xen/arm: Don't map disabled device in DOM0 Julien Grall
2013-09-13 12:49 ` [PATCH v4 15/27] xen/arm: Create a fake PSCI node in dom0 device tree Julien Grall
2013-09-13 12:49 ` [PATCH v4 16/27] xen/arm: Create a fake cpus " Julien Grall
2013-09-13 12:49 ` [PATCH v4 17/27] xen/arm: Create a fake GIC " Julien Grall
2013-09-13 12:49 ` [PATCH v4 18/27] xen/arm: Create a fake timer " Julien Grall
2013-09-13 12:49 ` [PATCH v4 19/27] xen/arm: Add new platform specific callback device_is_blacklist Julien Grall
2013-09-13 12:49 ` [PATCH v4 20/27] xen/arm: Remove devices used by Xen from dom0 device tree Julien Grall
2013-09-13 12:49 ` [PATCH v4 21/27] xen/arm: vexpress: Blacklist a list of board specific devices Julien Grall
2013-09-13 12:49 ` [PATCH v4 22/27] xen/arm: exynos5: Blacklist MCT device Julien Grall
2013-09-13 12:49 ` [PATCH v4 23/27] xen/dts: Clean up the exported API for device tree Julien Grall
2013-09-13 12:49 ` [PATCH v4 24/27] xen/dts: device_get_reg: cells are 32-bit big endian value Julien Grall
2013-09-13 12:49 ` [PATCH v4 25/27] xen/dts: replace get_val by dt_next_cell Julien Grall
2013-09-13 12:49 ` [PATCH v4 26/27] xen/arm: Check if the device is available before using it Julien Grall
2013-09-13 12:49 ` [PATCH v4 27/27] ARM: parse separate DT properties for different commandlines Julien Grall
2013-09-17 14:43 ` [PATCH v4 00/27] Allow Xen to boot with a raw device tree Ian Campbell
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=1379076574-28316-2-git-send-email-julien.grall@linaro.org \
--to=julien.grall@linaro.org \
--cc=andre.przywara@linaro.org \
--cc=ian.campbell@citrix.com \
--cc=patches@linaro.org \
--cc=stefano.stabellini@eu.citrix.com \
--cc=xen-devel@lists.xen.org \
/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).