From 1e478fc6a974be4ff20919490f6067e35dbab217 Mon Sep 17 00:00:00 2001 From: Shuang Zheng Date: Sat, 5 Jun 2021 12:26:31 +0000 Subject: [PATCH] config_tools: add hybrid, hybrid_rt, logical partition scenario on adl board add hybrid, hybrid_rt, logical_partition scenario and add launch config xml on adl-s-crb board, add launch config xml on adl-rvp board. Tracked-On: #5929 Signed-off-by: Shuang Zheng --- .../data/adl-rvp/industry_launch_2uos.xml | 89 ++++++ misc/config_tools/data/adl-s-crb/hybrid.xml | 210 ++++++++++++++ .../config_tools/data/adl-s-crb/hybrid_rt.xml | 264 ++++++++++++++++++ .../data/adl-s-crb/industry_launch_2uos.xml | 89 ++++++ .../data/adl-s-crb/logical_partition.xml | 197 +++++++++++++ 5 files changed, 849 insertions(+) create mode 100644 misc/config_tools/data/adl-rvp/industry_launch_2uos.xml create mode 100644 misc/config_tools/data/adl-s-crb/hybrid.xml create mode 100644 misc/config_tools/data/adl-s-crb/hybrid_rt.xml create mode 100644 misc/config_tools/data/adl-s-crb/industry_launch_2uos.xml create mode 100644 misc/config_tools/data/adl-s-crb/logical_partition.xml diff --git a/misc/config_tools/data/adl-rvp/industry_launch_2uos.xml b/misc/config_tools/data/adl-rvp/industry_launch_2uos.xml new file mode 100644 index 000000000..c1a709bf7 --- /dev/null +++ b/misc/config_tools/data/adl-rvp/industry_launch_2uos.xml @@ -0,0 +1,89 @@ + + + WINDOWS + no + 4096 + gvtd + ovmf + Disable + + n + n + + + + + + + + Disable + + + + + + + + + + + + + + + + + + + + WaaG + + ./win10-ltsc.img + + + + + + PREEMPT-RT LINUX + Hard RT + 1024 + + ovmf + Disable + + n + n + + + + + + + + Disable + + + + + + + + + + + + + + + 00:17.0 SATA controller: Intel Corporation Device a0d3 (rev 20) + + + + + + + + @stdio:stdio_port + + + diff --git a/misc/config_tools/data/adl-s-crb/hybrid.xml b/misc/config_tools/data/adl-s-crb/hybrid.xml new file mode 100644 index 000000000..812cdda3d --- /dev/null +++ b/misc/config_tools/data/adl-s-crb/hybrid.xml @@ -0,0 +1,210 @@ + + + + + n + /dev/ttyS0 + 5 + 5 + 3 + 7 + 0x40000 + + + y + SCHED_BVT + y + y + + n + n + + n + y + n + y + n + n + + n + + + + + 0x2000 + + + 0x00010000 + 0x400000000 + + + 0x100 + 256 + 1 + 96 + 120 + 256 + 64 + 16 + + + 0x00000010 + + + + SAFETY_VM + ACRN PRE-LAUNCHED VM0 + + 0 + + + 12 + 13 + 14 + 15 + + + + + + + + + 0 + 0 + + + 0x100000000 + 0x20000000 + 0x0 + 0x0 + + + Zephyr + KERNEL_ZEPHYR + Zephyr_RawImage + + + 0x8000 + 0x8000 + + + VUART_LEGACY_PIO + COM1_BASE + COM1_IRQ + + + VUART_LEGACY_PIO + COM2_BASE + COM2_IRQ + 1 + 1 + + + INVALID_PCI_BASE + + + INVALID_PCI_BASE + 1 + 1 + + + + + + n + n + + + + SOS_VM + ACRN SOS VM + + 0 + + + + + + 0 + + + ACRN Service OS + KERNEL_BZIMAGE + Linux_bzImage + + SOS_VM_BOOTARGS + + + VUART_LEGACY_PIO + SOS_COM1_BASE + SOS_COM1_IRQ + + + VUART_LEGACY_PIO + SOS_COM2_BASE + SOS_COM2_IRQ + 0 + 1 + + + INVALID_PCI_BASE + + + INVALID_PCI_BASE + 1 + 1 + + + + + + /dev/sda3 + rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 i915.nuclear_pageflip=1 swiotlb=131072 nokaslr + + + + + POST_STD_VM + + 0 + + + 8 + 9 + 10 + 11 + + + + + + + + + 0 + 0 + + + VUART_LEGACY_PIO + COM1_BASE + COM1_IRQ + + + VUART_LEGACY_PIO + INVALID_COM_BASE + COM2_IRQ + 0 + 0 + + + INVALID_PCI_BASE + + + INVALID_PCI_BASE + 1 + 1 + + n + + diff --git a/misc/config_tools/data/adl-s-crb/hybrid_rt.xml b/misc/config_tools/data/adl-s-crb/hybrid_rt.xml new file mode 100644 index 000000000..f7aa90483 --- /dev/null +++ b/misc/config_tools/data/adl-s-crb/hybrid_rt.xml @@ -0,0 +1,264 @@ + + + + n + /dev/ttyS0 + 5 + 5 + 3 + 7 + 0x40000 + + + y + SCHED_BVT + y + y + + n + n + + n + y + n + y + n + n + + y + hv:/shm_region_0, 2, 0:2 + + + + 0x2000 + + + 0x00010000 + 0x400000000 + + + 0x100 + 256 + 1 + 96 + 120 + 256 + 64 + 16 + + + 0x00000010 + + + + + PRE_RT_VM + ACRN PRE-LAUNCHED VM0 + + GUEST_FLAG_LAPIC_PASSTHROUGH + GUEST_FLAG_RT + + + 12 + 13 + 14 + 15 + + + + + + + + + 0 + 0 + + + 0x100000000 + 0x40000000 + 0x0 + 0x0 + + + PREEMPT-RT + KERNEL_BZIMAGE + RT_bzImage + + rw rootwait root=/dev/sda3 no_ipi_broadcast=1 console=ttyS0 noxsave nohpet no_timer_check ignore_loglevel consoleblank=0 tsc=reliable clocksource=tsc x2apic_phys processor.max_cstate=0 intel_idle.max_cstate=0 intel_pstate=disable mce=ignore_ce audit=0 isolcpus=nohz,domain,1 nohz_full=1 rcu_nocbs=1 nosoftlockup idle=poll irqaffinity=0 reboot=acpi + + + VUART_LEGACY_PIO + COM1_BASE + COM1_IRQ + + + VUART_LEGACY_PIO + COM2_BASE + COM2_IRQ + 1 + 1 + + + INVALID_PCI_BASE + + + INVALID_PCI_BASE + 1 + 1 + + + 00:17.0 SATA controller: Intel Corporation Device 7ae2 (rev 10) + + + y + + + + SOS_VM + ACRN SOS VM + + 0 + + + 0 + 1 + + + + + + + 0 + + + ACRN Service OS + KERNEL_BZIMAGE + Linux_bzImage + + SOS_VM_BOOTARGS + + + VUART_LEGACY_PIO + SOS_COM1_BASE + SOS_COM1_IRQ + + + VUART_LEGACY_PIO + SOS_COM2_BASE + SOS_COM2_IRQ + 0 + 1 + + + INVALID_PCI_BASE + + + INVALID_PCI_BASE + 0 + 1 + + + + + + /dev/nvme0n1p3 + rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 i915.nuclear_pageflip=1 swiotlb=131072 nokaslr + + + + + POST_STD_VM + + 0 + + + 8 + 9 + 10 + 11 + + + + + + + + + 0 + 0 + + + VUART_LEGACY_PIO + COM1_BASE + COM1_IRQ + + + VUART_LEGACY_PIO + INVALID_COM_BASE + COM2_IRQ + 0 + 0 + + + INVALID_PCI_BASE + + + INVALID_PCI_BASE + 0 + 1 + + n + + + POST_STD_VM + + 0 + + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + + + + + + + + + + + + + 0 + 0 + + + VUART_LEGACY_PIO + COM1_BASE + COM1_IRQ + + + VUART_LEGACY_PIO + INVALID_COM_BASE + COM2_IRQ + 0 + 0 + + + INVALID_PCI_BASE + + + INVALID_PCI_BASE + 1 + 1 + + n + + diff --git a/misc/config_tools/data/adl-s-crb/industry_launch_2uos.xml b/misc/config_tools/data/adl-s-crb/industry_launch_2uos.xml new file mode 100644 index 000000000..4ab01d47c --- /dev/null +++ b/misc/config_tools/data/adl-s-crb/industry_launch_2uos.xml @@ -0,0 +1,89 @@ + + + WINDOWS + no + 4096 + gvtd + ovmf + Disable + + n + n + + + + + + + + Disable + + + + + + + + + + + + + + + + + + + + WaaG + + ./win10-ltsc.img + + + + + + PREEMPT-RT LINUX + Hard RT + 1024 + + ovmf + Disable + + n + n + + + + + + + + Disable + + + + + + + + + + + + + + + 00:17.0 SATA controller: Intel Corporation Device a0d3 (rev 20) + + + + + + + + @stdio:stdio_port + + + diff --git a/misc/config_tools/data/adl-s-crb/logical_partition.xml b/misc/config_tools/data/adl-s-crb/logical_partition.xml new file mode 100644 index 000000000..5fc6c2f96 --- /dev/null +++ b/misc/config_tools/data/adl-s-crb/logical_partition.xml @@ -0,0 +1,197 @@ + + + + n + /dev/ttyS0 + 5 + 5 + 3 + 7 + 0x40000 + + + y + SCHED_BVT + y + y + + n + n + + n + y + n + y + n + n + + n + + + + + 0x2000 + + + 0x00010000 + 0x400000000 + + + 0x100 + 256 + 1 + 96 + 120 + 64 + 64 + 16 + + + 0x00000010 + + + + PRE_STD_VM + ACRN PRE-LAUNCHED VM0 + + 0 + + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + + + + + + + + + + + + + 0 + 0 + + + 0x100000000 + 0x20000000 + 0x0 + 0x0 + + + YOCTO + KERNEL_BZIMAGE + Linux_bzImage + + rw rootwait root=/dev/sda3 console=ttyS0 noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable reboot=acpi + + + + VUART_LEGACY_PIO + COM1_BASE + COM1_IRQ + + + VUART_LEGACY_PIO + COM2_BASE + COM2_IRQ + 1 + 1 + + + INVALID_PCI_BASE + + + INVALID_PCI_BASE + 1 + 1 + + + + + + + n + + + + PRE_STD_VM + ACRN PRE-LAUNCHED VM1 + + 0 + + + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + + + + + + + + + + + + + 0 + 0 + + + 0x120000000 + 0x20000000 + 0x0 + 0x0 + + + YOCTO + KERNEL_BZIMAGE + Linux_bzImage + + rw rootwait root=/dev/sda3 console=ttyS0 noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable reboot=acpi + + + + VUART_LEGACY_PIO + COM1_BASE + COM1_IRQ + + + VUART_LEGACY_PIO + COM2_BASE + COM2_IRQ + 0 + 1 + + + INVALID_PCI_BASE + + + INVALID_PCI_BASE + 1 + 1 + + + + + + + n + + +