From 7f1d897ec3b8895b52e1efc53eed4a02d9e73f8d Mon Sep 17 00:00:00 2001 From: Zhen Kong Date: Mon, 4 Nov 2019 14:15:22 -0800 Subject: [PATCH] ARM: dts: msm: Add qseecom node for Lahaina Add qseecom device-tree node to provide secure communication from HLOS to TZ on Lahaina platform. Change-Id: Ic7f8db5f265c08f97025939ac2b9a20b5dc2f463 --- qcom/lahaina-ion.dtsi | 19 +++++++++++++++++++ qcom/lahaina.dtsi | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/qcom/lahaina-ion.dtsi b/qcom/lahaina-ion.dtsi index f6d3150bfb98..906edf354268 100644 --- a/qcom/lahaina-ion.dtsi +++ b/qcom/lahaina-ion.dtsi @@ -36,5 +36,24 @@ memory-region = <&sp_mem>; qcom,ion-heap-type = "HYP_CMA"; }; + + qcom,ion-heap@26 { /* USER CONTIG HEAP */ + reg = ; + memory-region = <&user_contig_mem>; + qcom,ion-heap-type = "DMA"; + }; + + qcom,ion-heap@27 { /* QSEECOM HEAP */ + reg = ; + memory-region = <&qseecom_mem>; + qcom,ion-heap-type = "DMA"; + }; + + qcom,ion-heap@19 { /* QSEECOM TA HEAP */ + reg = ; + memory-region = <&qseecom_ta_mem>; + qcom,ion-heap-type = "DMA"; + }; + }; }; diff --git a/qcom/lahaina.dtsi b/qcom/lahaina.dtsi index b6f9dda30395..06f92847ef25 100644 --- a/qcom/lahaina.dtsi +++ b/qcom/lahaina.dtsi @@ -392,6 +392,30 @@ reg = <0x0 0x9b200000 0x0 0x4600000>; }; + user_contig_mem: user_contig_region { + compatible = "shared-dma-pool"; + alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>; + reusable; + alignment = <0x0 0x400000>; + size = <0x0 0x1000000>; + }; + + 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 0x1000000>; + }; + /* global autoconfigured region for contiguous allocations */ linux,cma { compatible = "shared-dma-pool"; @@ -2629,6 +2653,21 @@ hyplog-size-offset = <0x414>; }; + qcom_qseecom: qseecom@c1700000 { + compatible = "qcom,qseecom"; + memory-region = <&qseecom_mem>; + qcom,hlos-num-ce-hw-instances = <1>; + qcom,hlos-ce-hw-instance = <0>; + qcom,qsee-ce-hw-instance = <0>; + qcom,disk-encrypt-pipe-pair = <2>; + qcom,support-fde; + qcom,no-clock-support; + qcom,fde-key-size; + qcom,appsbl-qseecom-support; + qcom,commonlib64-loaded-by-uefi; + qcom,qsee-reentrancy-support = <2>; + }; + qcom,spcom { compatible = "qcom,spcom";