Skip to content

Commit 7ca1a7d

Browse files
Signed-off-by: Aviad Nisselwenlingz
authored andcommitted
dm: launch_uos.sh add virtio_mei mediator
Detect if SOS kernel mei drivers supports virtualization, via driver hbm version 2.2 If yes use virtio_mei mediator for the mei device otherwise fallback to passthrou mode. Note that HBM version is not sufficient identification Tracked-On: #1536 Signed-off-by: Aviad Nissel <aviad.nissel@intel.com> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Acked-by: Wang, Yu1 <yu1.wang@intel.com>
1 parent 201e5ce commit 7ca1a7d

File tree

1 file changed

+31
-12
lines changed

1 file changed

+31
-12
lines changed

devicemodel/samples/apl-mrb/launch_uos.sh

Lines changed: 31 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,15 @@ if [ "$kernel_version" = "4.19" ]; then
1010
ipu_passthrough=1
1111
fi
1212

13+
cse_passthrough=0
14+
hbm_ver=`cat /sys/class/mei/mei0/hbm_ver`
15+
major_ver=`echo $hbm_ver | cut -d '.' -f1`
16+
minor_ver=`echo $hbm_ver | cut -d '.' -f2`
17+
if [[ "$major_ver" -lt "2" ]] || \
18+
[[ "$major_ver" == "2" && "$minor_ver" -lt "2" ]]; then
19+
cse_passthrough=1
20+
fi
21+
1322
function launch_clearlinux()
1423
{
1524
if [ ! -f "/data/$5/$5.img" ]; then
@@ -54,11 +63,6 @@ echo "8086 5aaa" > /sys/bus/pci/drivers/pci-stub/new_id
5463
echo "0000:00:15.1" > /sys/bus/pci/devices/0000:00:15.1/driver/unbind
5564
echo "0000:00:15.1" > /sys/bus/pci/drivers/pci-stub/bind
5665

57-
#For CSME passthrough
58-
echo "8086 5a9a" > /sys/bus/pci/drivers/pci-stub/new_id
59-
echo "0000:00:0f.0" > /sys/bus/pci/devices/0000:00:0f.0/driver/unbind
60-
echo "0000:00:0f.0" > /sys/bus/pci/drivers/pci-stub/bind
61-
6266
boot_ipu_option=""
6367
if [ $ipu_passthrough == 1 ];then
6468
# for ipu passthrough - ipu device 0:3.0
@@ -82,6 +86,16 @@ else
8286
boot_ipu_option="$boot_ipu_option"" -s 21,virtio-ipu "
8387
fi
8488

89+
boot_cse_option=""
90+
if [ $cse_passthrough == 1 ]; then
91+
echo "8086 5a9a" > /sys/bus/pci/drivers/pci-stub/new_id
92+
echo "0000:00:0f.0" > /sys/bus/pci/devices/0000:00:0f.0/driver/unbind
93+
echo "0000:00:0f.0" > /sys/bus/pci/drivers/pci-stub/bind
94+
boot_cse_option="$boot_cse_option"" -s 15,passthru,0/0f/0 "
95+
else
96+
boot_cse_option="$boot_cse_option"" -s 15,virtio-heci,d1 "
97+
fi
98+
8599
# for sd card passthrough - SDXC/MMC Host Controller 00:1b.0
86100
echo "8086 5aca" > /sys/bus/pci/drivers/pci-stub/new_id
87101
echo "0000:00:1b.0" > /sys/bus/pci/devices/0000:00:1b.0/driver/unbind
@@ -127,7 +141,7 @@ acrn-dm -A -m $mem_size -c $2$boot_GVT_option"$GVT_args" -s 0:0,hostbridge -s 1:
127141
-s 4,virtio-net,$tap $boot_image_option \
128142
-s 7,xhci,1-1:1-2:1-3:2-1:2-2:2-3:cap=apl \
129143
-s 9,passthru,0/15/1 \
130-
-s 15,passthru,0/f/0 \
144+
$boot_cse_option \
131145
-s 27,passthru,0/1b/0 \
132146
$boot_ipu_option \
133147
-i /run/acrn/ioc_$vm_name,0x20 \
@@ -198,11 +212,6 @@ echo "8086 5ab4" > /sys/bus/pci/drivers/pci-stub/new_id
198212
echo "0000:00:17.0" > /sys/bus/pci/devices/0000:00:17.0/driver/unbind
199213
echo "0000:00:17.0" > /sys/bus/pci/drivers/pci-stub/bind
200214

201-
#For CSME passthrough
202-
echo "8086 5a9a" > /sys/bus/pci/drivers/pci-stub/new_id
203-
echo "0000:00:0f.0" > /sys/bus/pci/devices/0000:00:0f.0/driver/unbind
204-
echo "0000:00:0f.0" > /sys/bus/pci/drivers/pci-stub/bind
205-
206215
# for sd card passthrough - SDXC/MMC Host Controller 00:1b.0
207216
echo "8086 5aca" > /sys/bus/pci/drivers/pci-stub/new_id
208217
echo "0000:00:1b.0" > /sys/bus/pci/devices/0000:00:1b.0/driver/unbind
@@ -252,6 +261,16 @@ else
252261
boot_ipu_option="$boot_ipu_option"" -s 21,virtio-ipu "
253262
fi
254263

264+
boot_cse_option=""
265+
if [ $cse_passthrough == 1 ]; then
266+
echo "8086 5a9a" > /sys/bus/pci/drivers/pci-stub/new_id
267+
echo "0000:00:0f.0" > /sys/bus/pci/devices/0000:00:0f.0/driver/unbind
268+
echo "0000:00:0f.0" > /sys/bus/pci/drivers/pci-stub/bind
269+
boot_cse_option="$boot_cse_option"" -s 15,passthru,0/0f/0 "
270+
else
271+
boot_cse_option="$boot_cse_option"" -s 15,virtio-heci,d1 "
272+
fi
273+
255274
#for memsize setting
256275
memsize=`cat /proc/meminfo|head -n 1|awk '{print $2}'`
257276
if [ $memsize -gt 8000000 ];then
@@ -311,7 +330,7 @@ fi
311330
-s 11,wdt-i6300esb \
312331
-s 14,passthru,0/e/0,keep_gsi \
313332
-s 23,passthru,0/17/0 \
314-
-s 15,passthru,0/f/0 \
333+
$boot_cse_option \
315334
-s 27,passthru,0/1b/0 \
316335
-s 24,passthru,0/18/0 \
317336
-s 18,passthru,3/0/0,keep_gsi \

0 commit comments

Comments
 (0)