diff options
| author | Sebastian Ene <sebastianene@google.com> | 2023-11-30 14:33:09 +0000 |
|---|---|---|
| committer | Juan Yescas <jyescas@google.com> | 2023-12-15 16:57:58 -0800 |
| commit | 60058080bec6c2d1999e41e3e9b4a452e44f3610 (patch) | |
| tree | f4f87dc64b77b596778955cc4c1bb0909c00f975 | |
| parent | ab40272b9af37f7b2ef6215cb2199f896d2d0058 (diff) | |
| download | gs-main-16k-gs-shusky-5.15.tar.gz | |
arm64/dts: zuma: Update rmem alignment to support 16kB PAGE_SIZEmain-16k-gs-shusky-5.15
Align the reserved memory nodes to a 16Kb boundary and make sure that
the hypervisor initializes successfuly.
Bug: 308663811
Bug: 307805059
Test: Build ABL and flash it to Shiba. Build the GKI kernel with 16Kb
PAGE_SIZE support and make sure that the pKVM hypervisor initializes
successfuly.
Change-Id: Ic3f43f95cbe1ead8d1aa6e378694571d81508232
Signed-off-by: Sebastian Ene <sebastianene@google.com>
| -rw-r--r-- | arch/arm64/boot/dts/google/zuma-rmem.dtsi | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/arch/arm64/boot/dts/google/zuma-rmem.dtsi b/arch/arm64/boot/dts/google/zuma-rmem.dtsi index 9bf1e931e..9b1fa3a86 100644 --- a/arch/arm64/boot/dts/google/zuma-rmem.dtsi +++ b/arch/arm64/boot/dts/google/zuma-rmem.dtsi @@ -14,7 +14,7 @@ bootloader_log { compatible = "google,bldr_log"; - reg = <0x0 0xfd800000 0x80000>, <0x0 0xfd880000 0x80000>; + reg = <0x0 0xfd804000 0x80000>, <0x0 0xfd880000 0x80000>; reg-names = "bl_log", "bl_old_log"; memory-region = <&bldr_log_reserved>; }; @@ -26,16 +26,16 @@ ect_binary: ect_binary { compatible = "exynos,ect_rmem"; - reg = <0x0 0x90000000 0x0003A000>; + reg = <0x0 0x90000000 0x0003C000>; }; gsa_reserved_protected: gsa@0x90200000 { - reg = <0x0 0x90200000 0x3FF000>; + reg = <0x0 0x90200000 0x400000>; no-map; }; - gsa_reserved_log: gsa@0x905FF000 { - reg = <0x0 0x905FF000 0x1000>; + gsa_reserved_log: gsa@0x90600000 { + reg = <0x0 0x90600000 0x4000>; no-map; }; @@ -75,24 +75,24 @@ }; dss_log_reserved: dss_log_reserved@fd3f0000 { - reg = <0 0xfd3f0000 0x0000e000>; + reg = <0 0xfd3f0000 0x00010000>; no-map; }; - debug_kinfo_reserved: debug_kinfo_reserved@fd3fe000 { - reg = <0 0xfd3fe000 0x00001000>; + debug_kinfo_reserved: debug_kinfo_reserved@fd400000 { + reg = <0 0xfd400000 0x00004000>; no-map; }; - ramoops_mem@fd3ff000 { + ramoops_mem@fd404000 { compatible = "ramoops"; - reg = <0 0xfd3ff000 0x400000>; + reg = <0 0xfd404000 0x400000>; console-size = <0x200000>; pmsg-size = <0x200000>; }; - bldr_log_reserved: bldr_log_reserved@fd800000 { - reg = <0 0xfd800000 0x00100000>; + bldr_log_reserved: bldr_log_reserved@fd804000 { + reg = <0 0xfd804000 0x00100000>; no-map; }; @@ -104,7 +104,7 @@ cp_msi_rmem: cp_msi_rmem { compatible = "exynos,modem_if"; - reg = <0x0 0xF6200000 0x00001000>; + reg = <0x0 0xF6200000 0x00004000>; rmem_index = <1>; }; @@ -116,7 +116,7 @@ cp_aoc_rmem: cp_aoc_rmem { compatible = "exynos,modem_if"; - reg = <0x0 0x197FD000 0x00003000>; + reg = <0x0 0x19800000 0x00004000>; rmem_index = <3>; }; |