From dd956b9d8daaf997534ee3ebf30796552565f08d Mon Sep 17 00:00:00 2001 From: Murali Nalajala Date: Fri, 19 Jun 2020 12:38:45 -0700 Subject: [PATCH 1/2] Revert "ARM: dts: msm: Add RM(Resource Manager) device for the trusted VM" This reverts commit a00d39d0a8781aee74c7e15d84d11be62842c6c3. Hypervisor node is now dynamically added by hypervisor and do not need to maintain in the device tree. Change-Id: I77cded8e446cd1ff3bc834217ee7b692b8740595 --- qcom/trustedvm.dtsi | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/qcom/trustedvm.dtsi b/qcom/trustedvm.dtsi index 1cac80ef646c..1981b77e768c 100644 --- a/qcom/trustedvm.dtsi +++ b/qcom/trustedvm.dtsi @@ -196,34 +196,6 @@ }; }; - /* Temporary node until RM dynamic overlay support present */ - hypervisor { - #address-cells = <2>; - #size-cells = <0>; - compatible = "qcom,haven-hypervisor-1.0", "qcom,haven-hypervisor", "simple-bus"; - name = "hypervisor"; - - qcom,haven-vm { - compatible = "qcom,haven-vm-id-1.0", "qcom,haven-vm-id"; - qcom,vendor = "Qualcomm Technologies, Inc."; - qcom,vmid = <45>; - qcom,owner-vmid = <3>; - }; - - qcom,resource-manager-rpc@0000000000000001 { - compatible = "qcom,resource-manager-1-0", "qcom,resource-manager", "qcom,haven-message-queue", "qcom,haven-capability"; - interrupts = , /* TX full IRQ */ - ; /* RX empty IRQ */ - reg = <0x00000000 0x00000000>, <0x00000000 0x00000001>; /* TX, RX cap ids */ - qcom,is-full-duplex; - qcom,free-irq-start = <0>; - qcom,tx-queue-depth = <8>; - qcom,tx-message-size = <0xf0>; - qcom,rx-queue-depth = <8>; - qcom,rx-message-size = <0xf0>; - }; - }; - firmware: firmware { scm { compatible = "qcom,scm"; From 21aa09087d85b5894983a6d3dbcd2799445b3352 Mon Sep 17 00:00:00 2001 From: Murali Nalajala Date: Fri, 19 Jun 2020 12:55:49 -0700 Subject: [PATCH 2/2] ARM: dts: msm: remove memory node Remove memory node from SVM device tree. This node is now dynamically added by hypervisor as part of SVM booting. Change-Id: I304687bec18acae45bf518a4ef260132678ce9c8 --- qcom/trustedvm.dtsi | 5 ----- 1 file changed, 5 deletions(-) diff --git a/qcom/trustedvm.dtsi b/qcom/trustedvm.dtsi index 1981b77e768c..60701b9e759a 100644 --- a/qcom/trustedvm.dtsi +++ b/qcom/trustedvm.dtsi @@ -5,11 +5,6 @@ #size-cells = <0x2>; interrupt-parent = <&vgic>; - memory@28800000 { - device_type = "memory"; - reg = <0x0 0x28800000 0x0 0x76f7000>; /* Temp S2 mapping */ - }; - qcom-mem-buf { compatible = "qcom,mem-buf"; qcom,mem-buf-capabilities = "consumer";