From c8c0e10a9046351d702f20c7d8631583167dc5ee Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Fri, 17 Aug 2018 16:17:51 +0800 Subject: [PATCH] HV: enlarge the CMA size for uos trusty sometimes, there would be CMA allocate failue when doing cycle rebooting android uos. as there are different CMA clients, and android trusty need 16M contiguous memory, 32M CMA size may make this failure easy to come out. This patch is to enlarge the CMA size to 64M, which mitigate the failure. Signed-off-by: Wei Liu Signed-off-by: Jason Chen CJ --- devicemodel/samples/apl-mrb/sos_bootargs_debug.txt | 2 +- devicemodel/samples/apl-mrb/sos_bootargs_release.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/devicemodel/samples/apl-mrb/sos_bootargs_debug.txt b/devicemodel/samples/apl-mrb/sos_bootargs_debug.txt index 1c0394a85..3500a90bc 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) 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 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 i915.enable_guc=0 hvlog=2M@0x6de00000 reboot_panic=p,w cma=32M@0- +pci_devices_ignore=(0:18: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 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 i915.enable_guc=0 hvlog=2M@0x6de00000 reboot_panic=p,w cma=64M@0- diff --git a/devicemodel/samples/apl-mrb/sos_bootargs_release.txt b/devicemodel/samples/apl-mrb/sos_bootargs_release.txt index 5c0d4dabc..377a0e087 100644 --- a/devicemodel/samples/apl-mrb/sos_bootargs_release.txt +++ b/devicemodel/samples/apl-mrb/sos_bootargs_release.txt @@ -1 +1 @@ -console=tty0 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 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 i915.enable_guc=0 cma=32M@0- +console=tty0 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 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 i915.enable_guc=0 cma=64M@0-