From patchwork Wed Dec 20 14:20:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Crt Mori X-Patchwork-Id: 10125781 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6166460245 for ; Wed, 20 Dec 2017 14:20:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 54DC029629 for ; Wed, 20 Dec 2017 14:20:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4A4D22978D; Wed, 20 Dec 2017 14:20:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E5A0329629 for ; Wed, 20 Dec 2017 14:20:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755427AbdLTOUM (ORCPT ); Wed, 20 Dec 2017 09:20:12 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:33861 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755310AbdLTOUK (ORCPT ); Wed, 20 Dec 2017 09:20:10 -0500 Received: by mail-wm0-f67.google.com with SMTP id y82so15909572wmg.1 for ; Wed, 20 Dec 2017 06:20:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=melexis.com; s=google; h=from:to:cc:subject:date:message-id; bh=0QbLDXssiQorcM8wqkDGA8JypHa2RdtEMSRTBs2u8sg=; b=brDIhFfqF0R0PD+fxlPgulabQxD+K2f/N1zoY5f62MKoD1wSn+VS4RYzsxd1nNRl0n 8VhS7FErhKgey92kc4Loe7AQ85STt1TTP1m7/ZKecKZoYM07N9CBrQk8FoNOUzRmGupA JlFvEJf47ZYIFljIZtsh5PtLuaO7ufXwSuXw8vigmOPxKsFDL5UatvGo7JtC7LO7O43b 0ZBvZt86TBDE/Z41vMX399pm963egSdGj/q2m0JZVez7qwF1HpNo1G5JTW61vDoASTO/ bo3N7EfsFgpywYAgTNrY1D1vwf3Gg5B8ZFuDlCT7BkoE79Pws/RFAyLjm6ralwvlRXxC tZaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=0QbLDXssiQorcM8wqkDGA8JypHa2RdtEMSRTBs2u8sg=; b=n9MJFNHRXq0GsQmTx3wVqbxc1OrEXmzB0adYOm6mSUVgdPPj92dacH99GRfPhFKfJ9 ACtdkZ93agsuiGNKttxADTUwImET7IEgF8epmMWekIC/dKyv3tdXzlDyBmREQesO1jZI KyoXy5VPS3BW33I9D2PHXkS3ih7hM81JL2UM3dsi6HuN2NA8pVJOuwvIJ1YIVYCwT1yC Mqs4eHpaL8X71KAsrlP58VM6dzTg36DmqqM1+hQpNuvRG87VYzHNQqVndN73X9bKOtbl 9iiq4SYiTslWKz/49Qt3aBXMQAAHRKMknKbP9+nFzHqZ799wcDxwbdJzHYNWpCABUoX9 eIEQ== X-Gm-Message-State: AKGB3mKQhvI++6OOUeGenzXGP+ClLT0PdnaJcKGGEeXtX6uXQE7aJ3SF qs48IsxWAqAdqcZ9I6BAycH0Dg== X-Google-Smtp-Source: ACJfBovHBoXZ/opTV4EfXSLXZlxNyhQ5EEi6xIPQuMCAyyUnZ0XY/YyLzWCvXxIX6k1RLAJeuSEjiA== X-Received: by 10.80.241.19 with SMTP id w19mr5606284edl.123.1513779609032; Wed, 20 Dec 2017 06:20:09 -0800 (PST) Received: from localhost.localdomain (ptr-4xfub6rwgakpug564fr.18120a2.ip6.access.telenet.be. [2a02:1810:a444:c300:4527:fd81:32c2:e0f7]) by smtp.gmail.com with ESMTPSA id r8sm13001841edm.22.2017.12.20.06.20.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Dec 2017 06:20:08 -0800 (PST) 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 v10 1/3] lib: Add strongly typed 64bit int_sqrt Date: Wed, 20 Dec 2017 15:20:01 +0100 Message-Id: <20171220142001.18161-1-cmo@melexis.com> X-Mailer: git-send-email 2.15.0 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 | 9 +++++++++ lib/int_sqrt.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 0ad4c3044cf9..e4a3dc64e650 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -460,6 +460,15 @@ extern int func_ptr_is_kernel_text(void *ptr); unsigned long int_sqrt(unsigned long); +#if BITS_PER_LONG < 64 +u32 int_sqrt64(u64 x); +#else +static inline u32 int_sqrt64(u64 x) +{ + return (u32)int_sqrt(x); +} +#endif + extern void bust_spinlocks(int yes); extern int oops_in_progress; /* If set, an oops, panic(), BUG() or die() is in progress */ extern int panic_timeout; diff --git a/lib/int_sqrt.c b/lib/int_sqrt.c index 1ef4cc344977..184da54677ec 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,33 @@ 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); +#endif