| Message ID | 6c608fd4795e2d8ea1a0a449405a0087f76d8bb3.1642752375.git.christophe.leroy@csgroup.eu (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/3] powerpc/lib/sstep: Use l1_dcache_bytes() instead of opencoding | expand |
On Fri, 21 Jan 2022 08:06:27 +0000, Christophe Leroy wrote: > Don't opencode dcache size retrieval based on whether that's ppc32 or ppc64. > > Use l1_dcache_bytes() > > Applied to powerpc/next. [1/3] powerpc/lib/sstep: Use l1_dcache_bytes() instead of opencoding https://git.kernel.org/powerpc/c/67484e0de9c93b4a9187bb49f45dfdaa8dc03c0b [2/3] powerpc/lib/sstep: Remove unneeded #ifdef __powerpc64__ https://git.kernel.org/powerpc/c/7c3bba91999075f4cfcab0542e4eb74d2d63554b [3/3] powerpc/lib/sstep: use truncate_if_32bit() https://git.kernel.org/powerpc/c/6836f099039e6c72fb548bf527345aa4345c3308 cheers
diff --git a/arch/powerpc/lib/sstep.c b/arch/powerpc/lib/sstep.c index a94b0cd0bdc5..b7316d697d80 100644 --- a/arch/powerpc/lib/sstep.c +++ b/arch/powerpc/lib/sstep.c @@ -1065,14 +1065,11 @@ static int __emulate_dcbz(unsigned long ea) int emulate_dcbz(unsigned long ea, struct pt_regs *regs) { int err; - unsigned long size; + unsigned long size = l1_dcache_bytes(); #ifdef __powerpc64__ - size = ppc64_caches.l1d.block_size; if (!(regs->msr & MSR_64BIT)) ea &= 0xffffffffUL; -#else - size = L1_CACHE_BYTES; #endif ea &= ~(size - 1); if (!address_ok(regs, ea, size))
Don't opencode dcache size retrieval based on whether that's ppc32 or ppc64. Use l1_dcache_bytes() Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> --- arch/powerpc/lib/sstep.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)