Skip to content

Commit c3eb0d7

Browse files
fuzhonglacrnsi
authored andcommitted
dm: switch to launch RT_LaaG with OVMF by default
The default script is for nvme passthrough to RT_LaaG; you can change it to sata or using virtio_blk Tracked-On: #3575 Signed-off-by: fuzhongl <fuzhong.liu@intel.com> Reviewed-by: binbin.wu@intel.com; kaige.fu@intel.com
1 parent 8c9c887 commit c3eb0d7

File tree

1 file changed

+27
-8
lines changed

1 file changed

+27
-8
lines changed

devicemodel/samples/nuc/launch_hard_rt_vm.sh

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@ declare -A passthru_bdf
88
passthru_vpid=(
99
["eth"]="8086 156f"
1010
["sata"]="8086 9d03"
11+
["nvme"]="8086 f1a6"
1112
)
1213
passthru_bdf=(
1314
["eth"]="0000:00:1f.6"
1415
["sata"]="0000:00:17.0"
16+
["nvme"]="0000:02:0.0"
1517
)
1618

1719
function launch_hard_rt_vm()
@@ -26,28 +28,45 @@ modprobe pci_stub
2628
#echo ${passthru_bdf["eth"]} > /sys/bus/pci/drivers/pci-stub/bind
2729

2830
# SATA pass-through
29-
echo ${passthru_vpid["sata"]} > /sys/bus/pci/drivers/pci-stub/new_id
30-
echo ${passthru_bdf["sata"]} > /sys/bus/pci/devices/${passthru_bdf["sata"]}/driver/unbind
31-
echo ${passthru_bdf["sata"]} > /sys/bus/pci/drivers/pci-stub/bind
31+
#echo ${passthru_vpid["sata"]} > /sys/bus/pci/drivers/pci-stub/new_id
32+
#echo ${passthru_bdf["sata"]} > /sys/bus/pci/devices/${passthru_bdf["sata"]}/driver/unbind
33+
#echo ${passthru_bdf["sata"]} > /sys/bus/pci/drivers/pci-stub/bind
34+
35+
# NVME pass-through
36+
echo ${passthru_vpid["nvme"]} > /sys/bus/pci/drivers/pci-stub/new_id
37+
echo ${passthru_bdf["nvme"]} > /sys/bus/pci/devices/${passthru_bdf["nvme"]}/driver/unbind
38+
echo ${passthru_bdf["nvme"]} > /sys/bus/pci/drivers/pci-stub/bind
3239

3340
# for pm setting
3441
pm_channel="--pm_notify_channel uart "
3542
pm_by_vuart="--pm_by_vuart tty,/dev/ttyS1"
3643

3744

3845
/usr/bin/acrn-dm -A -m $mem_size -s 0:0,hostbridge \
39-
-k /usr/lib/kernel/default-iot-lts2018-preempt-rt \
4046
--lapic_pt \
4147
--rtvm \
4248
--virtio_poll 1000000 \
43-
-s 2,passthru,0/17/0 \
49+
-U 495ae2e5-2603-4d64-af76-d4bc5a8ec0e5 \
50+
-s 2,passthru,02/0/0 \
4451
-s 3,virtio-console,@stdio:stdio_port \
4552
$pm_channel $pm_by_vuart \
46-
-B "root=/dev/sda3 rw rootwait maxcpus=$1 nohpet console=hvc0 \
47-
no_timer_check ignore_loglevel log_buf_len=16M \
48-
consoleblank=0 tsc=reliable x2apic_phys" hard_rtvm
53+
--ovmf /usr/share/acrn/bios/OVMF.fd \
54+
hard_rtvm
55+
4956
}
5057

58+
# -s 2,passthru,0/17/0 \ #please using "lspci -nn" check the bdf info
59+
60+
# Depends on which partation RT_LaaG is installed in;maybe need to change
61+
# /dev/nvme0n1p3 to /dev/sda3 on NUC and uncomment SATA pass-through
62+
# Add following RT_LaaG kernel cmdline into loader/entries/xxx.conf of EFI partation
63+
#root=/dev/nvme0n1p3 rw rootwait nohpet console=hvc0 console=ttyS0 \
64+
#no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 \
65+
#clocksource=tsc tsc=reliable x2apic_phys processor.max_cstate=0 \
66+
#intel_idle.max_cstate=0 intel_pstate=disabled mce=ignore_ce audit=0 \
67+
#isolcpus=nohz,domain,1 nohz_full=1 rcu_nocbs=1 nosoftlockup idle=poll \
68+
#irqaffinity=0
69+
5170
# offline SOS CPUs except BSP before launch UOS
5271
for i in `ls -d /sys/devices/system/cpu/cpu[1-99]`; do
5372
online=`cat $i/online`

0 commit comments

Comments
 (0)