github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-27 07:46:53 +00:00
Code Issues Projects Releases Wiki Activity

acrn-config: some cleanup for logical partition mode Linux bootargs

Browse Source 
- commit 69152647 ("hv: Use virtual APIC IDs for Pre-launched VMs")
  enables virtual APIC IDs for pre-launched VMs thus xapic_phys is no
  longer needed to force guest xAPIC to work in physical destination mode.

- HVC is not available in logical partition mode and "console=hvc0" should
  be removed from guest Linux bootargs.

Tracked-On: #3854
Signed-off-by: Zide Chen <zide.chen@intel.com>
Acked-by: Victor Sun <victor.sun@intel.com>
This commit is contained in:
Zide Chen 2019-12-23 09:54:18 -08:00 committed by wenlingz
parent 8f9cda183e
commit fc78013fba
10 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/tutorials/using_partition_mode_on_up2.rst
View File

@ -204,9 +204,9 @@ Enable partition mode in ACRN hypervisor
#define VM0_CONFIG_MEM_SIZE 0x20000000UL #define VM0_CONFIG_MEM_SIZE 0x20000000UL
#define VM0_CONFIG_OS_NAME "ClearLinux 26600" #define VM0_CONFIG_OS_NAME "ClearLinux 26600"
#define VM0_CONFIG_OS_BOOTARGS "root=/dev/sda3 rw rootwait noxsave maxcpus=2 nohpet console=hvc0 \ #define VM0_CONFIG_OS_BOOTARGS "root=/dev/sda3 rw rootwait noxsave maxcpus=2 nohpet \
console=ttyS2 no_timer_check ignore_loglevel log_buf_len=16M \ console=ttyS2 no_timer_check ignore_loglevel log_buf_len=16M \
consoleblank=0 tsc=reliable xapic_phys" consoleblank=0 tsc=reliable"
#define VM1_CONFIGURED #define VM1_CONFIGURED
@ -218,9 +218,9 @@ Enable partition mode in ACRN hypervisor
#define VM1_CONFIG_MEM_SIZE 0x20000000UL #define VM1_CONFIG_MEM_SIZE 0x20000000UL
#define VM1_CONFIG_OS_NAME "ClearLinux 26600" #define VM1_CONFIG_OS_NAME "ClearLinux 26600"
#define VM1_CONFIG_OS_BOOTARGS "root=/dev/sda3 rw rootwait noxsave maxcpus=2 nohpet console=hvc0 \ #define VM1_CONFIG_OS_BOOTARGS "root=/dev/sda3 rw rootwait noxsave maxcpus=2 nohpet \
console=ttyS2 no_timer_check ignore_loglevel log_buf_len=16M \ console=ttyS2 no_timer_check ignore_loglevel log_buf_len=16M \
consoleblank=0 tsc=reliable xapic_phys" consoleblank=0 tsc=reliable"
#define VM0_CONFIG_PCI_PTDEV_NUM 2U #define VM0_CONFIG_PCI_PTDEV_NUM 2U
#define VM1_CONFIG_PCI_PTDEV_NUM 3U #define VM1_CONFIG_PCI_PTDEV_NUM 3U
@ -295,9 +295,9 @@ Enable partition mode in ACRN hypervisor
#define VM0_CONFIG_MEM_SIZE 0x20000000UL #define VM0_CONFIG_MEM_SIZE 0x20000000UL
#define VM0_CONFIG_OS_NAME "ClearLinux 26600" #define VM0_CONFIG_OS_NAME "ClearLinux 26600"
#define VM0_CONFIG_OS_BOOTARGS "root=/dev/sda3 rw rootwait noxsave maxcpus=2 nohpet console=hvc0 \ #define VM0_CONFIG_OS_BOOTARGS "root=/dev/sda3 rw rootwait noxsave maxcpus=2 nohpet \
console=ttyS2 no_timer_check ignore_loglevel log_buf_len=16M \ console=ttyS2 no_timer_check ignore_loglevel log_buf_len=16M \
consoleblank=0 tsc=reliable xapic_phys" consoleblank=0 tsc=reliable"
.. note:: .. note::

