From d82a86e648ec2e76a39fe310f1d7e05b6f406f87 Mon Sep 17 00:00:00 2001 From: Liang Yang Date: Thu, 16 Aug 2018 08:39:39 +0800 Subject: [PATCH] DM USB: xHCI: enable USB xHCI emulation in LaaG and AaaG. Change launch_uos.sh to enable USB xHCI full emulation support. Signed-off-by: Liang Yang Signed-off-by: Xiaoguang Wu Reviewed-by: Yu Wang Reviewed-by: Binbin Wu --- devicemodel/samples/apl-mrb/launch_uos.sh | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/devicemodel/samples/apl-mrb/launch_uos.sh b/devicemodel/samples/apl-mrb/launch_uos.sh index b624e5ed0..c4279ae8a 100755 --- a/devicemodel/samples/apl-mrb/launch_uos.sh +++ b/devicemodel/samples/apl-mrb/launch_uos.sh @@ -40,10 +40,6 @@ fi #for VT-d device setting modprobe pci_stub -echo "8086 5aa8" > /sys/bus/pci/drivers/pci-stub/new_id -echo "0000:00:15.0" > /sys/bus/pci/devices/0000:00:15.0/driver/unbind -echo "0000:00:15.0" > /sys/bus/pci/drivers/pci-stub/bind - echo "8086 5aaa" > /sys/bus/pci/drivers/pci-stub/new_id echo "0000:00:15.1" > /sys/bus/pci/devices/0000:00:15.1/driver/unbind echo "0000:00:15.1" > /sys/bus/pci/drivers/pci-stub/bind @@ -113,7 +109,8 @@ acrn-dm -A -m $mem_size -c $2$boot_GVT_option"$GVT_args" -s 0:0,hostbridge -s 1: -s 8,wdt-i6300esb \ -s 3,virtio-blk$boot_dev_flag,/data/$5/$5.img \ -s 4,virtio-net,$tap $boot_image_option \ - -s 7,passthru,0/15/0 \ + -s 7,xhci,1-1:1-2:1-3:2-1:2-2:2-3:cap=apl \ + -s 9,passthru,0/15/1 \ -s 15,passthru,0/f/0 \ -s 27,passthru,0/1b/0 \ $boot_ipu_option \ @@ -171,10 +168,6 @@ fi #for VT-d device setting modprobe pci_stub -echo "8086 5aa8" > /sys/bus/pci/drivers/pci-stub/new_id -echo "0000:00:15.0" > /sys/bus/pci/devices/0000:00:15.0/driver/unbind -echo "0000:00:15.0" > /sys/bus/pci/drivers/pci-stub/bind - echo "8086 5aaa" > /sys/bus/pci/drivers/pci-stub/new_id echo "0000:00:15.1" > /sys/bus/pci/devices/0000:00:15.1/driver/unbind echo "0000:00:15.1" > /sys/bus/pci/drivers/pci-stub/bind @@ -279,7 +272,7 @@ fi -l com1,stdio \ -s 9,virtio-net,$tap \ -s 3,virtio-blk$boot_dev_flag,/data/$5/$5.img \ - -s 7,passthru,0/15/0 \ + -s 7,xhci,1-1:1-2:1-3:2-1:2-2:2-3:cap=apl \ -s 8,passthru,0/15/1 \ -s 13,virtio-rpmb \ -s 10,virtio-hyper_dmabuf \