diff --git a/platform/aarch64/qemu-gicv3/configs/zone1-linux-virtio.json b/platform/aarch64/qemu-gicv3/configs/zone1-linux-virtio.json index cdcc6de6..64dd4897 100644 --- a/platform/aarch64/qemu-gicv3/configs/zone1-linux-virtio.json +++ b/platform/aarch64/qemu-gicv3/configs/zone1-linux-virtio.json @@ -11,11 +11,19 @@ ], "devices": [ { - "type": "blk", - "addr": "0xa003c00", + "type": "net", + "addr": "0xa003600", "len": "0x200", - "irq": 78, - "img": "rootfs2.ext4", + "irq": 75, + "tap": "tap0", + "mac": [ + "0x02", + "0x00", + "0x00", + "0x00", + "0x01", + "0x01" + ], "status": "enable" }, { @@ -24,6 +32,14 @@ "len": "0x200", "irq": 76, "status": "enable" + }, + { + "type": "blk", + "addr": "0xa003c00", + "len": "0x200", + "irq": 78, + "img": "rootfs2.ext4", + "status": "enable" } ] } diff --git a/platform/aarch64/qemu-gicv3/configs/zone1-linux.json b/platform/aarch64/qemu-gicv3/configs/zone1-linux.json index 17cb55f2..a3c8d1d5 100644 --- a/platform/aarch64/qemu-gicv3/configs/zone1-linux.json +++ b/platform/aarch64/qemu-gicv3/configs/zone1-linux.json @@ -10,6 +10,12 @@ "virtual_start": "0x50000000", "size": "0x30000000" }, + { + "type": "virtio", + "physical_start": "0xa003600", + "virtual_start": "0xa003600", + "size": "0x200" + }, { "type": "virtio", "physical_start": "0xa003800", @@ -23,7 +29,11 @@ "size": "0x200" } ], - "interrupts": [76, 78], + "interrupts": [ + 75, + 76, + 78 + ], "ivc_configs": [], "kernel_filepath": "Image", "kernel_args": "", diff --git a/platform/aarch64/qemu-gicv3/image/dts/zone1-linux.dts b/platform/aarch64/qemu-gicv3/image/dts/zone1-linux.dts index 9239584b..1db70028 100644 --- a/platform/aarch64/qemu-gicv3/image/dts/zone1-linux.dts +++ b/platform/aarch64/qemu-gicv3/image/dts/zone1-linux.dts @@ -121,13 +121,13 @@ // compatible = "virtio,mmio"; // }; // virtio-net - // virtio_mmio@a003600 { - // dma-coherent; - // interrupt-parent = <0x01>; - // interrupts = <0x0 0x2b 0x1>; - // reg = <0x0 0xa003600 0x0 0x200>; - // compatible = "virtio,mmio"; - // }; + virtio_mmio@a003600 { + dma-coherent; + interrupt-parent = <0x01>; + interrupts = <0x0 0x2b 0x1>; + reg = <0x0 0xa003600 0x0 0x200>; + compatible = "virtio,mmio"; + }; // virtio serial virtio_mmio@a003800 {