diff --git a/qcom/kalama-dma-heaps.dtsi b/qcom/kalama-dma-heaps.dtsi index 4e7bd47e..ebd8c091 100644 --- a/qcom/kalama-dma-heaps.dtsi +++ b/qcom/kalama-dma-heaps.dtsi @@ -33,7 +33,7 @@ qcom,secure_cdsp { qcom,dma-heap-name = "qcom,secure-cdsp"; qcom,dma-heap-type = ; - memory-region = <&cdsp_secure_heap>; + memory-region = <&cdsp_secure_heap_mem>; qcom,token = <0x20000000>; }; diff --git a/qcom/kalama-oemvm.dtsi b/qcom/kalama-oemvm.dtsi index 019104a6..166e499b 100644 --- a/qcom/kalama-oemvm.dtsi +++ b/qcom/kalama-oemvm.dtsi @@ -81,7 +81,7 @@ #address-cells = <0x2>; #size-cells = <0x0>; base-address = <0x0 0xf8200000>; - size-min = <0x0 0x4efc000>; /* 78 MB */ + size-min = <0x0 0x4afc000>; /* 74 MB */ }; segments { diff --git a/qcom/kalama-vm.dtsi b/qcom/kalama-vm.dtsi index 3052f103..a1b1c155 100644 --- a/qcom/kalama-vm.dtsi +++ b/qcom/kalama-vm.dtsi @@ -104,8 +104,8 @@ memory { #address-cells = <0x2>; #size-cells = <0x0>; - base-address = <0x0 0xf3c00000>; - size-min = <0x0 0x41ee000>; /* 65 MB - 4 KB */ + base-address = <0x0 0xf3600000 >; + size-min = <0x0 0x49ee000>; /* 73 MB */ }; segments { diff --git a/qcom/kalama.dtsi b/qcom/kalama.dtsi index 270617d5..b1c3616d 100644 --- a/qcom/kalama.dtsi +++ b/qcom/kalama.dtsi @@ -344,7 +344,7 @@ reg = <0x0 0x80e00000 0x0 0x3d0000>; }; - hyp_dare_mem: hyp_dare_region@811d0000 { + hyp_tags_reserved_mem: hyp_tags_reserved_region@811d0000 { no-map; reg = <0x0 0x811d0000 0x0 0x30000>; }; @@ -389,86 +389,86 @@ reg = <0x0 0x82700000 0x0 0x100000>; }; - cdsp_secure_heap: cdsp_secure_heap_region@82800000 { + cdsp_secure_heap_mem: cdsp_secure_heap_region@82800000 { no-map; reg = <0x0 0x82800000 0x0 0x4600000>; }; - video_mem: video_region@87300000 { + mpss_mem: mpss_region@89800000 { no-map; - reg = <0x0 0x87300000 0x0 0x700000>; + reg = <0x0 0x89800000 0x0 0x11800000>; }; - adsp_slpi_mem: adsp_slpi_region@87a00000 { + q6_mpss_dtb_mem: q6_mpss_dtb_region@9b000000 { no-map; - reg = <0x0 0x87a00000 0x0 0x3a00000>; + reg = <0x0 0x9b000000 0x0 0x80000>; }; - q6_adsp_dtb_mem: q6_adsp_dtb_region@8b400000 { + ipa_fw_mem: ipa_fw_region@9b080000 { no-map; - reg = <0x0 0x8b400000 0x0 0x80000>; + reg = <0x0 0x9b080000 0x0 0x10000>; }; - q6_cdsp_dtb_mem: q6_cdsp_dtb_region@8b480000 { + ipa_gsi_mem: ipa_gsi_region@9b090000 { no-map; - reg = <0x0 0x8b480000 0x0 0x80000>; + reg = <0x0 0x9b090000 0x0 0xa000>; }; - cdsp_mem: cdsp_region@8b500000 { + gpu_micro_code_mem: gpu_micro_code_region@9b09a000 { no-map; - reg = <0x0 0x8b500000 0x0 0x2000000>; + reg = <0x0 0x9b09a000 0x0 0x2000>; }; - ipa_fw_mem: ipa_fw_region@8d500000 { + spss_region_mem: spss_region_region@9b100000 { no-map; - reg = <0x0 0x8d500000 0x0 0x10000>; - }; - - ipa_gsi_mem: ipa_gsi_region@8d510000 { - no-map; - reg = <0x0 0x8d510000 0x0 0xa000>; - }; - - gpu_micro_code_mem: gpu_micro_code_region@8d51a000 { - no-map; - reg = <0x0 0x8d51a000 0x0 0x2000>; - }; - - spss_region_mem: spss_region_region@8d600000 { - no-map; - reg = <0x0 0x8d600000 0x0 0x180000>; + reg = <0x0 0x9b100000 0x0 0x180000>; }; /* First part of the "SPU secure shared memory" region */ - spu_tz_shared_mem: spu_tz_shared_mem@8d780000 { + spu_tz_shared_mem: spu_tz_shared_mem@9b280000 { no-map; - reg = <0x0 0x8d780000 0x0 0x60000>; + reg = <0x0 0x9b280000 0x0 0x60000>; }; /* Second part of the "SPU secure shared memory" region */ - spu_modem_shared_mem: spu_modem_shared_mem@8d7e0000 { + spu_modem_shared_mem: spu_modem_shared_mem@9b2e0000 { no-map; - reg = <0x0 0x8d7e0000 0x0 0x20000>; + reg = <0x0 0x9b2e0000 0x0 0x20000>; }; - mpss_mem: mpss_region@8d800000 { + camera_mem: camera_region@9b300000 { no-map; - reg = <0x0 0x8d800000 0x0 0x13c00000>; + reg = <0x0 0x9b300000 0x0 0x800000>; }; - q6_mpss_dtb_mem: q6_mpss_dtb_region@a1400000 { + video_mem: video_region@9bb00000 { no-map; - reg = <0x0 0xa1400000 0x0 0x80000>; + reg = <0x0 0x9bb00000 0x0 0x700000>; }; - cvp_mem: cvp_region@a1500000 { + cvp_mem: cvp_region@9c200000 { no-map; - reg = <0x0 0xa1500000 0x0 0x700000>; + reg = <0x0 0x9c200000 0x0 0x700000>; }; - camera_mem: camera_region@a1c00000 { + cdsp_mem: cdsp_region@9c900000 { no-map; - reg = <0x0 0xa1c00000 0x0 0x800000>; + reg = <0x0 0x9c900000 0x0 0x2000000>; + }; + + q6_cdsp_dtb_mem: q6_cdsp_dtb_region@9e900000 { + no-map; + reg = <0x0 0x9e900000 0x0 0x80000>; + }; + + q6_adsp_dtb_mem: q6_adsp_dtb_region@9e980000 { + no-map; + reg = <0x0 0x9e980000 0x0 0x80000>; + }; + + adspslpi_mem: adspslpi_region@9ea00000 { + no-map; + reg = <0x0 0x9ea00000 0x0 0x4080000>; }; /* uefi region can be reused by apps */ @@ -480,7 +480,7 @@ reg = <0x0 0xd4d00000 0x0 0x3300000>; }; - cpucp_fw_mem: cpucp_fw_region@d8000000 { + tz_reserved_mem: tz_reserved_region@d8000000 { no-map; reg = <0x0 0xd8000000 0x0 0x100000>; }; @@ -490,7 +490,7 @@ reg = <0x0 0xd8100000 0x0 0x40000>; }; - tz_reserved_mem: tz_reserved_region@d8140000 { + cpucp_fw_mem: cpucp_fw_region@d8140000 { no-map; reg = <0x0 0xd8140000 0x0 0x1c0000>; }; @@ -500,14 +500,14 @@ reg = <0x0 0xd8300000 0x0 0x500000>; }; - trusted_apps_mem: trusted_apps_region@d8800000 { + ta_mem: ta_region@d8800000 { no-map; reg = <0x0 0xd8800000 0x0 0x8a00000>; }; tz_tags_mem: tz_tags_region@e1200000 { no-map; - reg = <0x0 0xe1200000 0x0 0x2710000>; + reg = <0x0 0xe1200000 0x0 0x2740000>; }; hwfence_shbuf: hwfence-shmem { @@ -515,59 +515,64 @@ reg = <0x0 0xe6440000 0x0 0x279000>; }; - trust_ui_vm_mem: trust_ui_vm_region@f3c00000 { + trust_ui_vm_mem: trust_ui_vm_region@f3600000 { no-map; - reg = <0x0 0xf3c00000 0x0 0x41ee000>; + reg = <0x0 0xf3600000 0x0 0x49ee000>; }; - trust_ui_vm_dump: trust_ui_vm_dump@f7dee000 { + trust_ui_vm_dump: trust_ui_vm_dump@f7fee000 { no-map; - reg = <0x0 0xf7dee000 0x0 0x1000>; + reg = <0x0 0xf7fee000 0x0 0x1000>; }; - trust_ui_vm_qrtr: trust_ui_vm_qrtr@f7def000 { + trust_ui_vm_qrtr: trust_ui_vm_qrtr@f7fef000 { no-map; - reg = <0x0 0xf7def000 0x0 0x9000>; + reg = <0x0 0xf7fef000 0x0 0x9000>; }; - trust_ui_vm_vblk0_ring: trust_ui_vm_vblk0_ring@f7df8000 { + trust_ui_vm_vblk0_ring: trust_ui_vm_vblk0_ring@f7ff8000 { no-map; - reg = <0x0 0xf7df8000 0x0 0x4000>; + reg = <0x0 0xf7ff8000 0x0 0x4000>; gunyah-label = <0x11>; //for persist.img }; - trust_ui_vm_vblk1_ring: trust_ui_vm_vblk1_ring@f7dfc000 { + trust_ui_vm_vblk1_ring: trust_ui_vm_vblk1_ring@f7ffc000 { no-map; - reg = <0x0 0xf7dfc000 0x0 0x4000>; + reg = <0x0 0xf7ffc000 0x0 0x4000>; gunyah-label = <0x10>; //for system.img }; - trust_ui_vm_swiotlb: trust_ui_vm_swiotlb@f7e00000 { + trust_ui_vm_swiotlb: trust_ui_vm_swiotlb@f8000000 { no-map; - reg = <0x0 0xf7e00000 0x0 0x200000>; + reg = <0x0 0xf8000000 0x0 0x200000>; gunyah-label = <0x12>; }; - oem_vm_mem: oem_vm_region@f8000000 { + oem_vm_mem: oem_vm_region@f8200000 { no-map; - reg = <0x0 0xf8000000 0x0 0x4efc000>; + reg = <0x0 0xf8200000 0x0 0x4afc000>; }; - oem_vm_vblk0_ring: oem_vm_vblk0_ring@fcefc000 { + oem_vm_vblk0_ring: oem_vm_vblk0_ring@fccfc000 { no-map; - reg = <0x0 0xfcefc000 0x0 0x4000>; + reg = <0x0 0xfccfc000 0x0 0x4000>; gunyah-label = <0x13>; }; - oem_vm_swiotlb: oem_vm_swiotlb@fcf00000 { + oem_vm_swiotlb: oem_vm_swiotlb@fcd00000 { no-map; - reg = <0x0 0xfcf00000 0x0 0x100000>; + reg = <0x0 0xfcd00000 0x0 0x100000>; gunyah-label = <0x14>; }; - hyp_ext_tags_mem: hyp_ext_tags_region@fd000000 { + hyp_ext_tags_mem: hyp_ext_tags_region@fce00000 { no-map; - reg = <0x0 0xfd000000 0x0 0x2800000>; + reg = <0x0 0xfce00000 0x0 0x2900000>; + }; + + hyp_ext_reserved_mem: hyp_ext_reserved_region@ff700000 { + no-map; + reg = <0x0 0xff700000 0x0 0x100000>; }; llcc_lpi_mem: llcc_lpi_region@ff800000 { @@ -2844,7 +2849,7 @@ <&aggre2_noc MASTER_CRYPTO &mc_virt SLAVE_EBI1>; interconnect-names = "rproc_ddr", "crypto_ddr"; - memory-region = <&adsp_slpi_mem &q6_adsp_dtb_mem>; + memory-region = <&adspslpi_mem &q6_adsp_dtb_mem>; /* Inputs from ssc */ interrupts-extended = <&pdc 6 IRQ_TYPE_EDGE_RISING>, @@ -3098,14 +3103,14 @@ &tlmm 57 0 &tlmm 58 0 &tlmm 59 0 &tlmm 13 0 &tlmm 48 0>; }; - trust_ui_vm: qcom,trust_ui_vm@f7df8000 { - reg = <0xf7df8000 0x208000>; + trust_ui_vm: qcom,trust_ui_vm@f7ff8000 { + reg = <0xf7ff8000 0x208000>; vm_name = "trustedvm"; shared-buffers = <&trust_ui_vm_vblk0_ring &trust_ui_vm_vblk1_ring &trust_ui_vm_swiotlb>; }; - oem_vm: qcom,oem_vm@fcefc000 { - reg = <0xfcefc000 0x104000>; + oem_vm: qcom,oem_vm@fccfc000 { + reg = <0xfccfc000 0x104000>; vm_name = "oemvm"; shared-buffers = <&oem_vm_vblk0_ring &oem_vm_swiotlb>; };