From 5244bb87c9de13ca6493e37407f8a266690a4901 Mon Sep 17 00:00:00 2001
From: Yang Yingliang <yangyingliang@huawei.com>
Date: Fri, 15 Feb 2019 21:37:44 +0800
Subject: [PATCH] config: change CONFIG_CMA_SIZE_MBYTES to 64

hulk inclusion
category: bugfix
bugzilla: 9507
CVE: NA

-------------------------------------------------

Change CONFIG_CMA_SIZE_MBYTES to 64 to resolve
boot problem on D05 with mpt3sas_cm0 driver error.

[  212.262711] mpt3sas_cm0: Command Timeout
[  212.262712] mf:

[  212.262714] 0100000d
[  212.262715] 00000100
[  212.262716] 00000000
[  212.262717] 00000000
[  212.262718] 00000000
[  212.262719] 00000000
[  212.262720] 00000000
[  212.262721] 00000000
[  212.262722]

[  212.262723] 00000000
[  212.262724] 00000000
[  212.262724] 00000000
[  212.262725] 00000000
[  212.262726] 000009d0

[  222.506714] mpt3sas_cm0: sending diag reset !!

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Reviewed-by: Xie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 arch/arm64/configs/hulk_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/configs/hulk_defconfig b/arch/arm64/configs/hulk_defconfig
index 29faccd9c4c5..5dc2f0fe48df 100644
--- a/arch/arm64/configs/hulk_defconfig
+++ b/arch/arm64/configs/hulk_defconfig
@@ -1752,7 +1752,7 @@ CONFIG_DMA_CMA=y
 #
 # Default contiguous memory area size:
 #
-CONFIG_CMA_SIZE_MBYTES=16
+CONFIG_CMA_SIZE_MBYTES=64
 CONFIG_CMA_SIZE_SEL_MBYTES=y
 # CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
 # CONFIG_CMA_SIZE_SEL_MIN is not set
-- 
GitLab