ARM: dts: msm: Enable securemsm related nodes for kera

Added qseecom, tz-log, qrng, qcedev,qtee_shmbridge,qcom_smcinvoke
securemsm nodes for kera.
Added mem-object node for si-core xts enablement.

Change-Id: I3f463a9eb63cbf9a2218e5859b4c077e49722ac3
Signed-off-by: Ravi Kumar Bokka <quic_c_rbokka@quicinc.com>
This commit is contained in:
Ravi Kumar Bokka
2024-10-15 04:04:22 +05:30
committed by Ravi Kuamr Bokka
parent 8b1c694a87
commit 92398e011c
5 changed files with 136 additions and 3 deletions

View File

@@ -15,5 +15,17 @@
qcom,dma-heap-type = <HEAP_TYPE_CMA>; qcom,dma-heap-type = <HEAP_TYPE_CMA>;
memory-region = <&cdsp_secure_heap_cma>; memory-region = <&cdsp_secure_heap_cma>;
}; };
qcom,qseecom {
qcom,dma-heap-name = "qcom,qseecom";
qcom,dma-heap-type = <HEAP_TYPE_CMA>;
memory-region = <&qseecom_mem>;
};
qcom,qseecom_ta {
qcom,dma-heap-name = "qcom,qseecom-ta";
qcom,dma-heap-type = <HEAP_TYPE_CMA>;
memory-region = <&qseecom_ta_mem>;
};
}; };
}; };

View File

@@ -239,6 +239,10 @@
compatible = "qcom,smcinvoke"; compatible = "qcom,smcinvoke";
}; };
qcom_mem_object {
compatible = "qcom,mem-object";
};
qtee_shmbridge { qtee_shmbridge {
compatible = "qcom,tee-shared-memory-bridge"; compatible = "qcom,tee-shared-memory-bridge";
qcom,custom-bridge-size = <512>; qcom,custom-bridge-size = <512>;

View File

@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-3-Clause // SPDX-License-Identifier: BSD-3-Clause
/* /*
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved.
*/ */
#include <dt-bindings/arm/msm/qcom_dma_heap_dt_constants.h> #include <dt-bindings/arm/msm/qcom_dma_heap_dt_constants.h>
@@ -20,6 +20,23 @@
qcom,dma-heap-type = <HEAP_TYPE_TVM_CARVEOUT>; qcom,dma-heap-type = <HEAP_TYPE_TVM_CARVEOUT>;
qcom,dynamic-heap; qcom,dynamic-heap;
}; };
qcom,ms1 {
qcom,dma-heap-name = "qcom,ms1";
qcom,dma-heap-type = <HEAP_TYPE_TVM_CARVEOUT>;
qcom,dynamic-heap;
};
qcom,ms2 {
qcom,dma-heap-name = "qcom,ms2";
qcom,dma-heap-type = <HEAP_TYPE_TVM_CARVEOUT>;
qcom,dynamic-heap;
};
qcom,ms3 {
qcom,dma-heap-name = "qcom,ms3";
qcom,dma-heap-type = <HEAP_TYPE_TVM_CARVEOUT>;
qcom,dynamic-heap;
};
}; };
}; };

View File

