Commit 1310222c authored by Anshuman Khandual's avatar Anshuman Khandual Committed by Will Deacon
Browse files

arm64/mm: Drop use_1G_block() 



pud_sect_supported() already checks for PUD level block mapping support i.e
on ARM64_4K_PAGES config. Hence pud_sect_supported(), along with some other
required alignment checks can help completely drop use_1G_block().

Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Reviewed-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Link: https://lore.kernel.org/r/1644988012-25455-1-git-send-email-anshuman.khandual@arm.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent cf5a501d

arch/arm64/mm/mmu.c

+2 −13
Original line number Diff line number Diff line
@@ -295,18 +295,6 @@ static void alloc_init_cont_pmd(pud_t *pudp, unsigned long addr, 
	} while (addr = next, addr != end);

}



static inline bool use_1G_block(unsigned long addr, unsigned long next,

			unsigned long phys)

{

	if (PAGE_SHIFT != 12)

		return false;



	if (((addr | next | phys) & ~PUD_MASK) != 0)

		return false;



	return true;

}



static void alloc_init_pud(pgd_t *pgdp, unsigned long addr, unsigned long end,

			   phys_addr_t phys, pgprot_t prot,

			   phys_addr_t (*pgtable_alloc)(int),
@@ -345,7 +333,8 @@ static void alloc_init_pud(pgd_t *pgdp, unsigned long addr, unsigned long end, 
		/*

		 * For 4K granule only, attempt to put down a 1GB block

		 */

		if (use_1G_block(addr, next, phys) &&

		if (pud_sect_supported() &&

		   ((addr | next | phys) & ~PUD_MASK) == 0 &&

		    (flags & NO_BLOCK_MAPPINGS) == 0) {

			pud_set_huge(pudp, phys, prot);