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

Commit dbf29e9b authored by Christophe Leroy's avatar Christophe Leroy Committed by Greg Kroah-Hartman
Browse files

powerpc/book3s/32: fix number of bats in p/v_block_mapped() 



[ Upstream commit e93ba1b7eb5b188c749052df7af1c90821c5f320 ]

This patch fixes the loop in p_block_mapped() and v_block_mapped()
to scan the entire bat_addrs[] array.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent a2773e0f

arch/powerpc/mm/ppc_mmu_32.c

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ struct batrange { /* stores address ranges mapped by BATs */ 
phys_addr_t v_block_mapped(unsigned long va)

{

	int b;

	for (b = 0; b < 4; ++b)

	for (b = 0; b < ARRAY_SIZE(bat_addrs); ++b)

		if (va >= bat_addrs[b].start && va < bat_addrs[b].limit)

			return bat_addrs[b].phys + (va - bat_addrs[b].start);

	return 0;
@@ -64,7 +64,7 @@ phys_addr_t v_block_mapped(unsigned long va) 
unsigned long p_block_mapped(phys_addr_t pa)

{

	int b;

	for (b = 0; b < 4; ++b)

	for (b = 0; b < ARRAY_SIZE(bat_addrs); ++b)

		if (pa >= bat_addrs[b].phys

	    	    && pa < (bat_addrs[b].limit-bat_addrs[b].start)

		              +bat_addrs[b].phys)