From nobody Wed Oct 18 14:30:53 2023 X-Original-To: dev-commits-src-branches@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 4S9YDY50nnz4x60x; Wed, 18 Oct 2023 14:30:53 +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 4S9YDY4PFvz3MP5; Wed, 18 Oct 2023 14:30:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639453; 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=DQ/SLZEoxWEezjkeY7VGhwZAs7Xr6FPR/TrLBQW8qGo=; b=kvK/CnfrL5yz4x+AawaITSzkKnuRgJqYrxRZ9MOTU0aShPF+uWSGhvCPiEBi6PjOAc9pkc /vbxTkLZxNHhxY//Y9BLTDfF4rcTDRMBtMUpUlqjcaWoHUUtZ9le7LL6IM3JVhmjH5toji NBBxfc+ObXpPHdjVSEtQ6tBWoCxmErZZQSzeo2kn4ZMKOG6SbQ3IqoTPhrB7ZB/ytUziLn Ekeq/vc6TXTAZPoFANaAvcJWpPtNnqWB6KFjE6DRW62ZIOfj+ECmAyILXVr9WxadttgDZh hMsCyUCfoL1t2WMAt6OYWivAB7Rf5vRxeD9xWhv/FDV4i6tcXykuNb23BkRTBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639453; a=rsa-sha256; cv=none; b=jskOwiT59APUrr1mOKc05bd9rykk6TDP+yo2jIx1aXVvnCKUviIW4woXFLkudqkef5C/zt 7hCZ/c1SLVfVdoL+8rymL+4oM/hJNZBZyRdMBOUYy6PpEd8ZXyXgRvHm2TX9xtUO28ja26 +8/Wf+7QDhgM+oYySL/Y0UOBluZ92FbHQy+2ZQtugkIYXrO5XJ/eAxzEMumGHUbfdc0FNQ rVLBnp0PLbS4fJ/larmHMyj2TOOu+JovqBKfsc0nj4213hLGVYdZANyBOIO/Jpp8Pr45PI rt2RTDHmQCbByQ9NoF/P1MtxJ5XaRYDdFaNXA3jz0/eTSZ1Pzt/sy++0z9gRUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639453; 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=DQ/SLZEoxWEezjkeY7VGhwZAs7Xr6FPR/TrLBQW8qGo=; b=HBeDYaIopsaaiAIAYLnsiS6s3wURpkhtq3DPvAJZsxXTu6YASkCD3U7QVRKnMhtzrM1J5h jHotsmGrxDRWhJtwY3w3Sp3lNbF5q8gt8Bnog8BPtvhGSlECWpnbPocIEU1vdE/lH6JaO6 BQ6iSy2qrBCsdT5DI7X7+A9XtdBJdnfikmA4zDErgJNfn7SVzYdnJajOrg9oVBWMkJysoH 2GAD7Scn418fy7nJip8s4qkzKkvkuCq3g1QgLAJ+TFYo9/v8s6Piz/YXgqGOvE00ZwCBUz hjMp+rLEv4FoLWhMvXggyonzG7ocHv6s2z8Ku8e3/BkOW16t3gDuSFf1Tl+s6g== 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 4S9YDY3SrBz19Fm; Wed, 18 Oct 2023 14:30:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39IEUrvC085341; Wed, 18 Oct 2023 14:30:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEUrj7085338; Wed, 18 Oct 2023 14:30:53 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:30:53 GMT Message-Id: <202310181430.39IEUrj7085338@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: 62ce4a798f2c - stable/14 - cpufreq_dt: Find the closest frequency List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: 62ce4a798f2c8a6357e8bc0c46e0f3e077ca1958 Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=62ce4a798f2c8a6357e8bc0c46e0f3e077ca1958 commit 62ce4a798f2c8a6357e8bc0c46e0f3e077ca1958 Author: Emmanuel Vadot AuthorDate: 2023-09-06 16:40:17 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:30:22 +0000 cpufreq_dt: Find the closest frequency When building the frequencies table we convert the value in the DTS to megahertz and loose precision. While it's not a problem for most of the DTS it is when the expected frequency value is strict down to the hertz. So it's either we don't truncate the value and have some ugly and long values in the sysctls or we just find the closest frequency. Do the latter. Reviewed by: mmel Differential Revision: https://reviews.freebsd.org/D41762 Sponsored by: Beckhoff Automation GmbH & Co. KG (cherry picked from commit 17c17872ca98df0e2b9f9c7a2c41ef73f7dee21a) --- sys/dev/cpufreq/cpufreq_dt.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/sys/dev/cpufreq/cpufreq_dt.c b/sys/dev/cpufreq/cpufreq_dt.c index aaeada3a4e58..be434cabb4fd 100644 --- a/sys/dev/cpufreq/cpufreq_dt.c +++ b/sys/dev/cpufreq/cpufreq_dt.c @@ -104,17 +104,26 @@ static const struct cpufreq_dt_opp * cpufreq_dt_find_opp(device_t dev, uint64_t freq) { struct cpufreq_dt_softc *sc; - ssize_t n; + uint64_t diff, best_diff; + ssize_t n, best_n; sc = device_get_softc(dev); + diff = 0; + best_diff = ~0; DPRINTF(dev, "Looking for freq %ju\n", freq); - for (n = 0; n < sc->nopp; n++) - if (CPUFREQ_CMP(sc->opp[n].freq, freq)) - return (&sc->opp[n]); + for (n = 0; n < sc->nopp; n++) { + diff = abs64((int64_t)sc->opp[n].freq - (int64_t)freq); + DPRINTF(dev, "Testing %ju, diff is %ju\n", sc->opp[n].freq, diff); + if (diff < best_diff) { + best_diff = diff; + best_n = n; + DPRINTF(dev, "%ju is best for now\n", sc->opp[n].freq); + } + } - DPRINTF(dev, "Couldn't find one\n"); - return (NULL); + DPRINTF(dev, "Will use %ju\n", sc->opp[best_n].freq); + return (&sc->opp[best_n]); } static void