From 398137990e78a7d0d4f5985136223eac8c3c4211 Mon Sep 17 00:00:00 2001 From: Victor Sun Date: Sun, 15 Sep 2019 12:42:47 +0800 Subject: [PATCH] HV: add memmap param for hvlog in sos cmdline Reserve memory for hv sbuf to avoid its possible overwriting on kernel memory. For apl-up2, move hv_log address to 0x5de00000 to avoid possible conflict with HV_RAM which start from 0x5e000000; For nuc6cayh, move HV_RAM_START to 0x20000000 to avoid possible conflict with hv_log which start from 0x1fe00000; Tracked-On: #3533 Signed-off-by: Victor Sun Reviewed-by: Binbin Wu --- hypervisor/arch/x86/configs/apl-mrb/misc_cfg.h | 1 + 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.config | 2 +- hypervisor/arch/x86/configs/nuc6cayh/misc_cfg.h | 3 ++- hypervisor/arch/x86/configs/nuc7i7dnb/misc_cfg.h | 3 ++- 7 files changed, 14 insertions(+), 8 deletions(-) diff --git a/hypervisor/arch/x86/configs/apl-mrb/misc_cfg.h b/hypervisor/arch/x86/configs/apl-mrb/misc_cfg.h index 008252422..5dbe607af 100644 --- a/hypervisor/arch/x86/configs/apl-mrb/misc_cfg.h +++ b/hypervisor/arch/x86/configs/apl-mrb/misc_cfg.h @@ -19,6 +19,7 @@ #ifndef CONFIG_RELEASE #define BOOTARG_DEBUG "hvlog=2M@0x6de00000 " \ + "memmap=0x200000$0x6de00000 " \ "memmap=0x400000$0x6da00000 " \ "ramoops.mem_address=0x6da00000 " \ "ramoops.mem_size=0x400000 " \ diff --git a/hypervisor/arch/x86/configs/apl-up2/misc_cfg.h b/hypervisor/arch/x86/configs/apl-up2/misc_cfg.h index dee3505e4..0b2bca85a 100644 --- a/hypervisor/arch/x86/configs/apl-up2/misc_cfg.h +++ b/hypervisor/arch/x86/configs/apl-up2/misc_cfg.h @@ -18,9 +18,10 @@ #define SOS_COM2_IRQ 3U #ifndef CONFIG_RELEASE -#define BOOTARG_DEBUG "hvlog=2M@0x6de00000 " \ - "memmap=0x400000$0x6da00000 " \ - "ramoops.mem_address=0x6da00000 " \ +#define BOOTARG_DEBUG "hvlog=2M@0x5de00000 " \ + "memmap=0x200000$0x5de00000 " \ + "memmap=0x400000$0x5da00000 " \ + "ramoops.mem_address=0x5da00000 " \ "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 09fa89b6d..3c8cb12da 100644 --- a/hypervisor/arch/x86/configs/dnv-cb2/misc_cfg.h +++ b/hypervisor/arch/x86/configs/dnv-cb2/misc_cfg.h @@ -17,7 +17,8 @@ #define SOS_COM2_IRQ 3U #ifndef CONFIG_RELEASE -#define SOS_BOOTARGS_DIFF "hvlog=2M@0x1FE00000" +#define SOS_BOOTARGS_DIFF "hvlog=2M@0x1FE00000 " \ + "memmap=0x200000$0x1fe00000 " #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 437ec0b81..f0e8ff1d4 100644 --- a/hypervisor/arch/x86/configs/generic/misc_cfg.h +++ b/hypervisor/arch/x86/configs/generic/misc_cfg.h @@ -18,7 +18,8 @@ #define SOS_COM2_IRQ 3U #ifndef CONFIG_RELEASE -#define SOS_BOOTARGS_DIFF "hvlog=2M@0x1FE00000" +#define SOS_BOOTARGS_DIFF "hvlog=2M@0x1FE00000 " \ + "memmap=0x200000$0x1fe00000 " #else #define SOS_BOOTARGS_DIFF "" #endif diff --git a/hypervisor/arch/x86/configs/nuc6cayh.config b/hypervisor/arch/x86/configs/nuc6cayh.config index 2e6bd73f0..147e9ecea 100644 --- a/hypervisor/arch/x86/configs/nuc6cayh.config +++ b/hypervisor/arch/x86/configs/nuc6cayh.config @@ -4,4 +4,4 @@ CONFIG_BOARD="nuc6cayh" # enable HSUART at PCI 0:18.0 by soldering Tx/Rx wires from M.2 connector; CONFIG_SERIAL_PCI=y CONFIG_SERIAL_PCI_BDF="0:18.0" -CONFIG_HV_RAM_START=0x12200000 +CONFIG_HV_RAM_START=0x20000000 diff --git a/hypervisor/arch/x86/configs/nuc6cayh/misc_cfg.h b/hypervisor/arch/x86/configs/nuc6cayh/misc_cfg.h index 09fa89b6d..3c8cb12da 100644 --- a/hypervisor/arch/x86/configs/nuc6cayh/misc_cfg.h +++ b/hypervisor/arch/x86/configs/nuc6cayh/misc_cfg.h @@ -17,7 +17,8 @@ #define SOS_COM2_IRQ 3U #ifndef CONFIG_RELEASE -#define SOS_BOOTARGS_DIFF "hvlog=2M@0x1FE00000" +#define SOS_BOOTARGS_DIFF "hvlog=2M@0x1FE00000 " \ + "memmap=0x200000$0x1fe00000 " #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 63ffbf941..44260c5a0 100644 --- a/hypervisor/arch/x86/configs/nuc7i7dnb/misc_cfg.h +++ b/hypervisor/arch/x86/configs/nuc7i7dnb/misc_cfg.h @@ -18,7 +18,8 @@ #define SOS_COM2_IRQ 3U #ifndef CONFIG_RELEASE -#define SOS_BOOTARGS_DIFF "hvlog=2M@0x1FE00000" +#define SOS_BOOTARGS_DIFF "hvlog=2M@0x1FE00000 " \ + "memmap=0x200000$0x1fe00000 " #else #define SOS_BOOTARGS_DIFF "" #endif