From nobody Thu Jan 20 10:17:45 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 A548A196AF14; Thu, 20 Jan 2022 10:17:46 +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 4Jfdk228t9z4ZMP; Thu, 20 Jan 2022 10:17:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642673866; 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=89ppa0hKldvF8vj5jRMHFsfJpUHgg+RcxN2mR0HRedw=; b=APk3C7CuvzOA4N0Zk9DJhAIycDfo7W7iR1DZP+iqWPY4mP/MGQoJH8+48bFBC9z+rJsSig 5kzvbjB/aGJ0quWiPWuCH/eH4hNPJLmktaQAztMR9om5VB7u7w89WYa2kq5O5wAlZ5Ro3c 2SpJkaaN7x2i0EKcwdFD/LG64ltU3rtzNwjwn8b1MoXOz2i/nLvIsEFprmPq+BNjDKUqKB TpzmaWPs/ziB4SoUFEmNa+5MnPwLRMmfY7+FRzvwEqFOjkpZHLRrRVo2TtNM/coAMUJVC4 mB8IaGDDP5GkvHb2y4m4svQ+xplOI4Z9UpPTWUW1uQDOw+3Yj80NJR1fqhDmww== 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 0FEB9265C4; Thu, 20 Jan 2022 10:17:46 +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 20KAHjrr005341; Thu, 20 Jan 2022 10:17:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20KAHjZG005340; Thu, 20 Jan 2022 10:17:45 GMT (envelope-from git) Date: Thu, 20 Jan 2022 10:17:45 GMT Message-Id: <202201201017.20KAHjZG005340@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michal Meloun Subject: git: 7a647bb04500 - stable/13 - tegra124: Implement new get_gate method for tegra124 clocks. 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: mmel X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7a647bb04500d97ba6bda2646ab93440a3e33a1b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642673866; 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=89ppa0hKldvF8vj5jRMHFsfJpUHgg+RcxN2mR0HRedw=; b=fkHub8QfVQvvLgH8RUnLL8maqmmHLqXC9+CGFAshyprCulg5xAH7u5yiQ7Y/H/Wyhbgq28 UWCzSH8LNLQdMF2RORo7RUofU80wbN0wae5J0glM6X5aVzkaWnvo1G7HEl+0NGPJB7Oxq5 w3cRWRadi/HgUGA3yauBrUwufa/zm7EKraX2turr6qEtlSj4bA000SPnQM6Gm0Y2GEVX+o iztXv+/AitRwkbcT3Af5iFLI+F1/YufR9E2x37SygodXmp0c4pmuSjx58RD+xLq4ayJOXO fiJebATZ3sxXIUEEpCtGLNhCfBptryQUNDn+yBeYAkfVzNlwcUyyaE/sHqChEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642673866; a=rsa-sha256; cv=none; b=Mq0Kk+QNcNCt4/11rw6B538o7bvXym5SBsDCqMy+KnpQ56Dsofmy2qT2qx5IVf17Om7GXz quFI9rl5ufzy5NmAuu19gxVtvJqm5ii6qvIM6zgCKxd4z8eLsrHb+XpytXsqjblIzfNOXs o2XWp56Ou146Bwo3eYXlngJTRtXBKvBrmUD+qN31tqjdDzS1jfI4Nkhwn/P3Rv20ns1mSf KDu++N6p5IIj6Te0q/TEZ/L0SUTRMyqNw7ft/Gxd1N/xTZpsp/1a0qlGmIhQB29qLYcEaX ZleP+4VgcU2hs0zcQRqDKxpTBqZzrfKl8PPshDTGTNynztuqvt2NwtOryaiwsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mmel: URL: https://cgit.FreeBSD.org/src/commit/?id=7a647bb04500d97ba6bda2646ab93440a3e33a1b commit 7a647bb04500d97ba6bda2646ab93440a3e33a1b Author: Michal Meloun AuthorDate: 2021-12-24 19:13:33 +0000 Commit: Michal Meloun CommitDate: 2022-01-20 10:15:15 +0000 tegra124: Implement new get_gate method for tegra124 clocks. MFC after: 1 week (cherry picked from commit be01656fa4cd78f191c0ad8a6f4640a0c520d5a9) --- sys/arm/nvidia/tegra124/tegra124_clk_per.c | 19 +++++++++++++++++++ sys/arm/nvidia/tegra124/tegra124_clk_pll.c | 15 +++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/sys/arm/nvidia/tegra124/tegra124_clk_per.c b/sys/arm/nvidia/tegra124/tegra124_clk_per.c index 4d68e8b22daf..b555a15786a4 100644 --- a/sys/arm/nvidia/tegra124/tegra124_clk_per.c +++ b/sys/arm/nvidia/tegra124/tegra124_clk_per.c @@ -697,6 +697,7 @@ periph_register(struct clkdom *clkdom, struct periph_def *clkdef) /* -------------------------------------------------------------------------- */ static int pgate_init(struct clknode *clk, device_t dev); static int pgate_set_gate(struct clknode *clk, bool enable); +static int pgate_get_gate(struct clknode *clk, bool *enableD); struct pgate_sc { device_t clkdev; @@ -710,6 +711,7 @@ static clknode_method_t pgate_methods[] = { /* Device interface */ CLKNODEMETHOD(clknode_init, pgate_init), CLKNODEMETHOD(clknode_set_gate, pgate_set_gate), + CLKNODEMETHOD(clknode_get_gate, pgate_get_gate), CLKNODEMETHOD_END }; DEFINE_CLASS_1(tegra124_pgate, tegra124_pgate_class, pgate_methods, @@ -771,6 +773,23 @@ pgate_set_gate(struct clknode *clk, bool enable) return(0); } +static int +pgate_get_gate(struct clknode *clk, bool *enabled) +{ + struct pgate_sc *sc; + uint32_t reg, mask, base_reg; + + sc = clknode_get_softc(clk); + mask = 1 << (sc->idx % 32); + base_reg = get_enable_reg(sc->idx); + + DEVICE_LOCK(sc); + RD4(sc, base_reg, ®); + DEVICE_UNLOCK(sc); + *enabled = reg & mask ? true: false; + + return(0); +} int tegra124_hwreset_by_idx(struct tegra124_car_softc *sc, intptr_t idx, bool reset) { diff --git a/sys/arm/nvidia/tegra124/tegra124_clk_pll.c b/sys/arm/nvidia/tegra124/tegra124_clk_pll.c index 82b34fd71203..d6aa55f8efe0 100644 --- a/sys/arm/nvidia/tegra124/tegra124_clk_pll.c +++ b/sys/arm/nvidia/tegra124/tegra124_clk_pll.c @@ -382,6 +382,7 @@ static struct clk_pll_def pll_clks[] = { static int tegra124_pll_init(struct clknode *clk, device_t dev); static int tegra124_pll_set_gate(struct clknode *clk, bool enable); +static int tegra124_pll_get_gate(struct clknode *clk, bool *enabled); static int tegra124_pll_recalc(struct clknode *clk, uint64_t *freq); static int tegra124_pll_set_freq(struct clknode *clknode, uint64_t fin, uint64_t *fout, int flags, int *stop); @@ -403,6 +404,7 @@ static clknode_method_t tegra124_pll_methods[] = { /* Device interface */ CLKNODEMETHOD(clknode_init, tegra124_pll_init), CLKNODEMETHOD(clknode_set_gate, tegra124_pll_set_gate), + CLKNODEMETHOD(clknode_get_gate, tegra124_pll_get_gate), CLKNODEMETHOD(clknode_recalc_freq, tegra124_pll_recalc), CLKNODEMETHOD(clknode_set_freq, tegra124_pll_set_freq), CLKNODEMETHOD_END @@ -688,6 +690,19 @@ tegra124_pll_set_gate(struct clknode *clknode, bool enable) return (rv); } +static int +tegra124_pll_get_gate(struct clknode *clknode, bool *enabled) +{ + uint32_t reg; + struct pll_sc *sc; + + sc = clknode_get_softc(clknode); + RD4(sc, sc->base_reg, ®); + *enabled = reg & PLL_BASE_ENABLE ? true: false; + WR4(sc, sc->base_reg, reg); + return (0); +} + static int pll_set_std(struct pll_sc *sc, uint64_t fin, uint64_t *fout, int flags, uint32_t m, uint32_t n, uint32_t p)