diff options
| author | Geoff Levand <geoff@infradead.org> | 2016-07-18 17:32:55 -0700 |
|---|---|---|
| committer | Geoff Levand <geoff@infradead.org> | 2016-12-02 10:08:48 -0800 |
| commit | 9f704c1b4c45d08a8dbe53fe5d348fb26381c9c8 (patch) | |
| tree | 0f22f00aea4c487e3dc325180f9210ebc9f871a0 | |
| parent | fdaf49203ac63824e0b4e0eaf06a2eab11ba91c1 (diff) | |
| download | linux-kexec-9f704c1b4c45d08a8dbe53fe5d348fb26381c9c8.tar.gz | |
arm64: Convert dts to use reserved-memory nodes
Device tree regions described by /memreserve/ entries are not available in
/proc/device-tree, and hence are not available to user space utilities that use
/proc/device-tree. In order for these regions to be available, convert any
arm64 DTS files using /memreserve/ entries to use reserved-memory nodes.
This change is required for kexec re-boot to work properly when a user does not
specify a second stage DTB via the kexec --dtb option. When the --dtb option is
not specified kexec will prepare the second stage DTB using data from
/proc/device-tree.
Signed-off-by: Geoff Levand <geoff@infradead.org>
| -rw-r--r-- | arch/arm64/boot/dts/arm/foundation-v8.dtsi | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/arch/arm64/boot/dts/arm/foundation-v8.dtsi b/arch/arm64/boot/dts/arm/foundation-v8.dtsi index 7cfa8e414e7f5..1d6987ad9345e 100644 --- a/arch/arm64/boot/dts/arm/foundation-v8.dtsi +++ b/arch/arm64/boot/dts/arm/foundation-v8.dtsi @@ -6,8 +6,6 @@ /dts-v1/; -/memreserve/ 0x80000000 0x00010000; - / { model = "Foundation-v8A"; compatible = "arm,foundation-aarch64", "arm,vexpress"; @@ -72,6 +70,16 @@ <0x00000008 0x80000000 0 0x80000000>; }; + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + firmware-memory@0x80000000 { + reg = <0x0 0x80000000 0x0 0x00010000>; + }; + }; + timer { compatible = "arm,armv8-timer"; interrupts = <1 13 0xf08>, |