from map220v

HACK: anything less than 0x1001(4097) causes kernel to hang on boot for unknown reason. ( Original ptr_sz value is 0xCO(192) ) modify to be max(4097, ptr_sz)
99degree · Jun 27, 2023 · 0aba44a · 0aba44a
1 parent 015f358
commit 0aba44a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
@@ -927,8 +927,8 @@ int qcom_scm_assign_mem(phys_addr_t mem_addr, size_t mem_sz,
 	src_sz = hweight64(srcvm_bits) * sizeof(*src);
 	mem_to_map_sz = sizeof(*mem_to_map);
 	dest_sz = dest_cnt * sizeof(*destvm);
-	ptr_sz = ALIGN(src_sz, SZ_64) + ALIGN(mem_to_map_sz, SZ_64) +
-			ALIGN(dest_sz, SZ_64);
+	ptr_sz = max(4097, ALIGN(src_sz, SZ_64) + ALIGN(mem_to_map_sz, SZ_64) +
+			ALIGN(dest_sz, SZ_64));
 
 	ptr = dma_alloc_coherent(__scm->dev, ptr_sz, &ptr_phys, GFP_KERNEL);
 	if (!ptr)