Skip to content

Commit e000688

Browse files
jsun26intelwenlingz
authored andcommitted
acrn-config: add memmap param for hvlog in xmls
Reserve memory for hv sbuf to avoid its possible overwriting on kernel memory, need to update the kernel param in corresponding config-xmls; Tracked-On: #3602 Signed-off-by: Victor Sun <victor.sun@intel.com>
1 parent b3ff3cd commit e000688

File tree

20 files changed

+20
-20
lines changed

20 files changed

+20
-20
lines changed

misc/acrn-config/xmls/config-xmls/apl-mrb/hybrid.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<bootargs desc="Specify kernel boot arguments">
7878
rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
7979
i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1
80-
hvlog=2M@0x6de00000 memmap=0x400000$0x6da00000 ramoops.mem_address=0x6da00000 ramoops.mem_size=0x400000 ramoops.console_size=0x200000
80+
hvlog=2M@0x6de00000 memmap=0x600000$0x6da00000 ramoops.mem_address=0x6da00000 ramoops.mem_size=0x400000 ramoops.console_size=0x200000
8181
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
8282
</bootargs>
8383
</board_private>

misc/acrn-config/xmls/config-xmls/apl-mrb/industry.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<bootargs desc="Specify kernel boot arguments">
3838
rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
3939
i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1
40-
hvlog=2M@0x6de00000 memmap=0x400000$0x6da00000 ramoops.mem_address=0x6da00000 ramoops.mem_size=0x400000 ramoops.console_size=0x200000
40+
hvlog=2M@0x6de00000 memmap=0x600000$0x6da00000 ramoops.mem_address=0x6da00000 ramoops.mem_size=0x400000 ramoops.console_size=0x200000
4141
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
4242
</bootargs>
4343
</board_private>

misc/acrn-config/xmls/config-xmls/apl-mrb/sdc.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<bootargs desc="Specify kernel boot arguments">
3838
rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
3939
i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1
40-
hvlog=2M@0x6de00000 memmap=0x400000$0x6da00000 ramoops.mem_address=0x6da00000 ramoops.mem_size=0x400000 ramoops.console_size=0x200000
40+
hvlog=2M@0x6de00000 memmap=0x600000$0x6da00000 ramoops.mem_address=0x6da00000 ramoops.mem_size=0x400000 ramoops.console_size=0x200000
4141
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
4242
</bootargs>
4343
</board_private>

misc/acrn-config/xmls/config-xmls/apl-mrb/sdc2.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<bootargs desc="Specify kernel boot arguments">
3838
rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
3939
i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1
40-
hvlog=2M@0x6de00000 memmap=0x400000$0x6da00000 ramoops.mem_address=0x6da00000 ramoops.mem_size=0x400000 ramoops.console_size=0x200000
40+
hvlog=2M@0x6de00000 memmap=0x600000$0x6da00000 ramoops.mem_address=0x6da00000 ramoops.mem_size=0x400000 ramoops.console_size=0x200000
4141
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
4242
</bootargs>
4343
</board_private>

misc/acrn-config/xmls/config-xmls/apl-up2/hybrid.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<bootargs desc="Specify kernel boot arguments">
7878
rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
7979
i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1
80-
hvlog=2M@0x6de00000 memmap=0x400000$0x6da00000 ramoops.mem_address=0x6da00000 ramoops.mem_size=0x400000 ramoops.console_size=0x200000
80+
hvlog=2M@0x5de00000 memmap=0x600000$0x5da00000 ramoops.mem_address=0x5da00000 ramoops.mem_size=0x400000 ramoops.console_size=0x200000
8181
reboot_panic=p,w module_blacklist=dwc3_pci i915.enable_guc=0x02 cma=64M@0-
8282
</bootargs>
8383
</board_private>

misc/acrn-config/xmls/config-xmls/apl-up2/industry.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<bootargs desc="Specify kernel boot arguments">
3838
rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
3939
i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1
40-
hvlog=2M@0x6de00000 memmap=0x400000$0x6da00000 ramoops.mem_address=0x6da00000 ramoops.mem_size=0x400000 ramoops.console_size=0x200000
40+
hvlog=2M@0x5de00000 memmap=0x600000$0x5da00000 ramoops.mem_address=0x5da00000 ramoops.mem_size=0x400000 ramoops.console_size=0x200000
4141
reboot_panic=p,w module_blacklist=dwc3_pci i915.enable_guc=0x02 cma=64M@0-
4242
</bootargs>
4343
</board_private>

misc/acrn-config/xmls/config-xmls/apl-up2/sdc.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<bootargs desc="Specify kernel boot arguments">
3838
rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
3939
i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1
40-
hvlog=2M@0x6de00000 memmap=0x400000$0x6da00000 ramoops.mem_address=0x6da00000 ramoops.mem_size=0x400000 ramoops.console_size=0x200000
40+
hvlog=2M@0x5de00000 memmap=0x600000$0x5da00000 ramoops.mem_address=0x5da00000 ramoops.mem_size=0x400000 ramoops.console_size=0x200000
4141
reboot_panic=p,w module_blacklist=dwc3_pci i915.enable_guc=0x02 cma=64M@0-
4242
</bootargs>
4343
</board_private>

misc/acrn-config/xmls/config-xmls/apl-up2/sdc2.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<bootargs desc="Specify kernel boot arguments">
3838
rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
3939
i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1
40-
hvlog=2M@0x6de00000 memmap=0x400000$0x6da00000 ramoops.mem_address=0x6da00000 ramoops.mem_size=0x400000 ramoops.console_size=0x200000
40+
hvlog=2M@0x5de00000 memmap=0x600000$0x5da00000 ramoops.mem_address=0x5da00000 ramoops.mem_size=0x400000 ramoops.console_size=0x200000
4141
reboot_panic=p,w module_blacklist=dwc3_pci i915.enable_guc=0x02 cma=64M@0-
4242
</bootargs>
4343
</board_private>

misc/acrn-config/xmls/config-xmls/generic/hybrid.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<bootargs desc="Specify kernel boot arguments">
7878
rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
7979
i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1
80-
hvlog=2M@0x1fe00000
80+
hvlog=2M@0x1fe00000 memmap=0x200000$0x1fe00000
8181
</bootargs>
8282
</board_private>
8383
</vm>

misc/acrn-config/xmls/config-xmls/generic/industry.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<bootargs desc="Specify kernel boot arguments">
3838
rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
3939
i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1
40-
hvlog=2M@0x1fe00000
40+
hvlog=2M@0x1fe00000 memmap=0x200000$0x1fe00000
4141
</bootargs>
4242
</board_private>
4343
</vm>

0 commit comments

Comments
 (0)