mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-09-04 20:19:47 +08:00
drm/panic: Add a u64 divide by 10 for arm32
On 32bits ARM, u64 divided by a constant is not optimized to a
multiply by inverse by the compiler [1].
So do the multiply by inverse explicitly for this architecture.
Link: https://github.com/llvm/llvm-project/issues/37280 [1]
Reported-by: Andrei Lalaev <andrey.lalaev@gmail.com>
Closes: https://lore.kernel.org/dri-devel/c0a2771c-f3f5-4d4c-aa82-d673b3c5cb46@gmail.com/
Fixes: 675008f196
("drm/panic: Use a decimal fifo to avoid u64 by u64 divide")
Reviewed-by: Alice Ryhl <aliceryhl@google.com>
Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
This commit is contained in:
parent
360077278b
commit
9af8f2b469
@ -381,6 +381,26 @@ struct DecFifo {
|
|||||||
len: usize,
|
len: usize,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// On arm32 architecture, dividing an `u64` by a constant will generate a call
|
||||||
|
// to `__aeabi_uldivmod` which is not present in the kernel.
|
||||||
|
// So use the multiply by inverse method for this architecture.
|
||||||
|
fn div10(val: u64) -> u64 {
|
||||||
|
if cfg!(target_arch = "arm") {
|
||||||
|
let val_h = val >> 32;
|
||||||
|
let val_l = val & 0xFFFFFFFF;
|
||||||
|
let b_h: u64 = 0x66666666;
|
||||||
|
let b_l: u64 = 0x66666667;
|
||||||
|
|
||||||
|
let tmp1 = val_h * b_l + ((val_l * b_l) >> 32);
|
||||||
|
let tmp2 = val_l * b_h + (tmp1 & 0xffffffff);
|
||||||
|
let tmp3 = val_h * b_h + (tmp1 >> 32) + (tmp2 >> 32);
|
||||||
|
|
||||||
|
tmp3 >> 2
|
||||||
|
} else {
|
||||||
|
val / 10
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl DecFifo {
|
impl DecFifo {
|
||||||
fn push(&mut self, data: u64, len: usize) {
|
fn push(&mut self, data: u64, len: usize) {
|
||||||
let mut chunk = data;
|
let mut chunk = data;
|
||||||
@ -389,7 +409,7 @@ impl DecFifo {
|
|||||||
}
|
}
|
||||||
for i in 0..len {
|
for i in 0..len {
|
||||||
self.decimals[i] = (chunk % 10) as u8;
|
self.decimals[i] = (chunk % 10) as u8;
|
||||||
chunk /= 10;
|
chunk = div10(chunk);
|
||||||
}
|
}
|
||||||
self.len += len;
|
self.len += len;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user