Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754852AbdLTJdc (ORCPT ); Wed, 20 Dec 2017 04:33:32 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:38725 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754833AbdLTJdZ (ORCPT ); Wed, 20 Dec 2017 04:33:25 -0500 X-Google-Smtp-Source: ACJfBoselG+8Qwc1c3jSojdHSFw9FIg95Y5ERame4SHMc6ssRe/vvFlmaa8J1hc2Tieha9c14xJVNQ== From: Crt Mori To: Jonathan Cameron Cc: Ingo Molnar , Andrew Morton , Kees Cook , Rusty Russell , Ian Abbott , Larry Finger , Niklas Soderlund , Thomas Gleixner , Krzysztof Kozlowski , Masahiro Yamada , linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org, Peter Zijlstra , Joe Perches , Crt Mori Subject: [PATCH v9 1/3] lib: Add strongly typed 64bit int_sqrt Date: Wed, 20 Dec 2017 10:33:15 +0100 Message-Id: <20171220093315.25311-1-cmo@melexis.com> X-Mailer: git-send-email 2.15.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1876 Lines: 78 There is no option to perform 64bit integer sqrt on 32bit platform. Added stronger typed int_sqrt64 enables the 64bit calculations to be performed on 32bit platforms. Although int_sqrt() is a rough approximation, the same algorithm is used in int_sqrt64() as good enough on 32bit platform. Signed-off-by: Crt Mori --- include/linux/kernel.h | 1 + lib/int_sqrt.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 0ad4c3044cf9..5c6949e9e309 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -459,6 +459,7 @@ extern int kernel_text_address(unsigned long addr); extern int func_ptr_is_kernel_text(void *ptr); unsigned long int_sqrt(unsigned long); +u32 int_sqrt64(u64 x); extern void bust_spinlocks(int yes); extern int oops_in_progress; /* If set, an oops, panic(), BUG() or die() is in progress */ diff --git a/lib/int_sqrt.c b/lib/int_sqrt.c index 1ef4cc344977..30acab761dc1 100644 --- a/lib/int_sqrt.c +++ b/lib/int_sqrt.c @@ -7,6 +7,7 @@ #include #include +#include /** * int_sqrt - rough approximation to sqrt @@ -36,3 +37,39 @@ unsigned long int_sqrt(unsigned long x) return y; } EXPORT_SYMBOL(int_sqrt); + +#if BITS_PER_LONG < 64 +/** + * int_sqrt64 - strongly typed int_sqrt function when minimum 64 bit input + * is expected. + * @x: 64bit integer of which to calculate the sqrt + */ +u32 int_sqrt64(u64 x) +{ + u64 b, m, y = 0; + + if (x <= 1) + return x; + + m = 1ULL << (fls64(x) & ~1ULL); + while (m != 0) { + b = y + m; + y >>= 1; + + if (x >= b) { + x -= b; + y += m; + } + m >>= 2; + } + + return y; +} +EXPORT_SYMBOL(int_sqrt64); +#else +u32 int_sqrt64(u64 x) +{ + return int_sqrt(x); +} +EXPORT_SYMBOL(int_sqrt64); +#endif -- 2.15.0