From 13850f5327d4ee834cd9c7d2efa8e011d5baf05e Mon Sep 17 00:00:00 2001 From: Fei Jiang Date: Thu, 12 Jul 2018 16:24:56 +0800 Subject: [PATCH] hv: change cpu configuration from 1:3 to 2:2 Signed-off-by: Fei Jiang --- devicemodel/samples/apl-mrb/sos_bootargs_debug.txt | 2 +- hypervisor/bsp/sbl/vm_description.c | 4 ++-- hypervisor/bsp/uefi/vm_description.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/devicemodel/samples/apl-mrb/sos_bootargs_debug.txt b/devicemodel/samples/apl-mrb/sos_bootargs_debug.txt index fa9237e5c..e1024a165 100644 --- a/devicemodel/samples/apl-mrb/sos_bootargs_debug.txt +++ b/devicemodel/samples/apl-mrb/sos_bootargs_debug.txt @@ -1 +1 @@ -pci_devices_ignore=(0:18:2) maxcpus=1 console=tty0 console=ttyS0 i915.nuclear_pageflip=1 root=/dev/mmcblk1p1 rw rootwait quiet loglevel=3 no_timer_check consoleblank=0 i915.enable_initial_modeset=1 i915.tsd_init=7 i915.tsd_delay=2000 video=DP-1:d video=DP-2:d video=HDMI-A-1:e video=HDMI-A-2:e i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_guc_loading=0 i915.enable_guc_submission=0 i915.enable_preemption=1 i915.context_priority_mode=2 i915.enable_gvt=1 hvlog=2M@0x6de00000 +pci_devices_ignore=(0:18:2) maxcpus=2 console=tty0 console=ttyS0 i915.nuclear_pageflip=1 root=/dev/mmcblk1p1 rw rootwait quiet loglevel=3 no_timer_check consoleblank=0 i915.enable_initial_modeset=1 i915.tsd_init=7 i915.tsd_delay=2000 video=DP-1:d video=DP-2:d video=HDMI-A-1:e video=HDMI-A-2:e i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_guc_loading=0 i915.enable_guc_submission=0 i915.enable_preemption=1 i915.context_priority_mode=2 i915.enable_gvt=1 hvlog=2M@0x6de00000 diff --git a/hypervisor/bsp/sbl/vm_description.c b/hypervisor/bsp/sbl/vm_description.c index 41a4a37f2..9b955e646 100644 --- a/hypervisor/bsp/sbl/vm_description.c +++ b/hypervisor/bsp/sbl/vm_description.c @@ -7,10 +7,10 @@ #include /* Number of CPUs in VM0 */ -#define VM0_NUM_CPUS 1 +#define VM0_NUM_CPUS 2 /* Logical CPU IDs assigned to VM0 */ -int VM0_CPUS[VM0_NUM_CPUS] = {0}; +int VM0_CPUS[VM0_NUM_CPUS] = {0, 1}; struct vm_description vm0_desc = { .vm_hw_num_cores = VM0_NUM_CPUS, diff --git a/hypervisor/bsp/uefi/vm_description.c b/hypervisor/bsp/uefi/vm_description.c index 41a4a37f2..9b955e646 100644 --- a/hypervisor/bsp/uefi/vm_description.c +++ b/hypervisor/bsp/uefi/vm_description.c @@ -7,10 +7,10 @@ #include /* Number of CPUs in VM0 */ -#define VM0_NUM_CPUS 1 +#define VM0_NUM_CPUS 2 /* Logical CPU IDs assigned to VM0 */ -int VM0_CPUS[VM0_NUM_CPUS] = {0}; +int VM0_CPUS[VM0_NUM_CPUS] = {0, 1}; struct vm_description vm0_desc = { .vm_hw_num_cores = VM0_NUM_CPUS,