@@ -256,6 +256,10 @@
compatible = "qcom,smcinvoke"; compatible = "qcom,smcinvoke";
}; };
qcom_mem_object {
compatible = "qcom,mem-object";
};
qtee_shmbridge { qtee_shmbridge {
compatible = "qcom,tee-shared-memory-bridge"; compatible = "qcom,tee-shared-memory-bridge";
qcom,custom-bridge-size = <64>; qcom,custom-bridge-size = <64>;

View File

@@ -375,11 +375,20 @@
qtee_shmbridge { qtee_shmbridge {
compatible = "qcom,tee-shared-memory-bridge"; compatible = "qcom,tee-shared-memory-bridge";
}; };
qcom_smcinvoke {
compatible = "qcom,smcinvoke";
};
qcom_mem_object {
compatible = "qcom,mem-object";
};
}; };
#include "kera-reserved-memory.dtsi" #include "kera-reserved-memory.dtsi"
#include "msm-arm-smmu-kera.dtsi" #include "msm-arm-smmu-kera.dtsi"
#include "kera-dma-heaps.dtsi" #include "kera-dma-heaps.dtsi"
#include "kera-vm-dma-heaps.dtsi"
&reserved_memory { &reserved_memory {
#address-cells = <2>; #address-cells = <2>;
@@ -483,6 +492,11 @@
interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;
}; };
qcom,hdcp {
compatible = "qcom,hdcp";
qcom,use-smcinvoke = <1>;
};
arch_timer: timer { arch_timer: timer {
compatible = "arm,armv8-timer"; compatible = "arm,armv8-timer";
interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>, interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>,
@@ -908,7 +922,65 @@
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <2>;
wakeup-parent = <&pdc>; wakeup-parent = <&pdc>;
qcom,gpios-reserved = <20 21 22 23 100 111 112 116>; qcom,gpios-reserved = <20 21 22 23 100 111 112 116 118>;
};
qcom_tzlog: tz-log@14680720 {
compatible = "qcom,tz-log";
reg = <0x14680720 0x3000>;
qcom,hyplog-enabled;
hyplog-address-offset = <0x410>;
hyplog-size-offset = <0x414>;
tmecrashdump-address-offset = <0x81CA0000>;
};
qcom_cedev: qcedev@1de0000 {
compatible = "qcom,qcedev";
reg = <0x1de0000 0x20000>,
<0x1dc4000 0x28000>;
reg-names = "crypto-base","crypto-bam-base";
interrupts = <GIC_SPI 272 IRQ_TYPE_LEVEL_HIGH>;
qcom,bam-pipe-pair = <2>;
qcom,offload-ops-support;
qcom,bam-pipe-offload-cpb-hlos = <1>;
qcom,bam-pipe-offload-hlos-cpb = <3>;
qcom,bam-pipe-offload-hlos-cpb-1 = <8>;
qcom,bam-pipe-offload-hlos-hlos = <4>;
qcom,bam-pipe-offload-hlos-hlos-1 = <9>;
qcom,ce-hw-instance = <0>;
qcom,ce-device = <0>;
qcom,ce-hw-shared;
qcom,bam-ee = <0>;
qcom,smmu-s1-enable;
qcom,no-clock-support;
qcom,no-clk-gating;
interconnect-names = "data_path";
interconnects = <&aggre2_noc MASTER_CRYPTO &mc_virt SLAVE_EBI1>;
iommus = <&apps_smmu 0x0480 0x0>,
<&apps_smmu 0x0481 0x0>;
qcom,iommu-dma = "atomic";
dma-coherent;
qcom_cedev_ns_cb {
compatible = "qcom,qcedev,context-bank";
label = "ns_context";
iommus = <&apps_smmu 0x0481 0x0>;
dma-coherent;
};
qcom_cedev_s_cb {
compatible = "qcom,qcedev,context-bank";
label = "secure_context";
iommus = <&apps_smmu 0x0483 0x0>;
qcom,iommu-vmid = <0x9>;
qcom,secure-context-bank;
dma-noncoherent;
};
};
rng: rng@10c3000 {
compatible = "qcom,trng";
reg = <0x10c3000 0x1000>;
}; };
slimbam: bamdma@6c04000 { slimbam: bamdma@6c04000 {
@@ -2764,6 +2836,30 @@
alignment = <0x0 0x400000>; alignment = <0x0 0x400000>;
size = <0x0 0x4800000>; size = <0x0 0x4800000>;
}; };
non_secure_display_memory: non_secure_display_region {
compatible = "shared-dma-pool";
reusable;
alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;
size = <0x0 0xc800000>;
alignment = <0x0 0x400000>;
};
qseecom_mem: qseecom_region {
compatible = "shared-dma-pool";
alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;
reusable;
alignment = <0x0 0x400000>;
size = <0x0 0x1400000>;
};
qseecom_ta_mem: qseecom_ta_region {
compatible = "shared-dma-pool";
alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;
reusable;
alignment = <0x0 0x400000>;
size = <0x0 0x1400000>;
};
}; };
#include "kera-debug.dtsi" #include "kera-debug.dtsi"