From nobody Wed Sep 7 15:10:03 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MN5K75Dqcz4bPJ4; Wed, 7 Sep 2022 15:10:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MN5K74Jtqz3XkD; Wed, 7 Sep 2022 15:10:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662563403; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SLyOzPg5/MKqq0sUMEmIWD7dVmw0b+Eu/Kt0+8mBQ1Y=; b=CQ5NgesUEyWOWA/uwCxGKl5gZb2PcgmCVC+scYXgU7ZRW1pekqbsHgF3Kd7T0QANLJwclx yK2BVjK/m7RC3R9xleRHZpKHJeSLYcEpjCzxLQeuS9Ozw0fp3KB3voWQgg8biA8wDOSB5L zoGC1Q/M1dSRdsSuixCn6YCCF30dTBoNOfGsg5AC2WjsY5JI7Pu766NA8NqqcWSj7Lu9ti WzOlwrn1mjt2O0ZYdxJQ8x/xi2UOCKKrf+7NZGYLtG8EEseQg3tiSuRHC8OfKzP+HNifw4 Bvr3PZjbD7itEvdA97SSySycX6jQbwuADmolRm8DkIzd9JxSv8YgJpWwZMlOCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MN5K73QSGzYqh; Wed, 7 Sep 2022 15:10:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 287FA3SK019398; Wed, 7 Sep 2022 15:10:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 287FA3Hl019396; Wed, 7 Sep 2022 15:10:03 GMT (envelope-from git) Date: Wed, 7 Sep 2022 15:10:03 GMT Message-Id: <202209071510.287FA3Hl019396@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: b00f8e7ff01e - stable/13 - linuxkpi: math.h: Add mul_u64_u32_div and mul_u64_u32_shr List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b00f8e7ff01e442f1e28e9dd80b111245fdd4509 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662563403; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SLyOzPg5/MKqq0sUMEmIWD7dVmw0b+Eu/Kt0+8mBQ1Y=; b=u+O39XdJoMySJDVQPEpECsMV+TQrq++9osPx7NwQnq2vrYf6nEqCUmdPY5ArTOZ6T5RV+M 33v5Gdu7hyVmpFgXuZ8WNxgghp23N8UK+A/r0assUlbNnNurZtqmQXzXDki7WCx5+xNg13 jJ+/nqNiXWHGHMT7xQypZ3rTMRfyGl/0tynne8Dljok+4nojd7xgzTxV9ECzjD59WRA1bi njUknACc3fc18Rd1myvBcRSpcra3/pNv4Rdsr21UXRgFEKemnbjNCCsb5qO+JD529p4co/ /oT9lWgOogXSYer2XVUqjblozl47+5qJf03hsdBpyJkSUTxG3LqbZ2zDxx44FQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662563403; a=rsa-sha256; cv=none; b=OmSHHsBLvBVrbKPHPCK88LAQ3rzj/0lFwquIxIZD53lcDddGhBmc/SKy3eze8+iiQv/QRt /ma9q1WF/61fZJoPcRRxLKUhrIAScTGy93cGxaFb4cH9L86mLtNgX0ubrRJ0llR0AvOiqQ p3N3xoHXsbTQVoNmhe1kIw2cAS4w4BSdxZmqaBR8CA4CF9IOxd+iAi9GS7gZ2KgkXnRy88 rYE2C36grmgtblDzJrZwOctFPLFnQtDCaz8Or8kWPTSCsddqUcnAcG8MneM4D40TsOtjUT qgNXud0CItEe5YL442ulGpNFypx4jfvTtRf71r+YdCEEJ6TSnadgxhfg7IKUMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=b00f8e7ff01e442f1e28e9dd80b111245fdd4509 commit b00f8e7ff01e442f1e28e9dd80b111245fdd4509 Author: Emmanuel Vadot AuthorDate: 2022-07-26 08:06:56 +0000 Commit: Emmanuel Vadot CommitDate: 2022-09-07 15:09:03 +0000 linuxkpi: math.h: Add mul_u64_u32_div and mul_u64_u32_shr Needed by drm-kmod. Reviewed by: hselasky Obtained from: OpenBSD Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D35937 (cherry picked from commit 885ab0dba28b799c5c70923c2cb0ee162b5b75b1) --- sys/compat/linuxkpi/common/include/linux/math64.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/math64.h b/sys/compat/linuxkpi/common/include/linux/math64.h index da8b19d37efe..f708f1ae81fa 100644 --- a/sys/compat/linuxkpi/common/include/linux/math64.h +++ b/sys/compat/linuxkpi/common/include/linux/math64.h @@ -100,4 +100,23 @@ div64_u64_round_up(uint64_t dividend, uint64_t divisor) #define DIV64_U64_ROUND_UP(...) \ div64_u64_round_up(__VA_ARGS__) +static inline uint64_t +mul_u64_u32_div(uint64_t x, uint32_t y, uint32_t div) +{ + const uint64_t rem = x % div; + + return ((x / div) * y + (rem * y) / div); +} + +static inline uint64_t +mul_u64_u32_shr(uint64_t x, uint32_t y, unsigned int shift) +{ + uint32_t hi, lo; + hi = x >> 32; + lo = x & 0xffffffff; + + return (mul_u32_u32(lo, y) >> shift) + + (mul_u32_u32(hi, y) << (32 - shift)); +} + #endif /* _LINUXKPI_LINUX_MATH64_H */