Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00df438e authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

powerpc: Disable 64K hugetlb support when doing 64K SPU mappings 



The 64K SPU local store mapping feature is incompatible with the
64K huge pages support due to the inability of some parts of
the memory management to differenciate between them while they
use a different page table format.

For now, disable 64K huge pages when CONFIG_SPU_FS_64K_LS,
in the long run, this can be fixed by making this feature use
the hugetlb page table format.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 025d7917

arch/powerpc/mm/hugetlbpage.c

+8 −1
Original line number Diff line number Diff line
@@ -736,14 +736,21 @@ static int __init hugetlbpage_init(void) 


	if (!cpu_has_feature(CPU_FTR_16M_PAGE))

		return -ENODEV;



	/* Add supported huge page sizes.  Need to change HUGE_MAX_HSTATE

	 * and adjust PTE_NONCACHE_NUM if the number of supported huge page

	 * sizes changes.

	 */

	set_huge_psize(MMU_PAGE_16M);

	set_huge_psize(MMU_PAGE_64K);

	set_huge_psize(MMU_PAGE_16G);



	/* Temporarily disable support for 64K huge pages when 64K SPU local

	 * store support is enabled as the current implementation conflicts.

	 */

#ifndef CONFIG_SPU_FS_64K_LS

	set_huge_psize(MMU_PAGE_64K);

#endif



	for (psize = 0; psize < MMU_PAGE_COUNT; ++psize) {

		if (mmu_huge_psizes[psize]) {

			huge_pgtable_cache(psize) = kmem_cache_create(