From nobody Thu Nov 12 09:51:31 2026 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 4jQFyr0RzVz70KSd for ; Thu, 12 Nov 2026 09:51:32 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jQFyq3p39z3G0t for ; Thu, 12 Nov 2026 09:51:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794477091; 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=9bC6xKbfvSVKolFLPh83SRWnB/EkIHTB5SPCCf6N7PM=; b=i9PG6k6NyFZrJqBbcYpCqe5nC9OfpvKTekSzaI9x8o173SJ0qjczyBqUoirl2WY0qYBOf6 yJ2NVwPKB7CueuyuI+GtxGCNNIuJxBtfN3K9Mee3gFLgnbZaITAnJoPmyzddEVZ4/Bokv/ swGMPTmh/7c1raVrn5pf9r1xbgR+JFGLmwGSt1mIqDLooN/98NxGguD9oOP7d4SovbLQ6E wcr94P1xN2rAJAxvwo7Fwp5wxtD513mxcuaIQZkjHqJTxD8YlmvRR/g9rN4LSVfLt9CDm9 7S9JdY86PUJHAT+noWcFjSlRgRMFS7HZ/gXsultne9v0Bp5VLs/6krJ/Ape47g== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794477091; b=mBbtYcRdnZj92Sz1MBQezzAnzuCIwMZQOW45rhLqsSDhuUNOHuOdKfBhC7qW6nlsQVmpU6 7OA3cTOCa5B01+uK7qVAwraaePl2jX/FVJL27k/TCz+YTDx81i6f713P0sMQun1XLwMlFW 7xGw1FwK7BugQXPbcBVIhu6da9olp6vu9u52C7GhLhO+FHpSiaqNRgRw2wY7/7gyGj0On7 LPelHiCPbkWApdnsA8cDR6vvwh6DeR4hFffF+zWZucfiFRzoAyacr59kEzr7qk9+yAGrcX hGLq9yK7E62aurLPBmE8tMcIv9qnKLDSpkplTRK5/lcbqjG7nVniRCrCAE9PvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794477091; 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=9bC6xKbfvSVKolFLPh83SRWnB/EkIHTB5SPCCf6N7PM=; b=EeMVHtDI53RFVIXc0yGvbLaYUBWXUl6hSBkSNcRch4tW5iJmgUeQxdKNoV5SGin1rWukBM wOG33kzIl36sa/y+YnKFVbvIKIafm4aBBKgltglFfafke0gSDs6qUDg3JsvyuVkVNVf6gb 3IOR42ggiNE1+vtBTnYV5aSgz4J2L3dJbPNHhiotRaHeJhY2KyTKthnhDccY2qWTQYzWpw /KzuXiyz4q8RmvmVkaEHAdTN0+yTxAZz3BA1mvt+HbYLGKsKW5knny9lrDaIa32wEeO6cr LQjkWfnb/n1vVjP7E0GJydTm6opPvXrxHB325ROx1Yc7YZDtyP0olWRQPUZyzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jQFyq3BPtzxcs for ; Thu, 12 Nov 2026 09:51:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2016c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Nov 2026 09:51:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 7726c0ce98db - main - aw_clk: Add a flag to only search the given value of a factor List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/main X-Git-Reftype: branch X-Git-Commit: 7726c0ce98db53011d1d2066a36643aaab2a4782 Auto-Submitted: auto-generated Date: Thu, 12 Nov 2026 09:51:31 +0000 Message-Id: <6af58c23.2016c.648244da@gitrepo.freebsd.org> The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=7726c0ce98db53011d1d2066a36643aaab2a4782 commit 7726c0ce98db53011d1d2066a36643aaab2a4782 Author: Emmanuel Vadot AuthorDate: 2026-11-10 15:55:26 +0000 Commit: Emmanuel Vadot CommitDate: 2026-11-12 09:47:30 +0000 aw_clk: Add a flag to only search the given value of a factor Some factors have to be read from the register, as the firmware or the reset value can leave them set, but must not be changed when looking for a rate. AW_CLK_FACTOR_FIXED cannot be used as it does not read the register. Add AW_CLK_FACTOR_SEARCH_VALUE: the factor is decoded from the register as usual but the search only tries its value, so the factor is set to this value when the rate is changed. Tested on: H6 --- sys/dev/clk/allwinner/aw_clk.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/dev/clk/allwinner/aw_clk.h b/sys/dev/clk/allwinner/aw_clk.h index d8d6ecd09fd3..dc4068d3351a 100644 --- a/sys/dev/clk/allwinner/aw_clk.h +++ b/sys/dev/clk/allwinner/aw_clk.h @@ -76,12 +76,14 @@ struct aw_clk_init { #define AW_CLK_FACTOR_ZERO_IS_ONE 0x0010 #define AW_CLK_FACTOR_MIN_VALUE 0x0020 #define AW_CLK_FACTOR_MAX_VALUE 0x0040 +#define AW_CLK_FACTOR_SEARCH_VALUE 0x0080 struct aw_clk_factor { uint32_t shift; /* Shift bits for the factor */ uint32_t mask; /* Mask to get the factor, will be override by the clk methods */ uint32_t width; /* Number of bits for the factor */ - uint32_t value; /* Fixed value, depends on AW_CLK_FACTOR_FIXED */ + uint32_t value; /* Fixed value, depends on AW_CLK_FACTOR_FIXED + * or AW_CLK_FACTOR_SEARCH_VALUE */ uint32_t cond_shift; uint32_t cond_mask; @@ -169,7 +171,8 @@ aw_clk_factor_get_max(struct aw_clk_factor *factor) { uint32_t max; - if (factor->flags & AW_CLK_FACTOR_FIXED) + if (factor->flags & + (AW_CLK_FACTOR_FIXED | AW_CLK_FACTOR_SEARCH_VALUE)) max = factor->value; else if (factor->flags & AW_CLK_FACTOR_POWER_OF_TWO) max = 1 << ((1 << factor->width) - 1); @@ -185,7 +188,8 @@ aw_clk_factor_get_min(struct aw_clk_factor *factor) { uint32_t min; - if (factor->flags & AW_CLK_FACTOR_FIXED) + if (factor->flags & + (AW_CLK_FACTOR_FIXED | AW_CLK_FACTOR_SEARCH_VALUE)) min = factor->value; else if (factor->flags & AW_CLK_FACTOR_ZERO_BASED) min = 0;