ARM: dts: qcom: Add persist disk support

Add persist disk support on Kalama and
Waipio Kernel Platform.

Change-Id: I879cfb3f8a09b72b7c756342069ae8a386f02d6f
This commit is contained in:
Ashish Bhimanpalliwar
2022-03-01 05:22:17 +05:30
parent 7e2ab00e7c
commit 6c4e674024
4 changed files with 86 additions and 31 deletions

View File

@@ -22,6 +22,7 @@
bootargs = "nokaslr log_buf_len=256K root=/dev/ram rw init=/init console=hvc0 loglevel=8";
};
cpus {
#address-cells = <0x2>;
#size-cells = <0x0>;
@@ -92,7 +93,7 @@
#address-cells = <0x2>;
#size-cells = <0x0>;
base-address = <0x0 0xf3c00000>;
size-min = <0x0 0x42f3000>; /* 66 MB */
size-min = <0x0 0x41ef000>; /* 65 MB */
};
segments {
@@ -131,9 +132,24 @@
dma-coherent;
dma_base = <0x0 0x0>;
memory {
qcom,label = <0x11>;
qcom,label = <0x11>; //for persist.img
#address-cells = <0x2>;
base = <0x0 0xFFEFC000>;
base = <0x0 0xDA6F8000>;
};
};
virtio-mmio@1 {
vdevice-type = "virtio-mmio";
generate = "/virtio-mmio";
peer-default;
vqs-num = <0x2>;
push-compatible = "virtio,mmio";
dma-coherent;
dma_base = <0x0 0x4000>;
memory {
qcom,label = <0x10>; //for system.img
#address-cells = <0x2>;
base = <0x0 0xDA6FC000>;
};
};
@@ -142,11 +158,11 @@
generate = "/swiotlb";
push-compatible = "swiotlb";
peer-default;
dma_base = <0x0 0x4000>;
dma_base = <0x0 0x8000>;
memory {
qcom,label = <0x12>;
#address-cells = <0x2>;
base = <0x0 0xFFF00000>;
base = <0x0 0xDA700000>;
};
};

View File