8
hypervisor/scenarios/logical_partition/vm_configurations.c
View File

@ -31,9 +31,9 @@ struct acrn_vm_config vm_configs[CONFIG_MAX_VM_NUM] = {
.bootargs = VM0_CONFIG_OS_BOOTARG_CONSOLE \ .bootargs = VM0_CONFIG_OS_BOOTARG_CONSOLE \
VM0_CONFIG_OS_BOOTARG_MAXCPUS \ VM0_CONFIG_OS_BOOTARG_MAXCPUS \
VM0_CONFIG_OS_BOOTARG_ROOT \ VM0_CONFIG_OS_BOOTARG_ROOT \
"rw rootwait noxsave nohpet console=hvc0 \ "rw rootwait noxsave nohpet \
no_timer_check ignore_loglevel log_buf_len=16M \ no_timer_check ignore_loglevel log_buf_len=16M \
consoleblank=0 tsc=reliable xapic_phys" consoleblank=0 tsc=reliable"
}, },
.vuart[0] = { .vuart[0] = {
.type = VUART_LEGACY_PIO, .type = VUART_LEGACY_PIO,
@ -71,9 +71,9 @@ struct acrn_vm_config vm_configs[CONFIG_MAX_VM_NUM] = {
.bootargs = VM1_CONFIG_OS_BOOTARG_CONSOLE \ .bootargs = VM1_CONFIG_OS_BOOTARG_CONSOLE \
VM1_CONFIG_OS_BOOTARG_MAXCPUS \ VM1_CONFIG_OS_BOOTARG_MAXCPUS \
VM1_CONFIG_OS_BOOTARG_ROOT \ VM1_CONFIG_OS_BOOTARG_ROOT \
"rw rootwait noxsave nohpet console=hvc0 \ "rw rootwait noxsave nohpet \
no_timer_check ignore_loglevel log_buf_len=16M \ no_timer_check ignore_loglevel log_buf_len=16M \
consoleblank=0 tsc=reliable xapic_phys" consoleblank=0 tsc=reliable"
}, },
.vuart[0] = { .vuart[0] = {
.type = VUART_LEGACY_PIO, .type = VUART_LEGACY_PIO,

6
misc/acrn-config/xmls/config-xmls/apl-mrb/logical_partition.xml
View File

@ -29,7 +29,7 @@
<console configurable="0" desc="ttyS console for Linux kernel">/dev/ttyS0</console> <console configurable="0" desc="ttyS console for Linux kernel">/dev/ttyS0</console>
<rootfs desc="rootfs for Linux kernel">/dev/mmcblk1p1</rootfs> <rootfs desc="rootfs for Linux kernel">/dev/mmcblk1p1</rootfs>
<bootargs desc="Specify kernel boot arguments"> <bootargs desc="Specify kernel boot arguments">
rw rootwait noxsave nohpet console=hvc0 no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable xapic_phys rw rootwait noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable
</bootargs> </bootargs>
</os_config> </os_config>
<vuart id="0"> <vuart id="0">
@ -78,8 +78,8 @@
<console configurable="0" desc="ttyS console for Linux kernel">/dev/ttyS0</console> <console configurable="0" desc="ttyS console for Linux kernel">/dev/ttyS0</console>
<rootfs desc="rootfs for Linux kernel" readonly="true">/dev/sda3</rootfs> <rootfs desc="rootfs for Linux kernel" readonly="true">/dev/sda3</rootfs>
<bootargs desc="Specify kernel boot arguments"> <bootargs desc="Specify kernel boot arguments">
rw rootwait noxsave nohpet console=hvc0 no_timer_check ignore_loglevel log_buf_len=16M rw rootwait noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M
consoleblank=0 tsc=reliable xapic_phys consoleblank=0 tsc=reliable
</bootargs> </bootargs>
</os_config> </os_config>
<vuart id="0"> <vuart id="0">

6
misc/acrn-config/xmls/config-xmls/apl-up2-n3350/logical_partition.xml
View File

@ -29,7 +29,7 @@
<console configurable="0" desc="ttyS console for Linux kernel">/dev/ttyS0</console> <console configurable="0" desc="ttyS console for Linux kernel">/dev/ttyS0</console>
<rootfs desc="rootfs for Linux kernel">/dev/sda3</rootfs> <rootfs desc="rootfs for Linux kernel">/dev/sda3</rootfs>
<bootargs desc="Specify kernel boot arguments"> <bootargs desc="Specify kernel boot arguments">
rw rootwait noxsave nohpet console=hvc0 no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable xapic_phys rw rootwait noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable
</bootargs> </bootargs>
</os_config> </os_config>
<vuart id="0"> <vuart id="0">
@ -77,8 +77,8 @@
<console configurable="0" desc="ttyS console for Linux kernel">/dev/ttyS0</console> <console configurable="0" desc="ttyS console for Linux kernel">/dev/ttyS0</console>
<rootfs desc="rootfs for Linux kernel" readonly="true">/dev/sda3</rootfs> <rootfs desc="rootfs for Linux kernel" readonly="true">/dev/sda3</rootfs>
<bootargs desc="Specify kernel boot arguments"> <bootargs desc="Specify kernel boot arguments">
rw rootwait noxsave nohpet console=hvc0 no_timer_check ignore_loglevel log_buf_len=16M rw rootwait noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M
consoleblank=0 tsc=reliable xapic_phys consoleblank=0 tsc=reliable
</bootargs> </bootargs>
</os_config> </os_config>
<vuart id="0"> <vuart id="0">

6
misc/acrn-config/xmls/config-xmls/apl-up2/logical_partition.xml
View File

@ -30,7 +30,7 @@
<console configurable="0" desc="ttyS console for Linux kernel">/dev/ttyS0</console> <console configurable="0" desc="ttyS console for Linux kernel">/dev/ttyS0</console>
<rootfs desc="rootfs for Linux kernel">/dev/sda3</rootfs> <rootfs desc="rootfs for Linux kernel">/dev/sda3</rootfs>
<bootargs desc="Specify kernel boot arguments"> <bootargs desc="Specify kernel boot arguments">
rw rootwait noxsave nohpet console=hvc0 no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable xapic_phys rw rootwait noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable
</bootargs> </bootargs>
</os_config> </os_config>
<vuart id="0"> <vuart id="0">
@ -79,8 +79,8 @@
<console configurable="0" desc="ttyS console for Linux kernel">/dev/ttyS0</console> <console configurable="0" desc="ttyS console for Linux kernel">/dev/ttyS0</console>
<rootfs desc="rootfs for Linux kernel" readonly="true">/dev/sda3</rootfs> <rootfs desc="rootfs for Linux kernel" readonly="true">/dev/sda3</rootfs>
<bootargs desc="Specify kernel boot arguments"> <bootargs desc="Specify kernel boot arguments">
rw rootwait noxsave nohpet console=hvc0 no_timer_check ignore_loglevel log_buf_len=16M rw rootwait noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M
consoleblank=0 tsc=reliable xapic_phys consoleblank=0 tsc=reliable
</bootargs> </bootargs>
</os_config> </os_config>
<vuart id="0"> <vuart id="0">

6
misc/acrn-config/xmls/config-xmls/generic/logical_partition.xml
View File

@ -30,7 +30,7 @@
<console configurable="0" desc="ttyS console for Linux kernel">/dev/ttyS0</console> <console configurable="0" desc="ttyS console for Linux kernel">/dev/ttyS0</console>
<rootfs desc="rootfs for Linux kernel">/dev/sda3</rootfs> <rootfs desc="rootfs for Linux kernel">/dev/sda3</rootfs>
<bootargs desc="Specify kernel boot arguments"> <bootargs desc="Specify kernel boot arguments">
rw rootwait noxsave nohpet console=hvc0 no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable xapic_phys rw rootwait noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable
</bootargs> </bootargs>
</os_config> </os_config>
<vuart id="0"> <vuart id="0">
@ -79,8 +79,8 @@
<console configurable="0" desc="ttyS console for Linux kernel">/dev/ttyS0</console> <console configurable="0" desc="ttyS console for Linux kernel">/dev/ttyS0</console>
<rootfs desc="rootfs for Linux kernel" readonly="true">/dev/sda3</rootfs> <rootfs desc="rootfs for Linux kernel" readonly="true">/dev/sda3</rootfs>
<bootargs desc="Specify kernel boot arguments"> <bootargs desc="Specify kernel boot arguments">
rw rootwait noxsave nohpet console=hvc0 no_timer_check ignore_loglevel log_buf_len=16M rw rootwait noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M
consoleblank=0 tsc=reliable xapic_phys consoleblank=0 tsc=reliable
</bootargs> </bootargs>
</os_config> </os_config>
<vuart id="0"> <vuart id="0">

6
misc/acrn-config/xmls/config-xmls/nuc6cayh/logical_partition.xml
View File

@ -30,7 +30,7 @@
<console configurable="0" desc="ttyS console for Linux kernel">/dev/ttyS0</console> <console configurable="0" desc="ttyS console for Linux kernel">/dev/ttyS0</console>
<rootfs desc="rootfs for Linux kernel">/dev/sda3</rootfs> <rootfs desc="rootfs for Linux kernel">/dev/sda3</rootfs>
<bootargs desc="Specify kernel boot arguments"> <bootargs desc="Specify kernel boot arguments">
rw rootwait noxsave nohpet console=hvc0 no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable xapic_phys rw rootwait noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable
</bootargs> </bootargs>
</os_config> </os_config>
<vuart id="0"> <vuart id="0">
@ -79,8 +79,8 @@
<console configurable="0" desc="ttyS console for Linux kernel">/dev/ttyS0</console> <console configurable="0" desc="ttyS console for Linux kernel">/dev/ttyS0</console>
<rootfs desc="rootfs for Linux kernel" readonly="true">/dev/sda3</rootfs> <rootfs desc="rootfs for Linux kernel" readonly="true">/dev/sda3</rootfs>
<bootargs desc="Specify kernel boot arguments"> <bootargs desc="Specify kernel boot arguments">
rw rootwait noxsave nohpet console=hvc0 no_timer_check ignore_loglevel log_buf_len=16M rw rootwait noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M
consoleblank=0 tsc=reliable xapic_phys consoleblank=0 tsc=reliable
</bootargs> </bootargs>
</os_config> </os_config>
<vuart id="0"> <vuart id="0">

6
misc/acrn-config/xmls/config-xmls/nuc7i7dnb/logical_partition.xml
View File

@ -30,7 +30,7 @@
<console configurable="0" desc="ttyS console for Linux kernel">/dev/ttyS0</console> <console configurable="0" desc="ttyS console for Linux kernel">/dev/ttyS0</console>
<rootfs desc="rootfs for Linux kernel">/dev/sda3</rootfs> <rootfs desc="rootfs for Linux kernel">/dev/sda3</rootfs>
<bootargs desc="Specify kernel boot arguments"> <bootargs desc="Specify kernel boot arguments">
rw rootwait noxsave nohpet console=hvc0 no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable xapic_phys rw rootwait noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable
</bootargs> </bootargs>
</os_config> </os_config>
<vuart id="0"> <vuart id="0">
@ -79,8 +79,8 @@
<console configurable="0" desc="ttyS console for Linux kernel">/dev/ttyS0</console> <console configurable="0" desc="ttyS console for Linux kernel">/dev/ttyS0</console>
<rootfs desc="rootfs for Linux kernel" readonly="true">/dev/sda3</rootfs> <rootfs desc="rootfs for Linux kernel" readonly="true">/dev/sda3</rootfs>
<bootargs desc="Specify kernel boot arguments"> <bootargs desc="Specify kernel boot arguments">
rw rootwait noxsave nohpet console=hvc0 no_timer_check ignore_loglevel log_buf_len=16M rw rootwait noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M
consoleblank=0 tsc=reliable xapic_phys consoleblank=0 tsc=reliable
</bootargs> </bootargs>
</os_config> </os_config>
<vuart id="0"> <vuart id="0">

6
misc/acrn-config/xmls/config-xmls/whl-ipc-i5/logical_partition.xml
View File

@ -30,7 +30,7 @@
<console configurable="0" desc="ttyS console for Linux kernel">/dev/ttyS0</console> <console configurable="0" desc="ttyS console for Linux kernel">/dev/ttyS0</console>
<rootfs desc="rootfs for Linux kernel">/dev/sda3</rootfs> <rootfs desc="rootfs for Linux kernel">/dev/sda3</rootfs>
<bootargs desc="Specify kernel boot arguments"> <bootargs desc="Specify kernel boot arguments">
rw rootwait noxsave nohpet console=hvc0 no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable xapic_phys rw rootwait noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable
</bootargs> </bootargs>
</os_config> </os_config>
<vuart id="0"> <vuart id="0">
@ -79,8 +79,8 @@
<console configurable="0" desc="ttyS console for Linux kernel">/dev/ttyS0</console> <console configurable="0" desc="ttyS console for Linux kernel">/dev/ttyS0</console>
<rootfs desc="rootfs for Linux kernel" readonly="true">/dev/sda3</rootfs> <rootfs desc="rootfs for Linux kernel" readonly="true">/dev/sda3</rootfs>
<bootargs desc="Specify kernel boot arguments"> <bootargs desc="Specify kernel boot arguments">
rw rootwait noxsave nohpet console=hvc0 no_timer_check ignore_loglevel log_buf_len=16M rw rootwait noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M
consoleblank=0 tsc=reliable xapic_phys consoleblank=0 tsc=reliable
</bootargs> </bootargs>
</os_config> </os_config>
<vuart id="0"> <vuart id="0">

6
misc/acrn-config/xmls/config-xmls/whl-ipc-i7/logical_partition.xml
View File

@ -30,7 +30,7 @@
<console configurable="0" desc="ttyS console for Linux kernel">/dev/ttyS0</console> <console configurable="0" desc="ttyS console for Linux kernel">/dev/ttyS0</console>
<rootfs desc="rootfs for Linux kernel">/dev/sda3</rootfs> <rootfs desc="rootfs for Linux kernel">/dev/sda3</rootfs>
<bootargs desc="Specify kernel boot arguments"> <bootargs desc="Specify kernel boot arguments">
rw rootwait noxsave nohpet console=hvc0 no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable xapic_phys rw rootwait noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable
</bootargs> </bootargs>
</os_config> </os_config>
<vuart id="0"> <vuart id="0">
@ -79,8 +79,8 @@
<console configurable="0" desc="ttyS console for Linux kernel">/dev/ttyS0</console> <console configurable="0" desc="ttyS console for Linux kernel">/dev/ttyS0</console>
<rootfs desc="rootfs for Linux kernel" readonly="true">/dev/sda3</rootfs> <rootfs desc="rootfs for Linux kernel" readonly="true">/dev/sda3</rootfs>
<bootargs desc="Specify kernel boot arguments"> <bootargs desc="Specify kernel boot arguments">
rw rootwait noxsave nohpet console=hvc0 no_timer_check ignore_loglevel log_buf_len=16M rw rootwait noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M
consoleblank=0 tsc=reliable xapic_phys consoleblank=0 tsc=reliable
</bootargs> </bootargs>
</os_config> </os_config>
<vuart id="0"> <vuart id="0">