| From 4b993ffa37d51a54dd5eec2769f5d1053df6cbcf Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 16 Nov 2018 17:27:42 +0000 |
| Subject: powerpc/book3s/32: fix number of bats in p/v_block_mapped() |
| |
| From: Christophe Leroy <christophe.leroy@c-s.fr> |
| |
| [ 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: Christophe Leroy <christophe.leroy@c-s.fr> |
| Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/powerpc/mm/ppc_mmu_32.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/arch/powerpc/mm/ppc_mmu_32.c b/arch/powerpc/mm/ppc_mmu_32.c |
| index 2a049fb8523d5..96c52271e9c2d 100644 |
| --- a/arch/powerpc/mm/ppc_mmu_32.c |
| +++ b/arch/powerpc/mm/ppc_mmu_32.c |
| @@ -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) |
| -- |
| 2.20.1 |
| |