From c9ddf163573f2ac98975474b3881049c2f9a3170 Mon Sep 17 00:00:00 2001 From: Patrick Daly Date: Fri, 1 Dec 2023 11:53:34 -0800 Subject: [PATCH 1/2] ARM: dts: msm: Automatically online memory to movable zone After hotplugging in memory, automatically online it to the movable zone. Change-Id: I1dde15451e78196fc261c0bd9b25cdfa91749c4c Signed-off-by: Patrick Daly --- qcom/pineapple-vm.dtsi | 2 +- qcom/sun-vm.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qcom/pineapple-vm.dtsi b/qcom/pineapple-vm.dtsi index 4d50b094..e135fdf0 100644 --- a/qcom/pineapple-vm.dtsi +++ b/qcom/pineapple-vm.dtsi @@ -12,7 +12,7 @@ interrupt-parent = <&vgic>; chosen { - bootargs = "nokaslr log_buf_len=256K console=hvc0 loglevel=8 swiotlb=noforce"; + bootargs = "nokaslr log_buf_len=256K console=hvc0 loglevel=8 swiotlb=noforce memhp_default_state=online_movable"; }; cpus { diff --git a/qcom/sun-vm.dtsi b/qcom/sun-vm.dtsi index 73ad388a..b81bcebe 100644 --- a/qcom/sun-vm.dtsi +++ b/qcom/sun-vm.dtsi @@ -13,7 +13,7 @@ interrupt-parent = <&vgic>; chosen { - bootargs = "nokaslr log_buf_len=256K console=hvc0 loglevel=8 swiotlb=noforce"; + bootargs = "nokaslr log_buf_len=256K console=hvc0 loglevel=8 swiotlb=noforce memhp_default_state=online_movable"; }; cpus { From cd0ea5f2f6fc66a67daf4d32d872577f9628098f Mon Sep 17 00:00:00 2001 From: Patrick Daly Date: Tue, 28 Nov 2023 11:31:38 -0800 Subject: [PATCH 2/2] ARM: dts: msm: Define qcom,display heap for sun The qcom,display heap is used for camera usecases. Change-Id: Ib937670c33284fb2dc624258fd8e5978b4405ace Signed-off-by: Vijay Kumar Tumati Signed-off-by: Patrick Daly --- qcom/sun-dma-heaps.dtsi | 8 ++++++++ qcom/sun.dtsi | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/qcom/sun-dma-heaps.dtsi b/qcom/sun-dma-heaps.dtsi index f468d650..f0def0d5 100644 --- a/qcom/sun-dma-heaps.dtsi +++ b/qcom/sun-dma-heaps.dtsi @@ -8,6 +8,14 @@ &soc { qcom,dma-heaps { compatible = "qcom,dma-heaps"; + + qcom,display { + qcom,dma-heap-name = "qcom,display"; + qcom,dma-heap-type = ; + qcom,max-align = <9>; + memory-region = <&non_secure_display_memory>; + }; + qcom,qseecom { qcom,dma-heap-name = "qcom,qseecom"; qcom,dma-heap-type = ; diff --git a/qcom/sun.dtsi b/qcom/sun.dtsi index e61a5455..7c2074b0 100644 --- a/qcom/sun.dtsi +++ b/qcom/sun.dtsi @@ -3384,6 +3384,14 @@ size = <0x0 0xC00000>; }; + non_secure_display_memory: non_secure_display_region { + compatible = "shared-dma-pool"; + reusable; + alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>; + size = <0x0 0xa400000>; + alignment = <0x0 0x400000>; + }; + kinfo_mem: debug_kinfo_region { alloc-ranges = <0x0 0x00000000 0xffffffff 0xffffffff>; size = <0x0 0x1000>;