From 1bc5c7ac5b0ffffbb5a52a7b1962ec5e98038ead Mon Sep 17 00:00:00 2001 From: Zide Chen Date: Thu, 23 Apr 2020 10:01:21 -0700 Subject: [PATCH] hv/acrn-config/efi-stuf: assign hvlog and ramoops buffer address < 256MB If HV relocation is enabled, either ACRN efi-stub or GRUB relocates hypervisor image above HPA 256MB, thus we put hvlog and ramoops buffer under 256MB to avoid conflict with hypervisor owned address. This patch hardcodes these addresses: 0xa00000 - 0xdfffff: 4MiB for ramoops buffer 0xe00000 - 0xffffff: 2MiB for hvlog buffer However, user can customize them to other addresses as long as it's under 256MB, available in host e820, and SOS bootarg "nokaslr" is not specified. If HV relocation is disabled, need to make sure that these buffer addresses are not between HV_RAM_START and HV_RAM_START + HV_RAM_SIZE. Tracked-On: #4760 Signed-off-by: Zide Chen Reviewed-by: Jason Chen CJ --- hypervisor/arch/x86/configs/apl-mrb/misc_cfg.h | 7 +++---- hypervisor/arch/x86/configs/apl-up2/misc_cfg.h | 7 +++---- hypervisor/arch/x86/configs/dnv-cb2/misc_cfg.h | 3 +-- hypervisor/arch/x86/configs/generic/misc_cfg.h | 3 +-- hypervisor/arch/x86/configs/nuc6cayh/misc_cfg.h | 3 +-- hypervisor/arch/x86/configs/nuc7i7dnb/misc_cfg.h | 3 +-- hypervisor/arch/x86/configs/whl-ipc-i5/misc_cfg.h | 3 +-- misc/acrn-config/xmls/config-xmls/apl-mrb/hybrid.xml | 2 +- misc/acrn-config/xmls/config-xmls/apl-mrb/industry.xml | 2 +- misc/acrn-config/xmls/config-xmls/apl-mrb/sdc.xml | 2 +- misc/acrn-config/xmls/config-xmls/apl-up2/hybrid.xml | 2 +- misc/acrn-config/xmls/config-xmls/apl-up2/industry.xml | 2 +- misc/acrn-config/xmls/config-xmls/apl-up2/sdc.xml | 2 +- misc/acrn-config/xmls/config-xmls/nuc6cayh/hybrid.xml | 2 +- misc/acrn-config/xmls/config-xmls/nuc6cayh/industry.xml | 2 +- misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc.xml | 2 +- misc/acrn-config/xmls/config-xmls/nuc7i7dnb/hybrid.xml | 2 +- misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry.xml | 2 +- misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc.xml | 2 +- misc/acrn-config/xmls/config-xmls/whl-ipc-i5/hybrid.xml | 2 +- misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry.xml | 2 +- misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc.xml | 2 +- misc/acrn-config/xmls/config-xmls/whl-ipc-i7/hybrid.xml | 2 +- misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry.xml | 2 +- misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc.xml | 2 +- misc/efi-stub/clearlinux/acrn.conf | 2 +- 26 files changed, 30 insertions(+), 37 deletions(-) diff --git a/hypervisor/arch/x86/configs/apl-mrb/misc_cfg.h b/hypervisor/arch/x86/configs/apl-mrb/misc_cfg.h index 8e9d80820..bd512c653 100644 --- a/hypervisor/arch/x86/configs/apl-mrb/misc_cfg.h +++ b/hypervisor/arch/x86/configs/apl-mrb/misc_cfg.h @@ -21,10 +21,9 @@ #define SOS_COM2_IRQ 10U #ifndef CONFIG_RELEASE -#define BOOTARG_DEBUG "hvlog=2M@0x6de00000 " \ - "memmap=0x200000$0x6de00000 " \ - "memmap=0x400000$0x6da00000 " \ - "ramoops.mem_address=0x6da00000 " \ +#define BOOTARG_DEBUG "hvlog=2M@0xe00000 " \ + "memmap=0x600000$0xa00000 " \ + "ramoops.mem_address=0xa00000 " \ "ramoops.mem_size=0x400000 " \ "ramoops.console_size=0x200000 " \ "reboot_panic=p,w " diff --git a/hypervisor/arch/x86/configs/apl-up2/misc_cfg.h b/hypervisor/arch/x86/configs/apl-up2/misc_cfg.h index 7bfbce53a..2819ee866 100644 --- a/hypervisor/arch/x86/configs/apl-up2/misc_cfg.h +++ b/hypervisor/arch/x86/configs/apl-up2/misc_cfg.h @@ -21,10 +21,9 @@ #define SOS_COM2_IRQ 3U #ifndef CONFIG_RELEASE -#define BOOTARG_DEBUG "hvlog=2M@0x5de00000 " \ - "memmap=0x200000$0x5de00000 " \ - "memmap=0x400000$0x5da00000 " \ - "ramoops.mem_address=0x5da00000 " \ +#define BOOTARG_DEBUG "hvlog=2M@0xe00000 " \ + "memmap=0x600000$0xa00000 " \ + "ramoops.mem_address=0xa00000 " \ "ramoops.mem_size=0x400000 " \ "ramoops.console_size=0x200000 " \ "reboot_panic=p,w " diff --git a/hypervisor/arch/x86/configs/dnv-cb2/misc_cfg.h b/hypervisor/arch/x86/configs/dnv-cb2/misc_cfg.h index 26371ac20..4cc4ed398 100644 --- a/hypervisor/arch/x86/configs/dnv-cb2/misc_cfg.h +++ b/hypervisor/arch/x86/configs/dnv-cb2/misc_cfg.h @@ -20,8 +20,7 @@ #define SOS_COM2_IRQ 3U #ifndef CONFIG_RELEASE -#define SOS_BOOTARGS_DIFF "hvlog=2M@0x1FE00000 " \ - "memmap=0x200000$0x1fe00000 " +#define SOS_BOOTARGS_DIFF "hvlog=2M@0xE00000 memmap=0x200000$0xE00000 " #else #define SOS_BOOTARGS_DIFF "" #endif diff --git a/hypervisor/arch/x86/configs/generic/misc_cfg.h b/hypervisor/arch/x86/configs/generic/misc_cfg.h index 164a27bfa..15773a97b 100644 --- a/hypervisor/arch/x86/configs/generic/misc_cfg.h +++ b/hypervisor/arch/x86/configs/generic/misc_cfg.h @@ -21,8 +21,7 @@ #define SOS_COM2_IRQ 3U #ifndef CONFIG_RELEASE -#define SOS_BOOTARGS_DIFF "hvlog=2M@0x1FE00000 " \ - "memmap=0x200000$0x1fe00000 " +#define SOS_BOOTARGS_DIFF "hvlog=2M@0xE00000 memmap=0x200000$0xE00000 " #else #define SOS_BOOTARGS_DIFF "" #endif diff --git a/hypervisor/arch/x86/configs/nuc6cayh/misc_cfg.h b/hypervisor/arch/x86/configs/nuc6cayh/misc_cfg.h index 3959c9e34..fa09dc7f9 100644 --- a/hypervisor/arch/x86/configs/nuc6cayh/misc_cfg.h +++ b/hypervisor/arch/x86/configs/nuc6cayh/misc_cfg.h @@ -20,8 +20,7 @@ #define SOS_COM2_IRQ 3U #ifndef CONFIG_RELEASE -#define SOS_BOOTARGS_DIFF "hvlog=2M@0x1FE00000 " \ - "memmap=0x200000$0x1fe00000 " +#define SOS_BOOTARGS_DIFF "hvlog=2M@0xE00000 memmap=0x200000$0xE00000 " #else #define SOS_BOOTARGS_DIFF "" #endif diff --git a/hypervisor/arch/x86/configs/nuc7i7dnb/misc_cfg.h b/hypervisor/arch/x86/configs/nuc7i7dnb/misc_cfg.h index b06cf65e0..3b4a1555c 100644 --- a/hypervisor/arch/x86/configs/nuc7i7dnb/misc_cfg.h +++ b/hypervisor/arch/x86/configs/nuc7i7dnb/misc_cfg.h @@ -21,8 +21,7 @@ #define SOS_COM2_IRQ 3U #ifndef CONFIG_RELEASE -#define SOS_BOOTARGS_DIFF "hvlog=2M@0x1FE00000 " \ - "memmap=0x200000$0x1fe00000 " +#define SOS_BOOTARGS_DIFF "hvlog=2M@0xE00000 memmap=0x200000$0xE00000 " #else #define SOS_BOOTARGS_DIFF "" #endif diff --git a/hypervisor/arch/x86/configs/whl-ipc-i5/misc_cfg.h b/hypervisor/arch/x86/configs/whl-ipc-i5/misc_cfg.h index f3f323420..fb05eacd6 100644 --- a/hypervisor/arch/x86/configs/whl-ipc-i5/misc_cfg.h +++ b/hypervisor/arch/x86/configs/whl-ipc-i5/misc_cfg.h @@ -22,8 +22,7 @@ #define SOS_COM2_IRQ 3U #ifndef CONFIG_RELEASE -#define SOS_BOOTARGS_DIFF "hvlog=2M@0x1FE00000 " \ - "memmap=0x200000$0x1fe00000 " +#define SOS_BOOTARGS_DIFF "hvlog=2M@0xE00000 memmap=0x200000$0xE00000 " #else #define SOS_BOOTARGS_DIFF "" #endif diff --git a/misc/acrn-config/xmls/config-xmls/apl-mrb/hybrid.xml b/misc/acrn-config/xmls/config-xmls/apl-mrb/hybrid.xml index 34618ee83..ff396c8d3 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-mrb/hybrid.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-mrb/hybrid.xml @@ -135,7 +135,7 @@ rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 idle=halt i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01070F i915.domain_plane_owners=0x011100001111 i915.enable_gvt=1 - hvlog=2M@0x6de00000 memmap=0x600000$0x6da00000 ramoops.mem_address=0x6da00000 ramoops.mem_size=0x400000 ramoops.console_size=0x200000 + hvlog=2M@0xe00000 memmap=0x600000$0xa00000 ramoops.mem_address=0xa00000 ramoops.mem_size=0x400000 ramoops.console_size=0x200000 reboot_panic=p,w module_blacklist=dwc3_pci i915.enable_initial_modeset=1 i915.enable_guc=0x02 video=DP-1:d video=DP-2:d cma=64M@0- panic_print=0x1f diff --git a/misc/acrn-config/xmls/config-xmls/apl-mrb/industry.xml b/misc/acrn-config/xmls/config-xmls/apl-mrb/industry.xml index 5369bf3c1..19d5d7916 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-mrb/industry.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-mrb/industry.xml @@ -88,7 +88,7 @@ rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 idle=halt i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1 - hvlog=2M@0x6de00000 memmap=0x600000$0x6da00000 ramoops.mem_address=0x6da00000 ramoops.mem_size=0x400000 ramoops.console_size=0x200000 + hvlog=2M@0xe00000 memmap=0x600000$0xa00000 ramoops.mem_address=0xa00000 ramoops.mem_size=0x400000 ramoops.console_size=0x200000 reboot_panic=p,w module_blacklist=dwc3_pci i915.enable_initial_modeset=1 i915.enable_guc=0x02 video=DP-1:d video=DP-2:d cma=64M@0- panic_print=0x1f diff --git a/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc.xml b/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc.xml index 81f511013..48ab4a305 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc.xml @@ -88,7 +88,7 @@ rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 idle=halt i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1 - hvlog=2M@0x6de00000 memmap=0x600000$0x6da00000 ramoops.mem_address=0x6da00000 ramoops.mem_size=0x400000 ramoops.console_size=0x200000 + hvlog=2M@0xe00000 memmap=0x600000$0xa00000 ramoops.mem_address=0xa00000 ramoops.mem_size=0x400000 ramoops.console_size=0x200000 reboot_panic=p,w module_blacklist=dwc3_pci i915.enable_initial_modeset=1 i915.enable_guc=0x02 video=DP-1:d video=DP-2:d cma=64M@0- panic_print=0x1f diff --git a/misc/acrn-config/xmls/config-xmls/apl-up2/hybrid.xml b/misc/acrn-config/xmls/config-xmls/apl-up2/hybrid.xml index 428c40433..b838ef6a4 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-up2/hybrid.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-up2/hybrid.xml @@ -135,7 +135,7 @@ rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 idle=halt i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01070F i915.domain_plane_owners=0x011100001111 i915.enable_gvt=1 - hvlog=2M@0x5de00000 memmap=0x600000$0x5da00000 ramoops.mem_address=0x5da00000 ramoops.mem_size=0x400000 ramoops.console_size=0x200000 + hvlog=2M@0xe00000 memmap=0x600000$0xa00000 ramoops.mem_address=0xa00000 ramoops.mem_size=0x400000 ramoops.console_size=0x200000 reboot_panic=p,w module_blacklist=dwc3_pci i915.enable_guc=0x02 cma=64M@0- diff --git a/misc/acrn-config/xmls/config-xmls/apl-up2/industry.xml b/misc/acrn-config/xmls/config-xmls/apl-up2/industry.xml index dcd29b9a0..4b6b5e464 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-up2/industry.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-up2/industry.xml @@ -88,7 +88,7 @@ rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 idle=halt i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1 - hvlog=2M@0x5de00000 memmap=0x600000$0x5da00000 ramoops.mem_address=0x5da00000 ramoops.mem_size=0x400000 ramoops.console_size=0x200000 + hvlog=2M@0xe00000 memmap=0x600000$0xa00000 ramoops.mem_address=0xa00000 ramoops.mem_size=0x400000 ramoops.console_size=0x200000 reboot_panic=p,w module_blacklist=dwc3_pci i915.enable_guc=0x02 cma=64M@0- diff --git a/misc/acrn-config/xmls/config-xmls/apl-up2/sdc.xml b/misc/acrn-config/xmls/config-xmls/apl-up2/sdc.xml index aca5426c6..3c7c0774f 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-up2/sdc.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-up2/sdc.xml @@ -88,7 +88,7 @@ rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 idle=halt i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1 - hvlog=2M@0x5de00000 memmap=0x600000$0x5da00000 ramoops.mem_address=0x5da00000 ramoops.mem_size=0x400000 ramoops.console_size=0x200000 + hvlog=2M@0xe00000 memmap=0x600000$0xa00000 ramoops.mem_address=0xa00000 ramoops.mem_size=0x400000 ramoops.console_size=0x200000 reboot_panic=p,w module_blacklist=dwc3_pci i915.enable_guc=0x02 cma=64M@0- diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/hybrid.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/hybrid.xml index 1fdd7c2e4..38da60951 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/hybrid.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/hybrid.xml @@ -135,7 +135,7 @@ rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 idle=halt i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01070F i915.domain_plane_owners=0x011100001111 i915.enable_gvt=1 - hvlog=2M@0x1fe00000 memmap=0x200000$0x1fe00000 + 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 e47300647..9463bb47e 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry.xml @@ -89,7 +89,7 @@ rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 idle=halt i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1 - hvlog=2M@0x1fe00000 memmap=0x200000$0x1fe00000 + hvlog=2M@0xe00000 memmap=0x200000$0xe00000 diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc.xml index beaa905b0..8a69f171b 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc.xml @@ -89,7 +89,7 @@ rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 idle=halt i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1 - hvlog=2M@0x1fe00000 memmap=0x200000$0x1fe00000 + hvlog=2M@0xe00000 memmap=0x200000$0xe00000 diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/hybrid.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/hybrid.xml index 0c45d816b..84df05668 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/hybrid.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/hybrid.xml @@ -135,7 +135,7 @@ rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 idle=halt i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01070F i915.domain_plane_owners=0x011100001111 i915.enable_gvt=1 - hvlog=2M@0x1fe00000 memmap=0x200000$0x1fe00000 + 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 26bec5534..4520a0c6f 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry.xml @@ -88,7 +88,7 @@ rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 idle=halt i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1 - hvlog=2M@0x1fe00000 memmap=0x200000$0x1fe00000 + hvlog=2M@0xe00000 memmap=0x200000$0xe00000 diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc.xml index 8dd60018e..2ee267667 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc.xml @@ -88,7 +88,7 @@ rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 idle=halt i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1 - hvlog=2M@0x1fe00000 memmap=0x200000$0x1fe00000 + hvlog=2M@0xe00000 memmap=0x200000$0xe00000 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 99db2a6ea..ce39d159a 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 @@ -135,7 +135,7 @@ rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 idle=halt i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01070F i915.domain_plane_owners=0x011100001111 i915.enable_gvt=1 - hvlog=2M@0x1fe00000 memmap=0x200000$0x1fe00000 + 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 8181b0192..0927af610 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 @@ -88,7 +88,7 @@ rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 idle=halt i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1 - hvlog=2M@0x1fe00000 memmap=0x200000$0x1fe00000 + hvlog=2M@0xe00000 memmap=0x200000$0xe00000 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 76e3c7bca..1ae4a1962 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 @@ -88,7 +88,7 @@ rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 idle=halt i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1 - hvlog=2M@0x1fe00000 memmap=0x200000$0x1fe00000 + hvlog=2M@0xe00000 memmap=0x200000$0xe00000 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 e91fd19e7..8ab762df1 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 @@ -135,7 +135,7 @@ rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 idle=halt i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01070F i915.domain_plane_owners=0x011100001111 i915.enable_gvt=1 - hvlog=2M@0x1fe00000 memmap=0x200000$0x1fe00000 + 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 1b5417cc6..c327194ac 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 @@ -88,7 +88,7 @@ rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 idle=halt i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1 - hvlog=2M@0x1fe00000 memmap=0x200000$0x1fe00000 + hvlog=2M@0xe00000 memmap=0x200000$0xe00000 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 1af6b189a..5bdd999cf 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 @@ -88,7 +88,7 @@ rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 idle=halt i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1 - hvlog=2M@0x1fe00000 memmap=0x200000$0x1fe00000 + hvlog=2M@0xe00000 memmap=0x200000$0xe00000 diff --git a/misc/efi-stub/clearlinux/acrn.conf b/misc/efi-stub/clearlinux/acrn.conf index 97ae1415c..7b95f435f 100755 --- a/misc/efi-stub/clearlinux/acrn.conf +++ b/misc/efi-stub/clearlinux/acrn.conf @@ -1,3 +1,3 @@ title The ACRN Service OS linux /EFI/org.clearlinux/kernel-org.clearlinux.iot-lts2018-sos.4.19.13-1901141830 -options console=tty0 console=ttyS0 root=PARTUUID= rw rootwait ignore_loglevel no_timer_check consoleblank=0 i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1 i915.enable_guc=0 hvlog=2M@0x1FE00000 memmap=2M$0x1FE00000 +options console=tty0 console=ttyS0 root=PARTUUID= rw rootwait ignore_loglevel no_timer_check consoleblank=0 i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1 i915.enable_guc=0 hvlog=2M@0xE00000 memmap=2M$0xE00000