Skip to content

Commit b3ff3cd

Browse files
jsun26intelwenlingz
authored andcommitted
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 <victor.sun@intel.com> Reviewed-by: Binbin Wu <binbin.wu@intel.com>
1 parent a348be7 commit b3ff3cd

File tree

7 files changed

+14
-8
lines changed

7 files changed

+14
-8
lines changed

hypervisor/arch/x86/configs/apl-mrb/misc_cfg.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
#ifndef CONFIG_RELEASE
2121
#define BOOTARG_DEBUG "hvlog=2M@0x6de00000 " \
22+
"memmap=0x200000$0x6de00000 " \
2223
"memmap=0x400000$0x6da00000 " \
2324
"ramoops.mem_address=0x6da00000 " \
2425
"ramoops.mem_size=0x400000 " \

hypervisor/arch/x86/configs/apl-up2/misc_cfg.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@
1818
#define SOS_COM2_IRQ 3U
1919

2020
#ifndef CONFIG_RELEASE
21-
#define BOOTARG_DEBUG "hvlog=2M@0x6de00000 " \
22-
"memmap=0x400000$0x6da00000 " \
23-
"ramoops.mem_address=0x6da00000 " \
21+
#define BOOTARG_DEBUG "hvlog=2M@0x5de00000 " \
22+
"memmap=0x200000$0x5de00000 " \
23+
"memmap=0x400000$0x5da00000 " \
24+
"ramoops.mem_address=0x5da00000 " \
2425
"ramoops.mem_size=0x400000 " \
2526
"ramoops.console_size=0x200000 " \
2627
"reboot_panic=p,w "

hypervisor/arch/x86/configs/dnv-cb2/misc_cfg.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
#define SOS_COM2_IRQ 3U
1818

1919
#ifndef CONFIG_RELEASE
20-
#define SOS_BOOTARGS_DIFF "hvlog=2M@0x1FE00000"
20+
#define SOS_BOOTARGS_DIFF "hvlog=2M@0x1FE00000 " \
21+
"memmap=0x200000$0x1fe00000 "
2122
#else
2223
#define SOS_BOOTARGS_DIFF ""
2324
#endif

hypervisor/arch/x86/configs/generic/misc_cfg.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
#define SOS_COM2_IRQ 3U
1919

2020
#ifndef CONFIG_RELEASE
21-
#define SOS_BOOTARGS_DIFF "hvlog=2M@0x1FE00000"
21+
#define SOS_BOOTARGS_DIFF "hvlog=2M@0x1FE00000 " \
22+
"memmap=0x200000$0x1fe00000 "
2223
#else
2324
#define SOS_BOOTARGS_DIFF ""
2425
#endif

hypervisor/arch/x86/configs/nuc6cayh.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ CONFIG_BOARD="nuc6cayh"
44
# enable HSUART at PCI 0:18.0 by soldering Tx/Rx wires from M.2 connector;
55
CONFIG_SERIAL_PCI=y
66
CONFIG_SERIAL_PCI_BDF="0:18.0"
7-
CONFIG_HV_RAM_START=0x12200000
7+
CONFIG_HV_RAM_START=0x20000000

hypervisor/arch/x86/configs/nuc6cayh/misc_cfg.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
#define SOS_COM2_IRQ 3U
1818

1919
#ifndef CONFIG_RELEASE
20-
#define SOS_BOOTARGS_DIFF "hvlog=2M@0x1FE00000"
20+
#define SOS_BOOTARGS_DIFF "hvlog=2M@0x1FE00000 " \
21+
"memmap=0x200000$0x1fe00000 "
2122
#else
2223
#define SOS_BOOTARGS_DIFF ""
2324
#endif

hypervisor/arch/x86/configs/nuc7i7dnb/misc_cfg.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
#define SOS_COM2_IRQ 3U
1919

2020
#ifndef CONFIG_RELEASE
21-
#define SOS_BOOTARGS_DIFF "hvlog=2M@0x1FE00000"
21+
#define SOS_BOOTARGS_DIFF "hvlog=2M@0x1FE00000 " \
22+
"memmap=0x200000$0x1fe00000 "
2223
#else
2324
#define SOS_BOOTARGS_DIFF ""
2425
#endif

0 commit comments

Comments
 (0)