diff --git a/qcom/kera-oemvm.dtsi b/qcom/kera-oemvm.dtsi index 9ea8520a..a3ed2097 100644 --- a/qcom/kera-oemvm.dtsi +++ b/qcom/kera-oemvm.dtsi @@ -171,6 +171,38 @@ peer-default; qcom,label = <0x000000C>; }; + test-dbl-oemvm { + vdevice-type = "doorbell"; + generate = "/hypervisor/test-dbl-oemvm"; + qcom,label = <0x5>; + peer-default; + }; + + test-dbl-oemvm-source { + vdevice-type = "doorbell-source"; + generate = "/hypervisor/test-dbl-oemvm-source"; + qcom,label = <0x5>; + peer-default; + }; + + test-msgq-oemvm { + vdevice-type = "message-queue-pair"; + generate = "/hypervisor/test-msgq-oemvm-pair"; + message-size = <0xf0>; + queue-depth = <0x8>; + qcom,label = <0x5>; + peer-default; + }; + + test-large-dmabuf-oemvm { + vdevice-type = "message-queue-pair"; + generate = "/hypervisor/test-large-dmabuf-oemvm-pair"; + message-size = <0xf0>; + queue-depth = <0x8>; + qcom,label = <0xe>; + peer-default; + }; + }; }; @@ -235,6 +267,31 @@ qcom,block-size = <0x400000>; }; + qcom,test-dbl-oemvm { + compatible = "qcom,gh-dbl"; + qcom,label = <0x5>; + }; + + qcom,test-msgq-oemvm { + compatible = "qcom,gh-msgq-test"; + gunyah-label = <0x5>; + affinity = <0>; + }; + + qcom,test-large-dmabuf-oemvm { + compatible = "qcom,gh-large-dmabuf-test"; + gunyah-label = <0xe>; + }; + + qcom,gh-qtimer@1742b000 { + compatible = "qcom,gh-qtmr"; + reg = <0x1742b000 0x1000>; + reg-names = "qtmr-base"; + interrupts = ; + interrupt-names = "qcom,qtmr-intr"; + qcom,secondary; + }; + qcom_smcinvoke { compatible = "qcom,smcinvoke"; }; diff --git a/qcom/kera-vm.dtsi b/qcom/kera-vm.dtsi index f4363606..c2b00d11 100644 --- a/qcom/kera-vm.dtsi +++ b/qcom/kera-vm.dtsi @@ -53,6 +53,29 @@ }; }; + dmesg-dump { + compatible = "qcom,dmesg-dump"; + gunyah-label = <7>; + ddump-pubkey-size = <270>; + ddump-pubkey = /bits/ 8 <0x30 0x82 0x01 0x0a 0x02 0x82 0x01 0x01 0x00 0xe6 0x4b 0x31 0x82 0x61 0x14 0xf2 + 0xbe 0xd1 0xe4 0xde 0xe7 0xed 0xba 0x8f 0x3b 0x23 0x5f 0x7a 0xb8 0x16 0x40 0x96 + 0xae 0x77 0x5e 0x1b 0xf0 0x3f 0x39 0xab 0x69 0x90 0xb1 0xd4 0x70 0xcb 0x66 0xbc + 0x41 0x08 0x1d 0x37 0xdb 0x49 0xc8 0x49 0x5b 0x99 0x5c 0x32 0xbe 0x62 0xd5 0xa7 + 0x3c 0x0f 0xa4 0x4b 0x43 0x49 0xdb 0x54 0x69 0x06 0x0c 0xe5 0x99 0xe5 0xf9 0x1e + 0x25 0x84 0x17 0x47 0x62 0x2b 0x5d 0x0d 0xec 0x5e 0xc6 0xb5 0x86 0xb9 0x75 0x6d + 0xfe 0x7d 0x35 0x4f 0x35 0xc1 0x48 0x10 0x75 0x4c 0x57 0x6b 0x46 0x4b 0xff 0x5b + 0x52 0x22 0x40 0x2c 0xb0 0x47 0xe1 0x47 0xc4 0xe5 0x47 0x0c 0x56 0xe8 0x17 0xd0 + 0x7e 0xc3 0x4d 0x9f 0xea 0xd0 0xea 0x87 0xe5 0x51 0x39 0xe8 0x45 0x4c 0x54 0x27 + 0x9c 0x50 0x38 0xb7 0x72 0x93 0x12 0x0b 0xa1 0x2f 0x9e 0x04 0x92 0x20 0x6e 0x31 + 0x42 0x87 0xe1 0xfe 0x88 0x3f 0xe5 0x09 0xe1 0xf9 0xbe 0x44 0xc6 0xbf 0x10 0x79 + 0x36 0x47 0x7b 0xa0 0x8e 0x27 0x31 0xa3 0x70 0x69 0x01 0x54 0x92 0xf4 0x42 0xbd + 0xcd 0x7e 0x79 0x2b 0x2c 0xe1 0xd4 0xba 0x6e 0x34 0xc6 0xe6 0xc6 0x5c 0x63 0xd0 + 0x7f 0x39 0x1f 0xe8 0x8d 0x67 0xe6 0x27 0x67 0x0d 0x16 0x57 0x94 0xd1 0xfb 0xdf + 0xce 0xaf 0xfd 0x43 0xb3 0xbe 0x5d 0x83 0x4b 0x93 0x05 0xe8 0xdf 0x04 0xad 0xac + 0xeb 0xa6 0x81 0xa7 0xd5 0x04 0x63 0xbf 0x83 0xb8 0x0c 0xbc 0x20 0x18 0xb5 0x50 + 0xd7 0x61 0x84 0x11 0xca 0x2d 0x22 0xb3 0x29 0x02 0x03 0x01 0x00 0x01>; + }; + qcom,vm-config { compatible = "qcom,vm-1.0"; vm-type = "aarch64-guest"; @@ -200,6 +223,28 @@ qcom,label = <0x0000001>; }; + ddump-shm { + vdevice-type = "shm-doorbell"; + generate = "/hypervisor/ddump-shm"; + push-compatible = "qcom,ddump-gunyah-gen"; + peer-default; + memory { + qcom,label = <0x7>; + allocate-base; + }; + }; + + gunyah-panic-notifier-shm { + vdevice-type = "shm-doorbell"; + generate = "/hypervisor/gpn-shm"; + push-compatible = "qcom,gunyah-panic-gen"; + peer-default; + memory { + qcom,label = <0x9>; + allocate-base; + }; + }; + gpiomem0 { vdevice-type = "iomem"; patch = "/soc/tlmm-vm-mem-access"; @@ -211,6 +256,38 @@ allocate-base; }; }; + test-dbl-tuivm { + vdevice-type = "doorbell"; + generate = "/hypervisor/test-dbl-tuivm"; + qcom,label = <0x4>; + peer-default; + }; + + test-dbl-tuivm-source { + vdevice-type = "doorbell-source"; + generate = "/hypervisor/test-dbl-tuivm-source"; + qcom,label = <0x4>; + peer-default; + }; + + test-msgq-tuivm { + vdevice-type = "message-queue-pair"; + generate = "/hypervisor/test-msgq-tuivm-pair"; + message-size = <0xf0>; + queue-depth = <0x8>; + qcom,label = <0x4>; + peer-default; + }; + + test-large-dmabuf-tuivm { + vdevice-type = "message-queue-pair"; + generate = "/hypervisor/test-large-dmabuf-tuivm-pair"; + message-size = <0xf0>; + queue-depth = <0x8>; + qcom,label = <0xd>; + peer-default; + }; + }; }; @@ -342,6 +419,36 @@ qcom,support-hypervisor; }; + qcom,gunyah-panic-notifier { + compatible = "qcom,gh-panic-notifier"; + gunyah-label = <9>; + }; + + qcom,test-dbl-tuivm { + compatible = "qcom,gh-dbl"; + qcom,label = <0x4>; + }; + + qcom,test-msgq-tuivm { + compatible = "qcom,gh-msgq-test"; + gunyah-label = <0x4>; + affinity = <0>; + }; + + qcom,test-large-dmabuf-tuivm { + compatible = "qcom,gh-large-dmabuf-test"; + gunyah-label = <0xd>; + }; + + qcom,gh-qtimer@1742b000 { + compatible = "qcom,gh-qtmr"; + reg = <0x1742b000 0x1000>; + reg-names = "qtmr-base"; + interrupts = ; + interrupt-names = "qcom,qtmr-intr"; + qcom,secondary; + }; + qcom,mem-buf { compatible = "qcom,mem-buf"; qcom,mem-buf-capabilities = "consumer"; diff --git a/qcom/kera.dtsi b/qcom/kera.dtsi index a1c21e8d..ebc9c953 100644 --- a/qcom/kera.dtsi +++ b/qcom/kera.dtsi @@ -1941,6 +1941,67 @@ ext-label = <0x7>; }; + qcom,test-dbl-tuivm { + compatible = "qcom,gh-dbl"; + qcom,label = <0x4>; + }; + + qcom,test-dbl-oemvm { + compatible = "qcom,gh-dbl"; + qcom,label = <0x5>; + }; + + qcom,test-msgq-tuivm { + compatible = "qcom,gh-msgq-test"; + gunyah-label = <0x4>; + qcom,primary; + }; + + qcom,test-msgq-oemvm { + compatible = "qcom,gh-msgq-test"; + gunyah-label = <0x5>; + qcom,primary; + }; + + qcom,test-large-dmabuf-tuivm { + compatible = "qcom,gh-large-dmabuf-test"; + gunyah-label = <0xd>; + qcom,primary; + }; + + qcom,test-large-dmabuf-oemvm { + compatible = "qcom,gh-large-dmabuf-test"; + gunyah-label = <0xe>; + qcom,primary; + }; + + qcom,gh-qtimer@1742b000 { + compatible = "qcom,gh-qtmr"; + reg = <0x1742b000 0x1000>; + reg-names = "qtmr-base"; + interrupts = ; + interrupt-names = "qcom,qtmr-intr"; + qcom,primary; + }; + + qcom,gunyah-panic-notifier { + compatible = "qcom,gh-panic-notifier"; + qcom,primary-vm; + gunyah-label = <9>; + peer-name = <2>; + memory-region = <&vm_comm_mem>; + shared-buffer-size = <0x1000>; + }; + + dmesg-dump { + compatible = "qcom,dmesg-dump"; + qcom,primary-vm; + gunyah-label = <7>; + peer-name = <2>; + memory-region = <&vm_comm_mem>; + shared-buffer-size = <0x1000>; + }; + mmio_sram: mmio-sram@17D09400 { #address-cells = <2>; #size-cells = <2>;