superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

powerpc/mm/book3s64: Use 256M as the upper limit with coherent device memory attached 

Commit 4d15721177 ("powerpc/mm: Cleanup memory block size probing")
used 256MB as the memory block size when we have
ibm,coherent-device-memory device tree node present. Instead of
returning with 256MB memory block size, continue to check the rest of
the memory regions and make sure we can still map them using a 256MB
memory block size.

Fixes: 4d15721177 ("powerpc/mm: Cleanup memory block size probing")
Signed-off-by: "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20230828074658.59553-2-aneesh.kumar@linux.ibm.com
pull/806/head
Aneesh Kumar K.V 2023-08-28 13:16:58 +05:30 committed by Michael Ellerman
parent f1424755db
commit 4c33bf1472
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/powerpc/mm/init_64.c
View File

@ -569,8 +569,12 @@ static int __init probe_memory_block_size(unsigned long node, const char *uname,
*/
compatible = of_get_flat_dt_prop(node, "compatible", NULL);
if (compatible && !strcmp(compatible, "ibm,coherent-device-memory")) {
*block_size = SZ_256M;
return 1;
if (*block_size > SZ_256M)
*block_size = SZ_256M;
/*
* We keep 256M as the upper limit with GPU present.
*/
return 0;
}
}
/* continue looking for other memory device types */