samsung_sm8750/android_kernel_samsung_sm8750-devicetrees
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "ARM: dts: msm: Add wakeup-source property to virtio-vsock"

Browse Source
This commit is contained in:
qctecmdr
2024-03-26 22:32:34 -07:00
committed by Gerrit - the friendly Code Review server
parent 80bb869dea dd0430a93a
commit b3e70e4cbd
2 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
qcom/sun-vm.dtsi
View File

@@ -190,16 +190,31 @@
}; };
}; };
virtio-mmio@2 {
vdevice-type = "virtio-mmio";
patch = "/soc/virtio-mmio";
peer-default;
vqs-num = <0x3>;
push-compatible = "virtio,mmio";
dma-coherent;
dma_base = <0x0 0x8000>;
memory {
qcom,label = <0x15>; //for virtio-vsock
#address-cells = <0x2>;
base = <0x0 0xDA700000>;
};
};
swiotlb-shm { swiotlb-shm {
vdevice-type = "shm"; vdevice-type = "shm";
generate = "/swiotlb"; generate = "/swiotlb";
push-compatible = "swiotlb"; push-compatible = "swiotlb";
peer-default; peer-default;
dma_base = <0x0 0x8000>; dma_base = <0x0 0x14000>;
memory { memory {
qcom,label = <0x12>; qcom,label = <0x12>;
#address-cells = <0x2>; #address-cells = <0x2>;
base = <0x0 0xDA700000>; base = <0x0 0xDA70c000>;
}; };
}; };
@@ -315,6 +330,10 @@
ranges = <0 0 0 0xffffffff>; ranges = <0 0 0 0xffffffff>;
compatible = "simple-bus"; compatible = "simple-bus";
virtio-mmio {
wakeup-source;
};
gcc: clock-controller@100000 { gcc: clock-controller@100000 {
compatible = "qcom,dummycc"; compatible = "qcom,dummycc";
clock-output-names = "gcc_clocks"; clock-output-names = "gcc_clocks";

22
qcom/sun.dtsi
View File

@@ -2173,16 +2173,23 @@
gunyah-label = <0x10>; gunyah-label = <0x10>;
}; };
trust_ui_vm_vsock_ring: trust_ui_vm_vsock_ring {
size = <0xc000>;
gunyah-label = <0x15>;
};
trust_ui_vm_swiotlb: trust_ui_vm_swiotlb { trust_ui_vm_swiotlb: trust_ui_vm_swiotlb {
size = <0x100000>; size = <0x400000>;
gunyah-label = <0x12>; gunyah-label = <0x12>;
}; };
trust_ui_vm: qcom,trust_ui_vm { trust_ui_vm: qcom,trust_ui_vm {
vm_name = "trustedvm"; vm_name = "trustedvm";
shared-buffers-size = <0x108000>; shared-buffers-size = <0x414000>;
shared-buffers = <&trust_ui_vm_vblk0_ring shared-buffers = <&trust_ui_vm_vblk0_ring
&trust_ui_vm_vblk1_ring &trust_ui_vm_vblk1_ring
&trust_ui_vm_vsock_ring
&trust_ui_vm_swiotlb>; &trust_ui_vm_swiotlb>;
}; };
@@ -2196,6 +2203,11 @@
qcom,label = <0x10>; qcom,label = <0x10>;
}; };
trust_ui_vm_virt_be2: trust_ui_vm_virt_be2@15 {
qcom,vm = <&trust_ui_vm>;
qcom,label = <0x15>;
};
gh-rm-booster { gh-rm-booster {
compatible = "qcom,gh-rm-booster"; compatible = "qcom,gh-rm-booster";
qcom,rm-vmid = <255>; qcom,rm-vmid = <255>;
@@ -2209,7 +2221,9 @@
qcom,firmware-name = "trustedvm"; qcom,firmware-name = "trustedvm";
qcom,keep-running; qcom,keep-running;
memory-region = <&trust_ui_vm_mem &vm_comm_mem>; memory-region = <&trust_ui_vm_mem &vm_comm_mem>;
virtio-backends = <&trust_ui_vm_virt_be0 &trust_ui_vm_virt_be1>; virtio-backends = <&trust_ui_vm_virt_be0
&trust_ui_vm_virt_be1
&trust_ui_vm_virt_be2>;
}; };
oem_vm_vblk0_ring: oem_vm_vblk0_ring { oem_vm_vblk0_ring: oem_vm_vblk0_ring {
@@ -3770,7 +3784,7 @@
alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>; alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;
reusable; reusable;
alignment = <0x0 0x400000>; alignment = <0x0 0x400000>;
size = <0x0 0x400000>; size = <0x0 0x800000>;
}; };
llcc_lpi_mem: llcc_lpi_region@ff800000 { llcc_lpi_mem: llcc_lpi_region@ff800000 {