@@ -548,23 +548,29 @@
trust_ui_vm_mem: trust_ui_vm_region@f3c00000 {
no-map;
reg = <0x0 0xf3c00000 0x0 0x42f3000>;
reg = <0x0 0xf3c00000 0x0 0x41ef000>;
};
trust_ui_vm_qrtr: trust_ui_vm_qrtr@f7ef3000 {
trust_ui_vm_qrtr: trust_ui_vm_qrtr@f7def000 {
no-map;
reg = <0x0 0xf7ef3000 0x0 0x9000>;
reg = <0x0 0xf7def000 0x0 0x9000>;
};
trust_ui_vm_vblk0_ring: trust_ui_vm_vblk0_ring@f7efc000 {
trust_ui_vm_vblk0_ring: trust_ui_vm_vblk0_ring@f7df8000 {
no-map;
reg = <0x0 0xf7efc000 0x0 0x4000>;
gunyah-label = <0x11>;
reg = <0x0 0xf7df8000 0x0 0x4000>;
gunyah-label = <0x11>; //for persist.img
};
trust_ui_vm_swiotlb: trust_ui_vm_swiotlb@f7f00000 {
trust_ui_vm_vblk1_ring: trust_ui_vm_vblk1_ring@f7dfc000 {
no-map;
reg = <0x0 0xf7f00000 0x0 0x100000>;
reg = <0x0 0xf7dfc000 0x0 0x4000>;
gunyah-label = <0x10>; //for system.img
};
trust_ui_vm_swiotlb: trust_ui_vm_swiotlb@f7e00000 {
no-map;
reg = <0x0 0xf7e00000 0x0 0x200000>;
gunyah-label = <0x12>;
};
@@ -2995,10 +3001,10 @@
memory-region = <&oem_vm_mem>;
};
trust_ui_vm: qcom,trust_ui_vm@f7efc000 {
reg = <0xf7efc000 0x104000>;
trust_ui_vm: qcom,trust_ui_vm@f7df8000 {
reg = <0xf7df8000 0x208000>;
vm_name = "trustedvm";
shared-buffers = <&trust_ui_vm_vblk0_ring &trust_ui_vm_swiotlb>;
shared-buffers = <&trust_ui_vm_vblk0_ring &trust_ui_vm_vblk1_ring &trust_ui_vm_swiotlb>;
};
oem_vm: qcom,oem_vm@fcefc000 {
@@ -3014,6 +3020,12 @@
};
qcom,virtio_backend@1 {
compatible = "qcom,virtio_backend";
qcom,vm = <&trust_ui_vm>;
qcom,label = <0x10>;
};
qcom,virtio_backend@2 {
compatible = "qcom,virtio_backend";
qcom,vm = <&oem_vm>;
qcom,label = <0x13>;

View File

@@ -96,7 +96,7 @@
#address-cells = <0x2>;
#size-cells = <0x0>;
base-address = <0x0 0xe0b00000>;
size-min = <0x0 0x7a00000>; /* 122 MB */
size-min = <0x0 0x49ef000>; /* 73 MB */
};
segments {
@@ -135,9 +135,24 @@
dma-coherent;
dma_base = <0x0 0x0>;
memory {
qcom,label = <0x11>;
qcom,label = <0x11>; //for persist.img
#address-cells = <0x2>;
base = <0x0 0xFFEFC000>;
base = <0x0 0xDA6F8000>;
};
};
virtio-mmio@1 {
vdevice-type = "virtio-mmio";
generate = "/virtio-mmio";
peer-default;
vqs-num = <0x2>;
push-compatible = "virtio,mmio";
dma-coherent;
dma_base = <0x0 0x4000>;
memory {
qcom,label = <0x10>; //for system.img
#address-cells = <0x2>;
base = <0x0 0xDA6FC000>;
};
};
@@ -146,11 +161,11 @@
generate = "/swiotlb";
push-compatible = "swiotlb";
peer-default;
dma_base = <0x0 0x4000>;
dma_base = <0x0 0x8000>;
memory {
qcom,label = <0x12>;
#address-cells = <0x2>;
base = <0x0 0xFFF00000>;
base = <0x0 0xDA700000>;
};
};

View File

@@ -535,23 +535,29 @@
trust_ui_vm_mem: trust_ui_vm_region@e0b00000 {
no-map;
reg = <0x0 0xe0b00000 0x0 0x4af3000>;
reg = <0x0 0xe0b00000 0x0 0x49ef000>;
};
trust_ui_vm_qrtr: trust_ui_vm_qrtr@e55f3000 {
trust_ui_vm_qrtr: trust_ui_vm_qrtr@e54ef000 {
no-map;
reg = <0x0 0xe55f3000 0x0 0x9000>;
reg = <0x0 0xe54ef000 0x0 0x9000>;
};
trust_ui_vm_vblk0_ring: trust_ui_vm_vblk0_ring@e55fc000 {
trust_ui_vm_vblk0_ring: trust_ui_vm_vblk0_ring@e54f8000 {
no-map;
reg = <0x0 0xe55fc000 0x0 0x4000>;
gunyah-label = <0x11>;
reg = <0x0 0xe54f8000 0x0 0x4000>;
gunyah-label = <0x11>; //for persist.img
};
trust_ui_vm_swiotlb: trust_ui_vm_swiotlb@e5600000 {
trust_ui_vm_vblk1_ring: trust_ui_vm_vblk1_ring@e54fc000 {
no-map;
reg = <0x0 0xe5600000 0x0 0x100000>;
reg = <0x0 0xe54fc000 0x0 0x4000>;
gunyah-label = <0x10>; //for system.img
};
trust_ui_vm_swiotlb: trust_ui_vm_swiotlb@e5500000 {
no-map;
reg = <0x0 0xe5500000 0x0 0x200000>;
gunyah-label = <0x12>;
};
@@ -3362,9 +3368,9 @@
};
trust_ui_vm: qcom,trust_ui_vm@e55fc000 {
reg = <0xe55fc000 0x104000>;
reg = <0xe54f8000 0x208000>;
vm_name = "trustedvm";
shared-buffers = <&trust_ui_vm_vblk0_ring &trust_ui_vm_swiotlb>;
shared-buffers = <&trust_ui_vm_vblk0_ring &trust_ui_vm_vblk1_ring &trust_ui_vm_swiotlb>;
};
oem_vm: qcom,oem_vm@bfefc000 {
@@ -3380,6 +3386,12 @@
};
qcom,virtio_backend@1 {
compatible = "qcom,virtio_backend";
qcom,vm = <&trust_ui_vm>;
qcom,label = <0x10>;
};
qcom,virtio_backend@2 {
compatible = "qcom,virtio_backend";
qcom,vm = <&oem_vm>;
qcom,label = <0x13>;