From 851140def40c76b72239689884f689cb430af674 Mon Sep 17 00:00:00 2001 From: Mukesh Ojha Date: Fri, 20 Oct 2023 17:15:18 +0530 Subject: [PATCH] ARM: dts: msm: Allow memory from lower 4G for adsp/cdsp/modem For VM bootup the scm device needs to have memory from above 4GB, but for PIL boot the Metadata memory needs to be limited to 32 bit. This is because the authentication software for the metadata in the secure world works with only 32 bit addresses. Add support for only 32 bit addresses for PIL and memory from anywhere for other memory allocation from SCM device. Currently, this is being enabled for ADSP/CDSP/MSS however, this limitation was applicable only for modem and not with ADSP/CDSP but there was some issue observed with above 4G addresses allocated for ADSP/CDSP and it was analyzed that it could be only issue on emulation platform and will not observed on Silicon. So, we could revert this change for ADSP/CDSP if the issue is not observed on Silicon. Change-Id: I398158a76207f4ef43770ed60210d1f155263850 Signed-off-by: Mukesh Ojha --- qcom/pineapple.dtsi | 4 +--- qcom/sun.dtsi | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/qcom/pineapple.dtsi b/qcom/pineapple.dtsi index ee721b6a..40816729 100644 --- a/qcom/pineapple.dtsi +++ b/qcom/pineapple.dtsi @@ -2247,9 +2247,7 @@ <&aggre2_noc MASTER_CRYPTO &mc_virt SLAVE_EBI1>; interconnect-names = "rproc_ddr", "crypto_ddr"; - - memory-region = <&mpss_mem>, <&q6_mpss_dtb_mem>, - <&mpss_dsm_mem>, <&mpss_dsm_mem_2>; + memory-region = <&mpss_mem &q6_mpss_dtb_mem &system_cma &mpss_dsm_mem &mpss_dsm_mem_2>; firmware-name = "modem.mdt", "modem_dtb.mdt"; /* Inputs from mss */ diff --git a/qcom/sun.dtsi b/qcom/sun.dtsi index aac9e96c..87dd2e61 100644 --- a/qcom/sun.dtsi +++ b/qcom/sun.dtsi @@ -1790,7 +1790,7 @@ firmware-name = "adsp.mdt", "adsp_dtb.mdt"; - memory-region = <&adspslpi_mem &q6_adsp_dtb_mem>; + memory-region = <&adspslpi_mem &q6_adsp_dtb_mem &system_cma>; /* Inputs from ssc */ interrupts-extended = <&pdc 6 IRQ_TYPE_EDGE_RISING>, @@ -1873,7 +1873,7 @@ <&aggre2_noc MASTER_CRYPTO &mc_virt SLAVE_EBI1>; interconnect-names = "rproc_ddr", "crypto_ddr"; - memory-region = <&mpss_mem &q6_mpss_dtb_mem &dsm_partition_1_mem &dsm_partition_2_mem>; + memory-region = <&mpss_mem &q6_mpss_dtb_mem &system_cma &dsm_partition_1_mem &dsm_partition_2_mem>; firmware-name = "modem.mdt", "modem_dtb.mdt"; /* Inputs from mss */ @@ -1938,7 +1938,7 @@ reg-names = "cx","mx","nsp"; firmware-name = "cdsp.mdt", "cdsp_dtb.mdt"; - memory-region = <&cdsp_mem &q6_cdsp_dtb_mem &global_sync_mem>; + memory-region = <&cdsp_mem &q6_cdsp_dtb_mem &system_cma &global_sync_mem>; clocks = <&rpmhcc RPMH_CXO_CLK>; clock-names = "xo";