From nobody Fri Nov 13 07:29:48 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 4jQpms4Ldfz7080g for ; Fri, 13 Nov 2026 07:29:49 +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 4jQpmr5V9Bz4b1r for ; Fri, 13 Nov 2026 07:29:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794554988; 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=Irp7GRNALlsx97c4MFAp4yqRes1iZ9qhV0VAYlAdGkQ=; b=l4q8vBSoOZ35Y35128rAsAQXENDlrTXqpZoIq2R2EtWgJEmN4cgCQgugEMawFrZbYKWufC 2Wd2/Hm7klLawQuGd3Hn5MOp9oJgIA820KtAKg8TQRhGi0X8BiAGXl3gGgeyQ0o5vATCQ8 dZ3YkkT2/atrOuV9xdZ+gLZZYRyV+INn/fCgda1P8dUciY+XJY3t/1SnOcUS6SPP5HAMK/ 6FKf3ec/lbOr99qDVDijgYyVIM6YvwkzVVKpBKDOxNAEtIXWst3RxkmqQVip1MfJmCu9H5 RqFnAPUj3bxfJ5RaIiWJlt5SIu51X5bO6Ywgl9wNe7gv4T9tLCatSkL+qQZlxw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794554988; b=pD6fBuhibCnGly9A1ByzTwQUxCzCUwtvHFSCcWXmZiJHFDdbYy3Mfi5Fh9pjmqs18S1sMe vqaasDrGXy72r8PYAUbKhXaz66LdnTBnkzj0XxC080x8VJzxs7AIVl0GyKiJnQN6msU4kc xC1OwXe8/jp0tXo/3nLrM3KDEWkGVPbsSTAMolxnhYJ/f4QmXTbSwjHUgGp7JZnQdN1odo v4uESoznMxoHQQ+Qgg/0QqsEM16BpVdRG9IRLIn0FNvbatmHSUQmKdl3CLx6aA7eTkf6wE S7rLobwTl3+2ZxlTZOlSI8jcjPQSh7RHfH0FxwDui8EDI9lslmP/y1Ye/DPctA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794554988; 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=Irp7GRNALlsx97c4MFAp4yqRes1iZ9qhV0VAYlAdGkQ=; b=oqDXxMM3U6NgnF2I+sEFmUf1M4qGKGtc3VNlb4FvCeF3Zx9O7VUzJvG7UV2LTRa//7ULoX Hm4ExeGKcPnP2AANHReS0RUl3DwdxnpgFGkL8ebVg0g5V9/BGvV/wm5qLDGitEfoTZtaLh 0rjpS/jCqdk5tz6P3XVixYA3dOPoyFRud6FndheyKkjUN6QXoLguj3LOckEuYJ6MId++mZ 2RmIF5z8VnfCE5/FyyslP5y2gjmyxdpDYYbUrrv/UTVjRZ4m551g3db2pSi5IbdeySrMAd phPb9PRc5fgk3DGBFsVvc6n8+gKtYFmoIbCb4q2I76mc6dqb0YsB9T47JFJEJQ== 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 4jQpmr4mPszNL8 for ; Fri, 13 Nov 2026 07:29:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18630 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Nov 2026 07:29:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: b1a3c098f734 - main - aw_ccu: h616: Set the lock enable bit of the PLLs 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: b1a3c098f7346b848e1b90e6aabcf03e87b5eaee Auto-Submitted: auto-generated Date: Fri, 13 Nov 2026 07:29:48 +0000 Message-Id: <6af6bc6c.18630.2c304965@gitrepo.freebsd.org> The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=b1a3c098f7346b848e1b90e6aabcf03e87b5eaee commit b1a3c098f7346b848e1b90e6aabcf03e87b5eaee Author: Emmanuel Vadot AuthorDate: 2026-11-13 06:38:53 +0000 Commit: Emmanuel Vadot CommitDate: 2026-11-13 07:29:30 +0000 aw_ccu: h616: Set the lock enable bit of the PLLs The lock status bit of a PLL is only updated when its lock enable bit, bit 29, is set, and the firmware only sets it for the PLLs it uses. Enabling another PLL, or changing the rate of an enabled one, then waited for a lock that never came and ended after a second with an error. Set the bit on all the PLLs when attaching, like Linux does. Reported by: llm-postcr Fixes: 92b59f3d010d ("aw_clk: Wait for the PLL to lock when enabling it") --- sys/dev/clk/allwinner/ccu_h616.c | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/sys/dev/clk/allwinner/ccu_h616.c b/sys/dev/clk/allwinner/ccu_h616.c index b6d5c5024562..be81310da39e 100644 --- a/sys/dev/clk/allwinner/ccu_h616.c +++ b/sys/dev/clk/allwinner/ccu_h616.c @@ -447,6 +447,26 @@ static struct aw_ccung_clk h616_ccu_clks[] = { { .type = AW_CLK_FIXED, .clk.fixed = &pll_video2_clk}, }; +/* + * Registers of the PLLs, the lock status bit of a PLL is only updated when + * its lock enable bit is set. + */ +#define PLL_LOCK_ENABLE (1 << 29) + +static const bus_size_t h616_pll_regs[] = { + 0x00, /* PLL_CPUX */ + 0x10, /* PLL_DDR0 */ + 0x18, /* PLL_DDR1 */ + 0x20, /* PLL_PERIPH0 */ + 0x28, /* PLL_PERIPH1 */ + 0x30, /* PLL_GPU */ + 0x40, /* PLL_VIDEO0 */ + 0x48, /* PLL_VIDEO1 */ + 0x50, /* PLL_VIDEO2 */ + 0x58, /* PLL_VE */ + 0x60, /* PLL_DE */ +}; + static int ccu_h616_probe(device_t dev) { @@ -465,6 +485,8 @@ static int ccu_h616_attach(device_t dev) { struct aw_ccung_softc *sc; + uint32_t val; + int error, i; sc = device_get_softc(dev); @@ -475,7 +497,20 @@ ccu_h616_attach(device_t dev) sc->clks = h616_ccu_clks; sc->nclks = nitems(h616_ccu_clks); - return (aw_ccung_attach(dev)); + error = aw_ccung_attach(dev); + if (error != 0) + return (error); + + /* + * Only the PLLs used by the firmware have the lock enable bit set, + * set it for all of them so that we can wait for them to lock. + */ + for (i = 0; i < nitems(h616_pll_regs); i++) { + val = bus_read_4(sc->res, h616_pll_regs[i]); + bus_write_4(sc->res, h616_pll_regs[i], val | PLL_LOCK_ENABLE); + } + + return (0); } static device_method_t ccu_h616ng_methods[] = {