diff --git a/arch/x86/mm/mem_encrypt_hygon.c b/arch/x86/mm/mem_encrypt_hygon.c
index e0acb34e16af2a6f784dab35a03942dcabbea363..1871850cbb6044af9e2ca3a8ab1f9c10b5527782 100644
--- a/arch/x86/mm/mem_encrypt_hygon.c
+++ b/arch/x86/mm/mem_encrypt_hygon.c
@@ -282,6 +282,7 @@ static void __init csv_cma_reserve_mem(void)
 					1 << CSV_CMA_SHIFT, node);
 				break;
 			}
+			cma_enable_concurrency(csv_cma->cma);
 
 			if (start > cma_get_base(csv_cma->cma) || !start)
 				start = cma_get_base(csv_cma->cma);
diff --git a/include/linux/cma.h b/include/linux/cma.h
index 18c8d6495f0899a5bdd815aa13fe6ffba1ef8b07..010c89f4b7727323ff690664a69ed885f771b838 100644
--- a/include/linux/cma.h
+++ b/include/linux/cma.h
@@ -58,4 +58,5 @@ extern int cma_for_each_area(int (*it)(struct cma *cma, void *data), void *data)
 extern void cma_reserve_pages_on_error(struct cma *cma);
 
 extern int __init cma_alloc_areas(unsigned int max_cma_size);
+extern void cma_enable_concurrency(struct cma *cma);
 #endif
diff --git a/mm/cma.c b/mm/cma.c
index 721316622bca835fd7490847fde5c9aa465746dd..0238fc625127366b7354172f611f973f8e3c0c5f 100644
--- a/mm/cma.c
+++ b/mm/cma.c
@@ -496,10 +496,12 @@ struct page *cma_alloc(struct cma *cma, unsigned long count,
 		spin_unlock_irq(&cma->lock);
 
 		pfn = cma->base_pfn + (bitmap_no << cma->order_per_bit);
-		mutex_lock(&cma_mutex);
+		if (!cma->no_mutex)
+			mutex_lock(&cma_mutex);
 		ret = alloc_contig_range(pfn, pfn + count, MIGRATE_CMA,
 				     GFP_KERNEL | (no_warn ? __GFP_NOWARN : 0));
-		mutex_unlock(&cma_mutex);
+		if (!cma->no_mutex)
+			mutex_unlock(&cma_mutex);
 		if (ret == 0) {
 			page = pfn_to_page(pfn);
 			break;
@@ -613,3 +615,11 @@ int cma_for_each_area(int (*it)(struct cma *cma, void *data), void *data)
 
 	return 0;
 }
+
+void cma_enable_concurrency(struct cma *cma)
+{
+	if (!cma)
+		return;
+
+	cma->no_mutex = true;
+}
diff --git a/mm/cma.h b/mm/cma.h
index 12aba820969c236691617e8cbabf208d8af9a0e1..50275c1d98cc656497018577da57bb9417e47846 100644
--- a/mm/cma.h
+++ b/mm/cma.h
@@ -16,6 +16,7 @@ struct cma {
 	unsigned long   *bitmap;
 	unsigned int order_per_bit; /* Order of pages represented by one bit */
 	spinlock_t	lock;
+	bool no_mutex;
 #ifdef CONFIG_CMA_DEBUGFS
 	struct hlist_head mem_head;
 	spinlock_t mem_head_lock;