From a4a3b4e951571519a70f428a83ab5a9236037e52 Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Tue, 2 Jun 2020 11:52:38 +0800 Subject: [PATCH] acrn-config: refine GVT args for SOS cmdline 1.Refinement GVT args for SOS kernel cmdline in scenario config xmls. 2.Refinement GVT args for launch UOS script in launch config xmls. Tracked-On: #4869 Signed-off-by: Wei Liu Acked-by: Victor Sun --- misc/acrn-config/launch_config/com.py | 6 +++--- misc/acrn-config/xmls/config-xmls/ehl-crb-b/hybrid.xml | 2 +- misc/acrn-config/xmls/config-xmls/ehl-crb-b/industry.xml | 2 +- .../xmls/config-xmls/ehl-crb-b/industry_launch_6uos.xml | 8 ++++---- misc/acrn-config/xmls/config-xmls/ehl-crb-b/sdc.xml | 2 +- .../xmls/config-xmls/ehl-crb-b/sdc_launch_1uos_laag.xml | 2 +- misc/acrn-config/xmls/config-xmls/generic/hybrid.xml | 2 +- misc/acrn-config/xmls/config-xmls/generic/industry.xml | 2 +- misc/acrn-config/xmls/config-xmls/generic/sdc.xml | 2 +- misc/acrn-config/xmls/config-xmls/nuc6cayh/hybrid.xml | 3 +-- misc/acrn-config/xmls/config-xmls/nuc6cayh/industry.xml | 3 +-- .../xmls/config-xmls/nuc6cayh/industry_launch_6uos.xml | 8 ++++---- misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc.xml | 3 +-- .../xmls/config-xmls/nuc6cayh/sdc_launch_1uos_laag.xml | 2 +- misc/acrn-config/xmls/config-xmls/nuc7i7dnb/hybrid.xml | 3 +-- misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry.xml | 3 +-- .../xmls/config-xmls/nuc7i7dnb/industry_launch_6uos.xml | 8 ++++---- misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc.xml | 3 +-- .../xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_laag.xml | 2 +- .../xmls/config-xmls/template/LAUNCH_POST_STD_VM.xml | 2 +- misc/acrn-config/xmls/config-xmls/tgl-rvp/industry.xml | 3 +-- .../xmls/config-xmls/tgl-rvp/industry_launch_1uos.xml | 2 +- misc/acrn-config/xmls/config-xmls/whl-ipc-i5/hybrid.xml | 3 +-- misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry.xml | 3 +-- .../xmls/config-xmls/whl-ipc-i5/industry_launch_6uos.xml | 8 ++++---- misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc.xml | 3 +-- .../xmls/config-xmls/whl-ipc-i5/sdc_launch_1uos_laag.xml | 2 +- misc/acrn-config/xmls/config-xmls/whl-ipc-i7/hybrid.xml | 3 +-- misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry.xml | 3 +-- .../xmls/config-xmls/whl-ipc-i7/industry_launch_6uos.xml | 8 ++++---- misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc.xml | 3 +-- .../xmls/config-xmls/whl-ipc-i7/sdc_launch_1uos_laag.xml | 2 +- 32 files changed, 49 insertions(+), 62 deletions(-) diff --git a/misc/acrn-config/launch_config/com.py b/misc/acrn-config/launch_config/com.py index e46ffe5bf..45a5f07f9 100644 --- a/misc/acrn-config/launch_config/com.py +++ b/misc/acrn-config/launch_config/com.py @@ -328,7 +328,7 @@ def uos_launch(names, args, virt_io, vmid, config): print("fi", file=config) else: print("else", file=config) - if gvt_args == "gvtd": + if gvt_args == "gvtd" or not gvt_args: print(' launch_{} {}'.format(launch_uos, vmid), file=config) elif gvt_args: print(' launch_{} {} "{}"'.format(launch_uos, vmid, gvt_args), file=config) @@ -337,14 +337,14 @@ def uos_launch(names, args, virt_io, vmid, config): if uos_type in ("VXWORKS", "PREEMPT-RT LINUX", "ZEPHYR"): print("launch_{} {}".format(launch_uos, vmid), file=config) if uos_type in ("CLEARLINUX", "WINDOWS"): - if gvt_args == "gvtd": + if gvt_args == "gvtd" or not gvt_args: print('launch_{} {}'.format(launch_uos, vmid), file=config) else: print('launch_{} {} "{}"'.format(launch_uos, vmid, gvt_args), file=config) if is_mount_needed(virt_io, vmid): print("", file=config) - if gvt_args == "gvtd": + if gvt_args == "gvtd" or not gvt_args: print('launch_{} {} "{}" $debug'.format(launch_uos, vmid, vmid), file=config) else: print('launch_{} {} "{}" "{}" $debug'.format(launch_uos, vmid, gvt_args, vmid), file=config) diff --git a/misc/acrn-config/xmls/config-xmls/ehl-crb-b/hybrid.xml b/misc/acrn-config/xmls/config-xmls/ehl-crb-b/hybrid.xml index 466b36c57..b458dc0e0 100644 --- a/misc/acrn-config/xmls/config-xmls/ehl-crb-b/hybrid.xml +++ b/misc/acrn-config/xmls/config-xmls/ehl-crb-b/hybrid.xml @@ -150,7 +150,7 @@ /dev/sda3 rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01070F i915.domain_plane_owners=0x011100001111 i915.enable_gvt=1 + i915.nuclear_pageflip=1 diff --git a/misc/acrn-config/xmls/config-xmls/ehl-crb-b/industry.xml b/misc/acrn-config/xmls/config-xmls/ehl-crb-b/industry.xml index bfd127562..c2035e1c4 100644 --- a/misc/acrn-config/xmls/config-xmls/ehl-crb-b/industry.xml +++ b/misc/acrn-config/xmls/config-xmls/ehl-crb-b/industry.xml @@ -103,7 +103,7 @@ /dev/sda3 rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1 + i915.nuclear_pageflip=1 diff --git a/misc/acrn-config/xmls/config-xmls/ehl-crb-b/industry_launch_6uos.xml b/misc/acrn-config/xmls/config-xmls/ehl-crb-b/industry_launch_6uos.xml index a6f868d16..2bc530cfa 100644 --- a/misc/acrn-config/xmls/config-xmls/ehl-crb-b/industry_launch_6uos.xml +++ b/misc/acrn-config/xmls/config-xmls/ehl-crb-b/industry_launch_6uos.xml @@ -74,7 +74,7 @@ CLEARLINUX no 512 - gvtd + ovmf Disable @@ -107,7 +107,7 @@ CLEARLINUX no 512 - gvtd + ovmf Disable @@ -140,7 +140,7 @@ CLEARLINUX no 512 - gvtd + ovmf Disable @@ -173,7 +173,7 @@ CLEARLINUX no 512 - gvtd + ovmf Disable diff --git a/misc/acrn-config/xmls/config-xmls/ehl-crb-b/sdc.xml b/misc/acrn-config/xmls/config-xmls/ehl-crb-b/sdc.xml index 14e0b7bf4..67a9587d7 100644 --- a/misc/acrn-config/xmls/config-xmls/ehl-crb-b/sdc.xml +++ b/misc/acrn-config/xmls/config-xmls/ehl-crb-b/sdc.xml @@ -103,7 +103,7 @@ /dev/sda3 rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1 + i915.nuclear_pageflip=1 diff --git a/misc/acrn-config/xmls/config-xmls/ehl-crb-b/sdc_launch_1uos_laag.xml b/misc/acrn-config/xmls/config-xmls/ehl-crb-b/sdc_launch_1uos_laag.xml index cbcd58c13..bcd8813de 100644 --- a/misc/acrn-config/xmls/config-xmls/ehl-crb-b/sdc_launch_1uos_laag.xml +++ b/misc/acrn-config/xmls/config-xmls/ehl-crb-b/sdc_launch_1uos_laag.xml @@ -3,7 +3,7 @@ CLEARLINUX no 2048 - 64 448 8 + gvtd ovmf Disable vuart1(pty) diff --git a/misc/acrn-config/xmls/config-xmls/generic/hybrid.xml b/misc/acrn-config/xmls/config-xmls/generic/hybrid.xml index f2090838c..7509e7465 100644 --- a/misc/acrn-config/xmls/config-xmls/generic/hybrid.xml +++ b/misc/acrn-config/xmls/config-xmls/generic/hybrid.xml @@ -139,7 +139,7 @@ /dev/sda3 rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01070F i915.domain_plane_owners=0x011100001111 i915.enable_gvt=1 + i915.nuclear_pageflip=1 diff --git a/misc/acrn-config/xmls/config-xmls/generic/industry.xml b/misc/acrn-config/xmls/config-xmls/generic/industry.xml index 55321d303..af45d0fa0 100644 --- a/misc/acrn-config/xmls/config-xmls/generic/industry.xml +++ b/misc/acrn-config/xmls/config-xmls/generic/industry.xml @@ -92,7 +92,7 @@ /dev/sda3 rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1 + i915.nuclear_pageflip=1 diff --git a/misc/acrn-config/xmls/config-xmls/generic/sdc.xml b/misc/acrn-config/xmls/config-xmls/generic/sdc.xml index a1325a2de..6948e137f 100644 --- a/misc/acrn-config/xmls/config-xmls/generic/sdc.xml +++ b/misc/acrn-config/xmls/config-xmls/generic/sdc.xml @@ -92,7 +92,7 @@ /dev/sda3 rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1 + i915.nuclear_pageflip=1 diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/hybrid.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/hybrid.xml index 5b216eb8f..3cde15f98 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/hybrid.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/hybrid.xml @@ -142,8 +142,7 @@ /dev/sda3 rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01070F i915.domain_plane_owners=0x011100001111 i915.enable_gvt=1 - hvlog=2M@0xe00000 memmap=0x200000$0xe00000 + i915.nuclear_pageflip=1 hvlog=2M@0xe00000 memmap=0x200000$0xe00000 diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry.xml index a287be024..1d819ad8f 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry.xml @@ -96,8 +96,7 @@ /dev/sda3 rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1 - hvlog=2M@0xe00000 memmap=0x200000$0xe00000 + i915.nuclear_pageflip=1 hvlog=2M@0xe00000 memmap=0x200000$0xe00000 diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_6uos.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_6uos.xml index febb4640a..b44ca8810 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_6uos.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_6uos.xml @@ -74,7 +74,7 @@ CLEARLINUX no 512 - gvtd + ovmf Disable @@ -107,7 +107,7 @@ CLEARLINUX no 512 - gvtd + ovmf Disable @@ -140,7 +140,7 @@ CLEARLINUX no 512 - gvtd + ovmf Disable @@ -173,7 +173,7 @@ CLEARLINUX no 512 - gvtd + ovmf Disable diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc.xml index ecc06860e..a2e70ce5a 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc.xml @@ -96,8 +96,7 @@ /dev/sda3 rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1 - hvlog=2M@0xe00000 memmap=0x200000$0xe00000 + i915.nuclear_pageflip=1 hvlog=2M@0xe00000 memmap=0x200000$0xe00000 diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc_launch_1uos_laag.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc_launch_1uos_laag.xml index 028f38ce5..1f8a5c5cd 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc_launch_1uos_laag.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc_launch_1uos_laag.xml @@ -3,7 +3,7 @@ CLEARLINUX no 2048 - 64 448 8 + gvtd ovmf Disable vuart1(pty) diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/hybrid.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/hybrid.xml index e14f93895..f75102641 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/hybrid.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/hybrid.xml @@ -138,8 +138,7 @@ /dev/sda3 rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01070F i915.domain_plane_owners=0x011100001111 i915.enable_gvt=1 - hvlog=2M@0xe00000 memmap=0x200000$0xe00000 + i915.nuclear_pageflip=1 hvlog=2M@0xe00000 memmap=0x200000$0xe00000 diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry.xml index cc67f6caa..0aa5a449c 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry.xml @@ -91,8 +91,7 @@ /dev/sda3 rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1 - hvlog=2M@0xe00000 memmap=0x200000$0xe00000 + i915.nuclear_pageflip=1 hvlog=2M@0xe00000 memmap=0x200000$0xe00000 diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_6uos.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_6uos.xml index d3ded0c14..33282de2f 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_6uos.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_6uos.xml @@ -74,7 +74,7 @@ CLEARLINUX no 512 - gvtd + ovmf Disable @@ -107,7 +107,7 @@ CLEARLINUX no 512 - gvtd + ovmf Disable @@ -140,7 +140,7 @@ CLEARLINUX no 512 - gvtd + ovmf Disable @@ -173,7 +173,7 @@ CLEARLINUX no 512 - gvtd + ovmf Disable diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc.xml index d6cd4b6c3..0ea81c902 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc.xml @@ -91,8 +91,7 @@ /dev/sda3 rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1 - hvlog=2M@0xe00000 memmap=0x200000$0xe00000 + i915.nuclear_pageflip=1 hvlog=2M@0xe00000 memmap=0x200000$0xe00000 diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_laag.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_laag.xml index 642388fb1..ddea75d76 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_laag.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_laag.xml @@ -3,7 +3,7 @@ CLEARLINUX no 2048 - 64 448 8 + gvtd ovmf Disable vuart1(pty) diff --git a/misc/acrn-config/xmls/config-xmls/template/LAUNCH_POST_STD_VM.xml b/misc/acrn-config/xmls/config-xmls/template/LAUNCH_POST_STD_VM.xml index cddb7038f..33397461f 100644 --- a/misc/acrn-config/xmls/config-xmls/template/LAUNCH_POST_STD_VM.xml +++ b/misc/acrn-config/xmls/config-xmls/template/LAUNCH_POST_STD_VM.xml @@ -3,7 +3,7 @@ no - gvtd + ovmf diff --git a/misc/acrn-config/xmls/config-xmls/tgl-rvp/industry.xml b/misc/acrn-config/xmls/config-xmls/tgl-rvp/industry.xml index b956d3205..85710e1f7 100644 --- a/misc/acrn-config/xmls/config-xmls/tgl-rvp/industry.xml +++ b/misc/acrn-config/xmls/config-xmls/tgl-rvp/industry.xml @@ -89,8 +89,7 @@ /dev/nvme0n1p3 - rw rootwait console=ttyS0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1 + rw rootwait console=ttyS0 consoleblank=0 no_timer_check quiet loglevel=3 i915.nuclear_pageflip=1 diff --git a/misc/acrn-config/xmls/config-xmls/tgl-rvp/industry_launch_1uos.xml b/misc/acrn-config/xmls/config-xmls/tgl-rvp/industry_launch_1uos.xml index 1ade55829..aa90f8c58 100644 --- a/misc/acrn-config/xmls/config-xmls/tgl-rvp/industry_launch_1uos.xml +++ b/misc/acrn-config/xmls/config-xmls/tgl-rvp/industry_launch_1uos.xml @@ -4,7 +4,7 @@ CLEARLINUX no 2000 - 64 448 8 + gvtd ovmf /dev/nvme0n1p3 /root/uos/uos.img diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/hybrid.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/hybrid.xml index 30b6cec46..dc3810272 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/hybrid.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/hybrid.xml @@ -138,8 +138,7 @@ /dev/sda3 rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01070F i915.domain_plane_owners=0x011100001111 i915.enable_gvt=1 - hvlog=2M@0xe00000 memmap=0x200000$0xe00000 + i915.nuclear_pageflip=1 hvlog=2M@0xe00000 memmap=0x200000$0xe00000 diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry.xml index b827f9d58..93a2a9391 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry.xml @@ -91,8 +91,7 @@ /dev/sda3 rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1 - hvlog=2M@0xe00000 memmap=0x200000$0xe00000 + i915.nuclear_pageflip=1 hvlog=2M@0xe00000 memmap=0x200000$0xe00000 diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry_launch_6uos.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry_launch_6uos.xml index 75a6e1103..24bbb80cc 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry_launch_6uos.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry_launch_6uos.xml @@ -74,7 +74,7 @@ CLEARLINUX no 512 - gvtd + ovmf Disable @@ -107,7 +107,7 @@ CLEARLINUX no 512 - gvtd + ovmf Disable @@ -140,7 +140,7 @@ CLEARLINUX no 512 - gvtd + ovmf Disable @@ -173,7 +173,7 @@ CLEARLINUX no 512 - gvtd + ovmf Disable diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc.xml index c7b17fe6d..a30ece938 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc.xml @@ -91,8 +91,7 @@ /dev/sda3 rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1 - hvlog=2M@0xe00000 memmap=0x200000$0xe00000 + i915.nuclear_pageflip=1 hvlog=2M@0xe00000 memmap=0x200000$0xe00000 diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc_launch_1uos_laag.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc_launch_1uos_laag.xml index e474cc329..a9ff1df75 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc_launch_1uos_laag.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc_launch_1uos_laag.xml @@ -3,7 +3,7 @@ CLEARLINUX no 2048 - 64 448 8 + gvtd ovmf Disable vuart1(pty) diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/hybrid.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/hybrid.xml index 8457a2693..398ee194b 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/hybrid.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/hybrid.xml @@ -138,8 +138,7 @@ /dev/sda3 rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01070F i915.domain_plane_owners=0x011100001111 i915.enable_gvt=1 - hvlog=2M@0xe00000 memmap=0x200000$0xe00000 + i915.nuclear_pageflip=1 hvlog=2M@0xe00000 memmap=0x200000$0xe00000 diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry.xml index 1d2f84a77..f1fe9985c 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry.xml @@ -91,8 +91,7 @@ /dev/sda3 rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1 - hvlog=2M@0xe00000 memmap=0x200000$0xe00000 + i915.nuclear_pageflip=1 hvlog=2M@0xe00000 memmap=0x200000$0xe00000 diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry_launch_6uos.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry_launch_6uos.xml index 848490b4f..837de6faf 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry_launch_6uos.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry_launch_6uos.xml @@ -74,7 +74,7 @@ CLEARLINUX no 512 - gvtd + ovmf Disable @@ -107,7 +107,7 @@ CLEARLINUX no 512 - gvtd + ovmf Disable @@ -140,7 +140,7 @@ CLEARLINUX no 512 - gvtd + ovmf Disable @@ -173,7 +173,7 @@ CLEARLINUX no 512 - gvtd + ovmf Disable diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc.xml index 5ca5259e0..a96718f26 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc.xml @@ -95,8 +95,7 @@ /dev/sda3 rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1 - hvlog=2M@0xe00000 memmap=0x200000$0xe00000 + i915.nuclear_pageflip=1 hvlog=2M@0xe00000 memmap=0x200000$0xe00000 diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc_launch_1uos_laag.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc_launch_1uos_laag.xml index a4d6eb6c6..e8304a946 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc_launch_1uos_laag.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc_launch_1uos_laag.xml @@ -3,7 +3,7 @@ CLEARLINUX no 2048 - 64 448 8 + gvtd ovmf Disable vuart1(pty)